Author: sginsberg Date: Wed Nov 11 00:00:51 2009 New Revision: 44085
URL: http://svn.reactos.org/svn/reactos?rev=44085&view=rev Log: - Fix HalDisableSystemInterrupt -- it doesn't return anything. - Fix VideoPortEnable/DisableInterrupt -- they should only fail if the driver didn't provide an ISR (documented).
Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/hal/halppc/generic/irql.c trunk/reactos/hal/halx86/mp/mpsirql.c trunk/reactos/include/ndk/halfuncs.h
Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=44085&... ============================================================================== --- trunk/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.c [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -213,15 +213,12 @@ }
-BOOLEAN -NTAPI -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - UNIMPLEMENTED; - - return TRUE; +VOID +NTAPI +HalDisableSystemInterrupt(ULONG Vector, + KIRQL Irql) +{ + UNIMPLEMENTED; }
Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?re... ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -276,15 +276,12 @@ }
-BOOLEAN -NTAPI -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - UNIMPLEMENTED; - - return TRUE; +VOID +NTAPI +HalDisableSystemInterrupt(ULONG Vector, + KIRQL Irql) +{ + UNIMPLEMENTED; }
VOID
Modified: trunk/reactos/hal/halppc/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/irql.c?r... ============================================================================== --- trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -356,7 +356,7 @@ HalpEndSystemInterrupt(Irql); }
-BOOLEAN +VOID NTAPI HalDisableSystemInterrupt( ULONG Vector, @@ -365,7 +365,10 @@ 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 @@ WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); }
- return TRUE; + return; }
Modified: trunk/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?rev... ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -336,9 +336,10 @@ HalpLowerIrql (Irql, TRUE); }
-BOOLEAN NTAPI -HalDisableSystemInterrupt (ULONG Vector, - KIRQL Irql) +VOID +NTAPI +HalDisableSystemInterrupt(ULONG Vector, + KIRQL Irql) { ULONG irq;
@@ -348,13 +349,14 @@ 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; }
Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev=... ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/halfuncs.h [iso-8859-1] Wed Nov 11 00:00:51 2009 @@ -144,7 +144,7 @@ );
NTHALAPI -BOOLEAN +VOID NTAPI HalDisableSystemInterrupt( ULONG Vector,