Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-14 18:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix HalDisableSystemInterrupt -- it doesn't return anything.

Browse source 
- 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:
Stefan Ginsberg 2009-11-10 23:00:51 +00:00
parent a6c89f30fa
commit 662ba31e98
5 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/hal/hal/hal.c
View file

@ -213,15 +213,12 @@ HalCalibratePerformanceCounter(
} }
BOOLEAN VOID
NTAPI NTAPI
HalDisableSystemInterrupt( HalDisableSystemInterrupt(ULONG Vector,
ULONG Vector, KIRQL Irql)
KIRQL Irql)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
return TRUE;
} }

11
reactos/hal/halarm/generic/hal.c
View file

@ -276,15 +276,12 @@ HalCalibratePerformanceCounter(
} }
BOOLEAN VOID
NTAPI NTAPI
HalDisableSystemInterrupt( HalDisableSystemInterrupt(ULONG Vector,
ULONG Vector, KIRQL Irql)
KIRQL Irql)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
return TRUE;
} }
VOID VOID

9
reactos/hal/halppc/generic/irql.c
View file

@ -356,7 +356,7 @@ VOID NTAPI HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
HalpEndSystemInterrupt(Irql); HalpEndSystemInterrupt(Irql);
} }
BOOLEAN VOID
NTAPI NTAPI
HalDisableSystemInterrupt( HalDisableSystemInterrupt(
ULONG Vector, ULONG Vector,
@ -365,7 +365,10 @@ HalDisableSystemInterrupt(
ULONG irq; ULONG irq;
if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS)
return FALSE; {
ASSERT(FALSE);
return;
}
irq = Vector - IRQ_BASE; irq = Vector - IRQ_BASE;
pic_mask.both |= (1 << irq); pic_mask.both |= (1 << irq);
@ -378,7 +381,7 @@ HalDisableSystemInterrupt(
WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave));
} }
return TRUE; return;
} }

12
reactos/hal/halx86/mp/mpsirql.c
View file

@ -336,9 +336,10 @@ HalEndSystemInterrupt (KIRQL Irql,
HalpLowerIrql (Irql, TRUE); HalpLowerIrql (Irql, TRUE);
} }
BOOLEAN NTAPI VOID
HalDisableSystemInterrupt (ULONG Vector, NTAPI
KIRQL Irql) HalDisableSystemInterrupt(ULONG Vector,
KIRQL Irql)
{ {
ULONG irq; ULONG irq;
@ -348,13 +349,14 @@ HalDisableSystemInterrupt (ULONG Vector,
Vector >= FIRST_DEVICE_VECTOR + NUMBER_DEVICE_VECTORS) Vector >= FIRST_DEVICE_VECTOR + NUMBER_DEVICE_VECTORS)
{ {
DPRINT1("Not a device interrupt, vector=%x\n", Vector); DPRINT1("Not a device interrupt, vector=%x\n", Vector);
return FALSE; ASSERT(FALSE);
return;
} }
irq = VECTOR2IRQ (Vector); irq = VECTOR2IRQ (Vector);
IOAPICMaskIrq (irq); IOAPICMaskIrq (irq);
return TRUE; return;
} }

2
reactos/include/ndk/halfuncs.h
View file

@ -144,7 +144,7 @@ HalClearSoftwareInterrupt(
); );
NTHALAPI NTHALAPI
BOOLEAN VOID
NTAPI NTAPI
HalDisableSystemInterrupt( HalDisableSystemInterrupt(
ULONG Vector, ULONG Vector,