mirror of
https://github.com/reactos/reactos.git
synced 2025-08-07 04:13:01 +00:00
Convert tabs to spaces.
svn path=/trunk/; revision=18959
This commit is contained in:
parent
3dd0798703
commit
40cfcb3758
1 changed files with 56 additions and 57 deletions
|
@ -53,10 +53,10 @@ D16(F)
|
||||||
(ULONG)& INT_NAME2(x##y)
|
(ULONG)& INT_NAME2(x##y)
|
||||||
|
|
||||||
#define L16(x) \
|
#define L16(x) \
|
||||||
L(x,0), L(x,1), L(x,2), L(x,3), \
|
L(x,0), L(x,1), L(x,2), L(x,3), \
|
||||||
L(x,4), L(x,5), L(x,6), L(x,7), \
|
L(x,4), L(x,5), L(x,6), L(x,7), \
|
||||||
L(x,8), L(x,9), L(x,A), L(x,B), \
|
L(x,8), L(x,9), L(x,A), L(x,B), \
|
||||||
L(x,C), L(x,D), L(x,E), L(x,F)
|
L(x,C), L(x,D), L(x,E), L(x,F)
|
||||||
|
|
||||||
static ULONG irq_handler[ROUND_UP(NR_IRQS, 16)] = {
|
static ULONG irq_handler[ROUND_UP(NR_IRQS, 16)] = {
|
||||||
L16(3), L16(4), L16(5), L16(6),
|
L16(3), L16(4), L16(5), L16(6),
|
||||||
|
@ -150,25 +150,25 @@ KeInitInterrupts (VOID)
|
||||||
*/
|
*/
|
||||||
for (i=0;i<NR_IRQS;i++)
|
for (i=0;i<NR_IRQS;i++)
|
||||||
{
|
{
|
||||||
KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KERNEL_CS<<16);
|
KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KERNEL_CS<<16);
|
||||||
KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+
|
KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+
|
||||||
I486_INTERRUPT_GATE;
|
I486_INTERRUPT_GATE;
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
for (j = 0; j < MAXIMUM_PROCESSORS; j++)
|
for (j = 0; j < MAXIMUM_PROCESSORS; j++)
|
||||||
#else
|
#else
|
||||||
j = 0;
|
j = 0;
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
InitializeListHead(&IsrTable[i][j].ListHead);
|
InitializeListHead(&IsrTable[i][j].ListHead);
|
||||||
KeInitializeSpinLock(&IsrTable[i][j].Lock);
|
KeInitializeSpinLock(&IsrTable[i][j].Lock);
|
||||||
IsrTable[i][j].Count = 0;
|
IsrTable[i][j].Count = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC VOID
|
STATIC VOID
|
||||||
KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame,
|
KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame,
|
||||||
PKTRAP_FRAME TrapFrame)
|
PKTRAP_FRAME TrapFrame)
|
||||||
{
|
{
|
||||||
TrapFrame->Gs = (USHORT)IrqTrapFrame->Gs;
|
TrapFrame->Gs = (USHORT)IrqTrapFrame->Gs;
|
||||||
TrapFrame->Fs = (USHORT)IrqTrapFrame->Fs;
|
TrapFrame->Fs = (USHORT)IrqTrapFrame->Fs;
|
||||||
|
@ -189,7 +189,7 @@ KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame,
|
||||||
|
|
||||||
STATIC VOID
|
STATIC VOID
|
||||||
KeTrapFrameToIRQTrapFrame(PKTRAP_FRAME TrapFrame,
|
KeTrapFrameToIRQTrapFrame(PKTRAP_FRAME TrapFrame,
|
||||||
PKIRQ_TRAPFRAME IrqTrapFrame)
|
PKIRQ_TRAPFRAME IrqTrapFrame)
|
||||||
{
|
{
|
||||||
IrqTrapFrame->Gs = TrapFrame->Gs;
|
IrqTrapFrame->Gs = TrapFrame->Gs;
|
||||||
IrqTrapFrame->Fs = TrapFrame->Fs;
|
IrqTrapFrame->Fs = TrapFrame->Fs;
|
||||||
|
@ -242,8 +242,8 @@ KiInterruptDispatch2 (ULONG vector, KIRQL old_level)
|
||||||
if (isr->ServiceRoutine(isr, isr->ServiceContext))
|
if (isr->ServiceRoutine(isr, isr->ServiceContext))
|
||||||
{
|
{
|
||||||
KeReleaseInterruptSpinLock(isr, oldlvl);
|
KeReleaseInterruptSpinLock(isr, oldlvl);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
KeReleaseInterruptSpinLock(isr, oldlvl);
|
KeReleaseInterruptSpinLock(isr, oldlvl);
|
||||||
current = current->Flink;
|
current = current->Flink;
|
||||||
}
|
}
|
||||||
|
@ -275,8 +275,8 @@ KiInterruptDispatch (ULONG vector, PKIRQ_TRAPFRAME Trapframe)
|
||||||
* default HAL this will send an EOI to the PIC and alter the IRQL.
|
* default HAL this will send an EOI to the PIC and alter the IRQL.
|
||||||
*/
|
*/
|
||||||
if (!HalBeginSystemInterrupt (vector,
|
if (!HalBeginSystemInterrupt (vector,
|
||||||
VECTOR2IRQL(vector),
|
VECTOR2IRQL(vector),
|
||||||
&old_level))
|
&old_level))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -316,28 +316,28 @@ KiInterruptDispatch (ULONG vector, PKIRQ_TRAPFRAME Trapframe)
|
||||||
if (CurrentThread!=NULL && CurrentThread->ApcState.UserApcPending)
|
if (CurrentThread!=NULL && CurrentThread->ApcState.UserApcPending)
|
||||||
{
|
{
|
||||||
DPRINT("PID: %d, TID: %d CS %04x/%04x\n",
|
DPRINT("PID: %d, TID: %d CS %04x/%04x\n",
|
||||||
((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId,
|
((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId,
|
||||||
((PETHREAD)CurrentThread)->Cid.UniqueThread,
|
((PETHREAD)CurrentThread)->Cid.UniqueThread,
|
||||||
Trapframe->Cs,
|
Trapframe->Cs,
|
||||||
CurrentThread->TrapFrame ? CurrentThread->TrapFrame->Cs : 0);
|
CurrentThread->TrapFrame ? CurrentThread->TrapFrame->Cs : 0);
|
||||||
if (CurrentThread->TrapFrame == NULL)
|
if (CurrentThread->TrapFrame == NULL)
|
||||||
{
|
{
|
||||||
OldTrapFrame = CurrentThread->TrapFrame;
|
OldTrapFrame = CurrentThread->TrapFrame;
|
||||||
KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame);
|
KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame);
|
||||||
CurrentThread->TrapFrame = &KernelTrapFrame;
|
CurrentThread->TrapFrame = &KernelTrapFrame;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ke386EnableInterrupts();
|
Ke386EnableInterrupts();
|
||||||
KiDeliverApc(UserMode, NULL, NULL);
|
KiDeliverApc(UserMode, NULL, NULL);
|
||||||
Ke386DisableInterrupts();
|
Ke386DisableInterrupts();
|
||||||
|
|
||||||
ASSERT(KeGetCurrentThread() == CurrentThread);
|
ASSERT(KeGetCurrentThread() == CurrentThread);
|
||||||
if (CurrentThread->TrapFrame == &KernelTrapFrame)
|
if (CurrentThread->TrapFrame == &KernelTrapFrame)
|
||||||
{
|
{
|
||||||
KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe);
|
KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe);
|
||||||
CurrentThread->TrapFrame = OldTrapFrame;
|
CurrentThread->TrapFrame = OldTrapFrame;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
KeLowerIrql(PASSIVE_LEVEL);
|
KeLowerIrql(PASSIVE_LEVEL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -358,28 +358,28 @@ KeDumpIrqList(VOID)
|
||||||
|
|
||||||
for (i=0;i<NR_IRQS;i++)
|
for (i=0;i<NR_IRQS;i++)
|
||||||
{
|
{
|
||||||
printed = FALSE;
|
printed = FALSE;
|
||||||
KeRaiseIrql(VECTOR2IRQL(i + IRQ_BASE),&oldlvl);
|
KeRaiseIrql(VECTOR2IRQL(i + IRQ_BASE),&oldlvl);
|
||||||
|
|
||||||
for (j=0; j < KeNumberProcessors; j++)
|
for (j=0; j < KeNumberProcessors; j++)
|
||||||
{
|
{
|
||||||
KiAcquireSpinLock(&IsrTable[i][j].Lock);
|
KiAcquireSpinLock(&IsrTable[i][j].Lock);
|
||||||
|
|
||||||
current_entry = IsrTable[i][j].ListHead.Flink;
|
current_entry = IsrTable[i][j].ListHead.Flink;
|
||||||
current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry);
|
current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry);
|
||||||
while (current_entry!=&(IsrTable[i][j].ListHead))
|
while (current_entry!=&(IsrTable[i][j].ListHead))
|
||||||
{
|
{
|
||||||
if (printed == FALSE)
|
if (printed == FALSE)
|
||||||
{
|
{
|
||||||
printed = TRUE;
|
printed = TRUE;
|
||||||
DPRINT("For irq %x:\n",i);
|
DPRINT("For irq %x:\n",i);
|
||||||
}
|
}
|
||||||
DPRINT(" Isr %x\n",current);
|
DPRINT(" Isr %x\n",current);
|
||||||
current_entry = current_entry->Flink;
|
current_entry = current_entry->Flink;
|
||||||
current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry);
|
current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry);
|
||||||
}
|
}
|
||||||
KiReleaseSpinLock(&IsrTable[i][j].Lock);
|
KiReleaseSpinLock(&IsrTable[i][j].Lock);
|
||||||
}
|
}
|
||||||
KeLowerIrql(oldlvl);
|
KeLowerIrql(oldlvl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -575,12 +575,11 @@ VOID KePrintInterruptStatistic(VOID)
|
||||||
for (i = 0; i < NR_IRQS; i++)
|
for (i = 0; i < NR_IRQS; i++)
|
||||||
{
|
{
|
||||||
if (IsrTable[i][j].Count)
|
if (IsrTable[i][j].Count)
|
||||||
{
|
{
|
||||||
DPRINT1(" Irq %x(%d): %d\n", i, VECTOR2IRQ(i + IRQ_BASE), IsrTable[i][j].Count);
|
DPRINT1(" Irq %x(%d): %d\n", i, VECTOR2IRQ(i + IRQ_BASE), IsrTable[i][j].Count);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* EOF */
|
/* EOF */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue