diff --git a/reactos/drivers/video/videoprt/videoprt.h b/reactos/drivers/video/videoprt/videoprt.h index d33d7139eb3..3543b4c27d8 100644 --- a/reactos/drivers/video/videoprt/videoprt.h +++ b/reactos/drivers/video/videoprt/videoprt.h @@ -18,7 +18,7 @@ * If not, write to the Free Software Foundation, * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: videoprt.h,v 1.10 2004/04/08 09:43:55 navaraf Exp $ + * $Id: videoprt.h,v 1.11 2004/10/23 23:43:23 ion Exp $ */ #ifndef VIDEOPRT_H @@ -33,8 +33,16 @@ int swprintf(wchar_t *buf, const wchar_t *fmt, ...); int vsprintf(char *buf, const char *fmt, va_list args); -BOOLEAN STDCALL HalDisableSystemInterrupt(ULONG Vector, ULONG Unknown2); -BOOLEAN STDCALL HalEnableSystemInterrupt(ULONG Vector, ULONG Unknown2, ULONG Unknown3); + +BOOLEAN STDCALL +HalDisableSystemInterrupt(ULONG Vector, + KIRQL Irql); + +BOOLEAN STDCALL +HalEnableSystemInterrupt(ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode); + PIMAGE_NT_HEADERS STDCALL RtlImageNtHeader(IN PVOID BaseAddress); #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') diff --git a/reactos/hal/hal/hal.c b/reactos/hal/hal/hal.c index b0b6f9a1dfc..b6590cadcbd 100644 --- a/reactos/hal/hal/hal.c +++ b/reactos/hal/hal/hal.c @@ -1,4 +1,4 @@ -/* $Id: hal.c,v 1.6 2003/10/20 06:03:28 vizzini Exp $ +/* $Id: hal.c,v 1.7 2004/10/23 23:43:23 ion Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -165,7 +165,7 @@ BOOLEAN STDCALL HalDisableSystemInterrupt( ULONG Vector, - ULONG Unknown2) + KIRQL Irql) { UNIMPLEMENTED; @@ -186,8 +186,8 @@ BOOLEAN STDCALL HalEnableSystemInterrupt( ULONG Vector, - ULONG Unknown2, - ULONG Unknown3) + KIRQL Irql, + KINTERRUPT_MODE InterruptMode) { UNIMPLEMENTED; diff --git a/reactos/hal/halx86/irql.c b/reactos/hal/halx86/irql.c index ef83ab5d89f..14279465791 100644 --- a/reactos/hal/halx86/irql.c +++ b/reactos/hal/halx86/irql.c @@ -1,4 +1,4 @@ -/* $Id: irql.c,v 1.16 2004/10/17 15:39:27 hbirr Exp $ +/* $Id: irql.c,v 1.17 2004/10/23 23:43:23 ion Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -404,8 +404,11 @@ VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) HalpEndSystemInterrupt(Irql); } -BOOLEAN STDCALL HalDisableSystemInterrupt (ULONG Vector, - ULONG Unknown2) +BOOLEAN +STDCALL +HalDisableSystemInterrupt( + ULONG Vector, + KIRQL Irql) { ULONG irq; @@ -427,9 +430,12 @@ BOOLEAN STDCALL HalDisableSystemInterrupt (ULONG Vector, } -BOOLEAN STDCALL HalEnableSystemInterrupt (ULONG Vector, - ULONG Unknown2, - ULONG Unknown3) +BOOLEAN +STDCALL +HalEnableSystemInterrupt( + ULONG Vector, + KIRQL Irql, + KINTERRUPT_MODE InterruptMode) { ULONG irq; diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h index 0d14f8420ca..ab0692c4dd0 100644 --- a/reactos/include/ddk/iotypes.h +++ b/reactos/include/ddk/iotypes.h @@ -1,4 +1,4 @@ -/* $Id: iotypes.h,v 1.65 2004/10/19 22:47:38 ekohl Exp $ +/* $Id: iotypes.h,v 1.66 2004/10/23 23:43:23 ion Exp $ * */ @@ -1292,6 +1292,12 @@ typedef struct _IO_ERROR_LOG_MESSAGE /* DMA types */ + +typedef struct _DMA_ADAPTER { + USHORT Version; + USHORT Size; + struct _DMA_OPERATIONS *DmaOperations; +} DMA_ADAPTER, *PDMA_ADAPTER; typedef struct _SCATTER_GATHER_ELEMENT { PHYSICAL_ADDRESS Address; @@ -1305,15 +1311,6 @@ typedef struct _SCATTER_GATHER_LIST { SCATTER_GATHER_ELEMENT Elements[]; } SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; -typedef struct _DMA_OPERATIONS *PDMA_OPERATIONS; - -typedef struct _DMA_ADAPTER { - USHORT Version; - USHORT Size; - PDMA_OPERATIONS DmaOperations; - PADAPTER_OBJECT HalAdapter; -} DMA_ADAPTER, *PDMA_ADAPTER; - typedef VOID (*PPUT_DMA_ADAPTER)( PDMA_ADAPTER DmaAdapter ); @@ -1415,8 +1412,7 @@ typedef struct _DMA_OPERATIONS { PREAD_DMA_COUNTER ReadDmaCounter; PGET_SCATTER_GATHER_LIST GetScatterGatherList; PPUT_SCATTER_GATHER_LIST PutScatterGatherList; -} DMA_OPERATIONS; - +} DMA_OPERATIONS, *PDMA_OPERATIONS; /* Standard bus interface */ diff --git a/reactos/include/ntos/halfuncs.h b/reactos/include/ntos/halfuncs.h index c2541aa6c06..15d28767130 100755 --- a/reactos/include/ntos/halfuncs.h +++ b/reactos/include/ntos/halfuncs.h @@ -13,12 +13,12 @@ HalBeginSystemInterrupt(ULONG Vector, BOOLEAN STDCALL HalDisableSystemInterrupt(ULONG Vector, - ULONG Unknown2); + KIRQL Irql); BOOLEAN STDCALL HalEnableSystemInterrupt(ULONG Vector, - ULONG Unknown2, - ULONG Unknown3); + KIRQL Irql, + KINTERRUPT_MODE InterruptMode); VOID STDCALL HalEndSystemInterrupt(KIRQL Irql, diff --git a/reactos/include/ntos/rtl.h b/reactos/include/ntos/rtl.h index 7b9d12a274f..ec64d54baa0 100755 --- a/reactos/include/ntos/rtl.h +++ b/reactos/include/ntos/rtl.h @@ -1,4 +1,4 @@ -/* $Id: rtl.h,v 1.35 2004/10/22 20:53:11 ekohl Exp $ +/* $Id: rtl.h,v 1.36 2004/10/23 23:43:23 ion Exp $ * */ #ifndef __DDK_RTL_H @@ -1493,6 +1493,13 @@ RtlInitializeSid (PSID Sid, PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, UCHAR SubAuthorityCount); +VOID +STDCALL +RtlInitializeBitMap( + IN PRTL_BITMAP BitMapHeader, + IN PULONG BitMapBuffer, + IN ULONG SizeOfBitMap); + VOID STDCALL RtlInitNlsTables (