mirror of
https://github.com/reactos/reactos.git
synced 2025-06-06 01:40:36 +00:00
- Fix HalDisableSystemInterrupt -- it doesn't return anything.
- Fix VideoPortEnable/DisableInterrupt -- they should only fail if the driver didn't provide an ISR (documented). svn path=/trunk/; revision=44085
This commit is contained in:
parent
a6c89f30fa
commit
662ba31e98
5 changed files with 22 additions and 23 deletions
|
@ -213,15 +213,12 @@ HalCalibratePerformanceCounter(
|
|||
}
|
||||
|
||||
|
||||
BOOLEAN
|
||||
VOID
|
||||
NTAPI
|
||||
HalDisableSystemInterrupt(
|
||||
ULONG Vector,
|
||||
KIRQL Irql)
|
||||
HalDisableSystemInterrupt(ULONG Vector,
|
||||
KIRQL Irql)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
|
||||
return TRUE;
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -276,15 +276,12 @@ HalCalibratePerformanceCounter(
|
|||
}
|
||||
|
||||
|
||||
BOOLEAN
|
||||
VOID
|
||||
NTAPI
|
||||
HalDisableSystemInterrupt(
|
||||
ULONG Vector,
|
||||
KIRQL Irql)
|
||||
HalDisableSystemInterrupt(ULONG Vector,
|
||||
KIRQL Irql)
|
||||
{
|
||||
UNIMPLEMENTED;
|
||||
|
||||
return TRUE;
|
||||
UNIMPLEMENTED;
|
||||
}
|
||||
|
||||
VOID
|
||||
|
|
|
@ -356,7 +356,7 @@ VOID NTAPI HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
|
|||
HalpEndSystemInterrupt(Irql);
|
||||
}
|
||||
|
||||
BOOLEAN
|
||||
VOID
|
||||
NTAPI
|
||||
HalDisableSystemInterrupt(
|
||||
ULONG Vector,
|
||||
|
@ -365,7 +365,10 @@ HalDisableSystemInterrupt(
|
|||
ULONG irq;
|
||||
|
||||
if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS)
|
||||
return FALSE;
|
||||
{
|
||||
ASSERT(FALSE);
|
||||
return;
|
||||
}
|
||||
|
||||
irq = Vector - IRQ_BASE;
|
||||
pic_mask.both |= (1 << irq);
|
||||
|
@ -378,7 +381,7 @@ HalDisableSystemInterrupt(
|
|||
WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave));
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -336,9 +336,10 @@ HalEndSystemInterrupt (KIRQL Irql,
|
|||
HalpLowerIrql (Irql, TRUE);
|
||||
}
|
||||
|
||||
BOOLEAN NTAPI
|
||||
HalDisableSystemInterrupt (ULONG Vector,
|
||||
KIRQL Irql)
|
||||
VOID
|
||||
NTAPI
|
||||
HalDisableSystemInterrupt(ULONG Vector,
|
||||
KIRQL Irql)
|
||||
{
|
||||
ULONG irq;
|
||||
|
||||
|
@ -348,13 +349,14 @@ HalDisableSystemInterrupt (ULONG Vector,
|
|||
Vector >= FIRST_DEVICE_VECTOR + NUMBER_DEVICE_VECTORS)
|
||||
{
|
||||
DPRINT1("Not a device interrupt, vector=%x\n", Vector);
|
||||
return FALSE;
|
||||
ASSERT(FALSE);
|
||||
return;
|
||||
}
|
||||
|
||||
irq = VECTOR2IRQ (Vector);
|
||||
IOAPICMaskIrq (irq);
|
||||
|
||||
return TRUE;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -144,7 +144,7 @@ HalClearSoftwareInterrupt(
|
|||
);
|
||||
|
||||
NTHALAPI
|
||||
BOOLEAN
|
||||
VOID
|
||||
NTAPI
|
||||
HalDisableSystemInterrupt(
|
||||
ULONG Vector,
|
||||
|
|
Loading…
Reference in a new issue