Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed up some HAL prototypes and fixed some header problems in regards to upcoming DMA patch I will commit tomorrow.

Browse source 
svn path=/trunk/; revision=11407
This commit is contained in:
Alex Ionescu 2004-10-23 23:43:23 +00:00
parent eae828b789
commit cad7a781f2
6 changed files with 46 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/drivers/video/videoprt/videoprt.h
View file

@ -18,7 +18,7 @@
* If not, write to the Free Software Foundation, * If not, write to the Free Software Foundation,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 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 #ifndef VIDEOPRT_H
@ -33,8 +33,16 @@
int swprintf(wchar_t *buf, const wchar_t *fmt, ...); int swprintf(wchar_t *buf, const wchar_t *fmt, ...);
int vsprintf(char *buf, const char *fmt, va_list args); 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); PIMAGE_NT_HEADERS STDCALL RtlImageNtHeader(IN PVOID BaseAddress);
#define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P')

8
reactos/hal/hal/hal.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -165,7 +165,7 @@ BOOLEAN
STDCALL STDCALL
HalDisableSystemInterrupt( HalDisableSystemInterrupt(
ULONG Vector, ULONG Vector,
ULONG Unknown2) KIRQL Irql)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
@ -186,8 +186,8 @@ BOOLEAN
STDCALL STDCALL
HalEnableSystemInterrupt( HalEnableSystemInterrupt(
ULONG Vector, ULONG Vector,
ULONG Unknown2, KIRQL Irql,
ULONG Unknown3) KINTERRUPT_MODE InterruptMode)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;

18
reactos/hal/halx86/irql.c
View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -404,8 +404,11 @@ VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2)
HalpEndSystemInterrupt(Irql); HalpEndSystemInterrupt(Irql);
} }
BOOLEAN STDCALL HalDisableSystemInterrupt (ULONG Vector, BOOLEAN
ULONG Unknown2) STDCALL
HalDisableSystemInterrupt(
ULONG Vector,
KIRQL Irql)
{ {
ULONG irq; ULONG irq;
@ -427,9 +430,12 @@ BOOLEAN STDCALL HalDisableSystemInterrupt (ULONG Vector,
} }
BOOLEAN STDCALL HalEnableSystemInterrupt (ULONG Vector, BOOLEAN
ULONG Unknown2, STDCALL
ULONG Unknown3) HalEnableSystemInterrupt(
ULONG Vector,
KIRQL Irql,
KINTERRUPT_MODE InterruptMode)
{ {
ULONG irq; ULONG irq;

20
reactos/include/ddk/iotypes.h
View file

@ -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 */ /* DMA types */
typedef struct _DMA_ADAPTER {
USHORT Version;
USHORT Size;
struct _DMA_OPERATIONS *DmaOperations;
} DMA_ADAPTER, *PDMA_ADAPTER;
typedef struct _SCATTER_GATHER_ELEMENT { typedef struct _SCATTER_GATHER_ELEMENT {
PHYSICAL_ADDRESS Address; PHYSICAL_ADDRESS Address;
@ -1305,15 +1311,6 @@ typedef struct _SCATTER_GATHER_LIST {
SCATTER_GATHER_ELEMENT Elements[]; SCATTER_GATHER_ELEMENT Elements[];
} SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; } 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)( typedef VOID (*PPUT_DMA_ADAPTER)(
PDMA_ADAPTER DmaAdapter PDMA_ADAPTER DmaAdapter
); );
@ -1415,8 +1412,7 @@ typedef struct _DMA_OPERATIONS {
PREAD_DMA_COUNTER ReadDmaCounter; PREAD_DMA_COUNTER ReadDmaCounter;
PGET_SCATTER_GATHER_LIST GetScatterGatherList; PGET_SCATTER_GATHER_LIST GetScatterGatherList;
PPUT_SCATTER_GATHER_LIST PutScatterGatherList; PPUT_SCATTER_GATHER_LIST PutScatterGatherList;
} DMA_OPERATIONS; } DMA_OPERATIONS, *PDMA_OPERATIONS;
/* Standard bus interface */ /* Standard bus interface */

6
reactos/include/ntos/halfuncs.h
View file

@ -13,12 +13,12 @@ HalBeginSystemInterrupt(ULONG Vector,
BOOLEAN STDCALL BOOLEAN STDCALL
HalDisableSystemInterrupt(ULONG Vector, HalDisableSystemInterrupt(ULONG Vector,
ULONG Unknown2); KIRQL Irql);
BOOLEAN STDCALL BOOLEAN STDCALL
HalEnableSystemInterrupt(ULONG Vector, HalEnableSystemInterrupt(ULONG Vector,
ULONG Unknown2, KIRQL Irql,
ULONG Unknown3); KINTERRUPT_MODE InterruptMode);
VOID STDCALL VOID STDCALL
HalEndSystemInterrupt(KIRQL Irql, HalEndSystemInterrupt(KIRQL Irql,

9
reactos/include/ntos/rtl.h
View file

@ -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 #ifndef __DDK_RTL_H
@ -1493,6 +1493,13 @@ RtlInitializeSid (PSID Sid,
PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, PSID_IDENTIFIER_AUTHORITY IdentifierAuthority,
UCHAR SubAuthorityCount); UCHAR SubAuthorityCount);
VOID
STDCALL
RtlInitializeBitMap(
IN PRTL_BITMAP BitMapHeader,
IN PULONG BitMapBuffer,
IN ULONG SizeOfBitMap);
VOID VOID
STDCALL STDCALL
RtlInitNlsTables ( RtlInitNlsTables (