mirror of
https://github.com/Zeal-Operating-System/ZealOS.git
synced 2025-06-06 15:54:47 +00:00
Hndlr -> Handler
This commit is contained in:
parent
cc5987fcde
commit
2eaa78708c
Binary file not shown.
Binary file not shown.
@ -25,7 +25,7 @@ class CComm
|
||||
CFifoU8 *TX_fifo;
|
||||
} comm_ports[5];
|
||||
|
||||
U0 CommHndlr(I64 port)
|
||||
U0 CommHandler(I64 port)
|
||||
{
|
||||
CComm *c=&comm_ports[port];
|
||||
I64 b=0,stat;
|
||||
@ -44,15 +44,15 @@ U0 CommHndlr(I64 port)
|
||||
|
||||
interrupt U0 IRQComm3()
|
||||
{
|
||||
CommHndlr(2);
|
||||
CommHndlr(4);
|
||||
CommHandler(2);
|
||||
CommHandler(4);
|
||||
OutU8(0x20,0x20);
|
||||
}
|
||||
|
||||
interrupt U0 IRQComm4()
|
||||
{
|
||||
CommHndlr(1);
|
||||
CommHndlr(3);
|
||||
CommHandler(1);
|
||||
CommHandler(3);
|
||||
OutU8(0x20,0x20);
|
||||
}
|
||||
|
||||
|
BIN
src/Doc/Job.DD
BIN
src/Doc/Job.DD
Binary file not shown.
@ -2,7 +2,7 @@ $WW,1$The editor mostly stays in a $LK,"GetKey",A="MN:GetKey"$()/$LK,"PutKey",A=
|
||||
|
||||
$LK,"KeyDevAdd",A="MN:KeyDevAdd"$() defines a putkey device with a priority. "Device" might be a misnomer. Currently, the following are defined:
|
||||
|
||||
Priority Hndlr
|
||||
Priority Handler
|
||||
---------- ---------
|
||||
$FG,2$0x20000000$FG$ $LK,"MyPutKey",A="MN:MyPutKey"$() user hndlr
|
||||
$FG,2$0x40000000$FG$ $LK,"KDInputFilterPutKey",A="MN:KDInputFilterPutKey"$() for $LK,"In",A="MN:In"$(), $LK,"InStr",A="MN:InStr"$(), and $LK,"InFile",A="MN:InFile"$() handling.
|
||||
|
BIN
src/Kernel.BIN.C
BIN
src/Kernel.BIN.C
Binary file not shown.
@ -346,7 +346,7 @@ I64 JobRunOne(I64 run_flags,CJobCtrl *ctrl)
|
||||
return res;
|
||||
}
|
||||
|
||||
I64 JobsHndlr(I64 run_flags,CTask *task=NULL)
|
||||
I64 JobsHandler(I64 run_flags,CTask *task=NULL)
|
||||
{//Handle all waiting cmds and return.
|
||||
I64 cnt=0,old_flags=GetRFlags;
|
||||
if (!task) task=Fs;
|
||||
@ -410,7 +410,7 @@ I64 Zenith(U8 *fmt,...)
|
||||
CJob *tmpc;
|
||||
if (Fs==zenith_task) {
|
||||
tmpc=TaskExe(zenith_task,Fs,buf,0);
|
||||
JobsHndlr(GetRFlags);
|
||||
JobsHandler(GetRFlags);
|
||||
} else {
|
||||
TaskWait(zenith_task);
|
||||
tmpc=TaskExe(zenith_task,Fs,buf,1<<JOBf_WAKE_MASTER);
|
||||
|
@ -69,7 +69,7 @@ extern Bool IsRaw();
|
||||
extern U0 JobCtrlInit(CJobCtrl *ctrl);
|
||||
extern U0 JobDel(CJob *tmpc);
|
||||
extern U0 JobQueueDel(CJob *head);
|
||||
extern I64 JobsHndlr(I64 run_flags,CTask *task=NULL);
|
||||
extern I64 JobsHandler(I64 run_flags,CTask *task=NULL);
|
||||
extern CBlkDev *Letter2BlkDev(U8 drv_let=0,Bool except=TRUE);
|
||||
extern I64 Letter2BlkDevType(U8 drv_let);
|
||||
extern CDrive *Letter2Drive(U8 drv_let=0,Bool except=TRUE);
|
||||
|
@ -52,7 +52,7 @@ IRQ_TIMER:: //I_TIMER
|
||||
MOV U32 [RAX+RDX],0
|
||||
JMP @@25
|
||||
|
||||
@@20: CALL &IntCore0TimerHndlr //Only Core 0 calls this.
|
||||
@@20: CALL &IntCore0TimerHandler //Only Core 0 calls this.
|
||||
@@25: XOR RAX,RAX
|
||||
CMP RSI,U64 GS:CCPU.idle_task[RAX]
|
||||
JE I32 RESTORE_SETH_TASK_IF_READY
|
||||
@ -61,7 +61,7 @@ IRQ_TIMER:: //I_TIMER
|
||||
INT_FAULT::
|
||||
PUSH RBX
|
||||
PUSH RAX
|
||||
MOV BL,U8 16[RSP] //We pushed fault_num $LK,"IntFaultHndlrsNew",A="MN:IntFaultHndlrsNew"$().
|
||||
MOV BL,U8 16[RSP] //We pushed fault_num $LK,"IntFaultHandlersNew",A="MN:IntFaultHandlersNew"$().
|
||||
XOR RAX,RAX
|
||||
MOV FS:U8 CTask.fault_num[RAX],BL
|
||||
POP RAX
|
||||
@ -163,7 +163,7 @@ interrupt U0 IntDivZero()
|
||||
throw('DivZero');
|
||||
}
|
||||
|
||||
U8 *IntFaultHndlrsNew()
|
||||
U8 *IntFaultHandlersNew()
|
||||
{
|
||||
I64 i;
|
||||
U8 *res=MAlloc(256*7,Fs->code_heap),*dst=res;
|
||||
|
@ -59,7 +59,7 @@ U0 SysGlblsInit()
|
||||
dev.mem64_ptr=mem_mapped_space;
|
||||
|
||||
dbg.fun_seg_cache=CAlloc(FUN_SEG_CACHE_SIZE*sizeof(CFunSegCache));
|
||||
dbg.int_fault_code=IntFaultHndlrsNew;
|
||||
dbg.int_fault_code=IntFaultHandlersNew;
|
||||
}
|
||||
|
||||
U0 SysGrInit()
|
||||
|
@ -44,8 +44,8 @@ I64 BCnt(I64 d)
|
||||
return res;
|
||||
}
|
||||
|
||||
U0 IntCore0TimerHndlr(CTask *)
|
||||
{//Called from $LK,"IntCore0TimerHndlr",A="FF:::/Kernel/KInts.HC,IntCore0TimerHndlr"$
|
||||
U0 IntCore0TimerHandler(CTask *)
|
||||
{//Called from $LK,"IntCore0TimerHandler",A="FF:::/Kernel/KInts.HC,IntCore0TimerHandler"$
|
||||
I64 i;
|
||||
if (mp_cnt>1)
|
||||
while (LBts(&sys_semas[SEMA_SYS_TIMER],0))
|
||||
|
@ -371,7 +371,7 @@ U0 SrvTaskCont()
|
||||
FlushMsgs;
|
||||
while (TRUE) {
|
||||
CLI
|
||||
if (JobsHndlr(old_flags) && Fs->title_src==TTS_TASK_NAME)
|
||||
if (JobsHandler(old_flags) && Fs->title_src==TTS_TASK_NAME)
|
||||
MemCpy(Fs->task_title,Fs->task_name,TASK_NAME_LEN);
|
||||
FlushMsgs;
|
||||
LBts(&Fs->task_flags,TASKf_IDLE);
|
||||
|
File diff suppressed because one or more lines are too long
@ -3493,7 +3493,7 @@ public class CSysFixedArea
|
||||
|
||||
//ZenithOS places a 1 in bit 7 for
|
||||
//keys with an E0 prefix.
|
||||
//See $LK,"::/Doc/CharOverview.DD"$ and $LK,"KbdHndlr",A="MN:KbdHndlr"$().
|
||||
//See $LK,"::/Doc/CharOverview.DD"$ and $LK,"KbdHandler",A="MN:KbdHandler"$().
|
||||
#define SC_ESC 0x01
|
||||
#define SC_BACKSPACE 0x0E
|
||||
#define SC_TAB 0x0F
|
||||
|
@ -461,7 +461,7 @@ public extern U0 ZenithErr(U8 *fmt,...);
|
||||
public extern U0 ZenithLog(U8 *fmt,...);
|
||||
public extern I64 ExeCmdLine(CCmpCtrl *cc);
|
||||
public extern U0 JobDel(CJob *tmpc);
|
||||
public extern I64 JobsHndlr(I64 run_flags,CTask *task=NULL);
|
||||
public extern I64 JobsHandler(I64 run_flags,CTask *task=NULL);
|
||||
extern U0 SrvCmdLine();
|
||||
public extern U0 SrvTaskCont();
|
||||
public extern CJob *TaskExe(CTask *srv,CTask *master,U8 *data,I64 flags);
|
||||
@ -524,7 +524,7 @@ public extern I64 GetS(U8 *buf,I64 size,Bool allow_ext=TRUE);
|
||||
public extern U8 *GetStr(U8 *msg=NULL,U8 *dft=NULL,I64 flags=0);
|
||||
extern U0 KbdInit();
|
||||
public extern I64 KbdMsEvtTime();
|
||||
extern U0 KbdMsHndlr(Bool poll_kbd,Bool poll_ms);
|
||||
extern U0 KbdMsHandler(Bool poll_kbd,Bool poll_ms);
|
||||
extern U0 KbdMsInit();
|
||||
extern I64 KbdMsgsQueue();
|
||||
public extern U0 KbdTypeMatic(U8 delay);
|
||||
|
@ -438,7 +438,7 @@ U0 KbdInit()
|
||||
OutU8(0x21,InU8(0x21)&~2);
|
||||
}
|
||||
|
||||
U0 KbdHndlr()
|
||||
U0 KbdHandler()
|
||||
{
|
||||
static U8 last_raw_byte=0;
|
||||
U8 raw_byte;
|
||||
|
@ -9,7 +9,7 @@ U0 InputFilterTask()
|
||||
LBEqu(&Fs->task_flags,TASKf_FILTER_INPUT,old_filter);
|
||||
while (TRUE) {
|
||||
CLI
|
||||
JobsHndlr(old_flags);
|
||||
JobsHandler(old_flags);
|
||||
tmpc1=&Fs->srv_ctrl.next_waiting;
|
||||
tmpc=tmpc1->next;
|
||||
if (tmpc==tmpc1)
|
||||
@ -49,7 +49,7 @@ Note: This delivers messages from parent down to pop-up.
|
||||
while (TRUE) {
|
||||
CLI
|
||||
if (task==Fs)
|
||||
JobsHndlr(old_flags);
|
||||
JobsHandler(old_flags);
|
||||
tmpc=tmpc1->next;
|
||||
if (tmpc==tmpc1)
|
||||
break;
|
||||
@ -162,7 +162,7 @@ I64 GetKey(I64 *_scan_code=NULL,Bool echo=FALSE,Bool raw_cursor=FALSE)
|
||||
//keyboard when in debugger with interrupts off.
|
||||
PUSHFD
|
||||
CLI
|
||||
KbdMsHndlr(TRUE,FALSE);
|
||||
KbdMsHandler(TRUE,FALSE);
|
||||
KbdMsgsQueue;
|
||||
POPFD
|
||||
} else {
|
||||
|
@ -232,7 +232,7 @@ U0 MsHardSetPost()
|
||||
}
|
||||
}
|
||||
|
||||
U0 MsHardHndlr()
|
||||
U0 MsHardHandler()
|
||||
{
|
||||
I64 i,dx,dy,dz;
|
||||
U8 ms_buf[4];
|
||||
@ -310,7 +310,7 @@ Bool MsHardDriverInstall(I64 dummy=0) //can be spawned
|
||||
return ms_hard.installed;
|
||||
}
|
||||
|
||||
U0 KbdMsHndlr(Bool poll_kbd,Bool poll_ms)
|
||||
U0 KbdMsHandler(Bool poll_kbd,Bool poll_ms)
|
||||
{
|
||||
if (ms_hard.install_in_progress) {
|
||||
Yield;
|
||||
@ -335,10 +335,10 @@ U0 KbdMsHndlr(Bool poll_kbd,Bool poll_ms)
|
||||
KbdMsRst;
|
||||
else {
|
||||
while (FifoU8Cnt(kbd.fifo2))
|
||||
KbdHndlr;
|
||||
KbdHandler;
|
||||
while (FifoU8Cnt(ms_hard.fifo2))
|
||||
if (ms_hard.installed)
|
||||
MsHardHndlr;
|
||||
MsHardHandler;
|
||||
else
|
||||
KbdMsRst;
|
||||
}
|
||||
|
Binary file not shown.
@ -306,7 +306,7 @@ I64 WinMgrSleep(Bool flush_msgs=FALSE)
|
||||
}
|
||||
winmgr.updates++;
|
||||
if (ms_hard.install_attempts) //Don't call before boot mouse install attempt
|
||||
KbdMsHndlr(FALSE,TRUE);
|
||||
KbdMsHandler(FALSE,TRUE);
|
||||
SleepUntil(timeout_val);
|
||||
}
|
||||
return msg_code;
|
||||
|
Loading…
x
Reference in New Issue
Block a user