From 51df161b7874881fdeb6cdf3f6bac693f262af21 Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Sat, 4 Mar 2000 20:45:34 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/; revision=1029 --- reactos/include/internal/hal/ddk.h | 91 +++++++++++++++++++++--------- reactos/ntoskrnl/hal/x86/portio.c | 14 ++++- reactos/ntoskrnl/ntoskrnl.def | 26 ++++----- reactos/ntoskrnl/ntoskrnl.edf | 26 ++++----- 4 files changed, 104 insertions(+), 53 deletions(-) diff --git a/reactos/include/internal/hal/ddk.h b/reactos/include/internal/hal/ddk.h index 08cf9ba7328..f6570c6ae02 100644 --- a/reactos/include/internal/hal/ddk.h +++ b/reactos/include/internal/hal/ddk.h @@ -1,4 +1,5 @@ -/* +/* $Id: ddk.h,v 1.10 2000/03/04 20:45:33 ea Exp $ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: include/internal/hal/ddk.h @@ -64,15 +65,18 @@ typedef struct _DEVICE_DESCRIPTION typedef BOOLEAN (*PHAL_RESET_DISPLAY_PARAMETERS)(ULONG Columns, ULONG Rows); -VOID HalAcquireDisplayOwnership ( +VOID +HalAcquireDisplayOwnership ( PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters); -PVOID HalAllocateCommonBuffer(PADAPTER_OBJECT AdapterObject, +PVOID +HalAllocateCommonBuffer(PADAPTER_OBJECT AdapterObject, ULONG Length, PPHYSICAL_ADDRESS LogicalAddress, BOOLEAN CacheEnabled); -NTSTATUS HalAssignSlotResources(PUNICODE_STRING RegistryPath, +NTSTATUS +HalAssignSlotResources(PUNICODE_STRING RegistryPath, PUNICODE_STRING DriverClassName, PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT DeviceObject, @@ -81,80 +85,100 @@ NTSTATUS HalAssignSlotResources(PUNICODE_STRING RegistryPath, ULONG SlotNumber, PCM_RESOURCE_LIST* AllocatedResources); -VOID HalDisplayString (PCH String); +VOID +HalDisplayString (PCH String); -VOID HalExamineMBR(PDEVICE_OBJECT DeviceObject, +VOID +HalExamineMBR(PDEVICE_OBJECT DeviceObject, ULONG SectorSize, ULONG MBRTypeIdentifier, PVOID Buffer); -VOID HalFreeCommonBuffer(PADAPTER_OBJECT AdapterObject, +VOID +HalFreeCommonBuffer(PADAPTER_OBJECT AdapterObject, ULONG Length, PHYSICAL_ADDRESS LogicalAddress, PVOID VirtualAddress, BOOLEAN CacheEnabled); -PADAPTER_OBJECT HalGetAdapter(PDEVICE_DESCRIPTION DeviceDescription, +PADAPTER_OBJECT +HalGetAdapter(PDEVICE_DESCRIPTION DeviceDescription, PULONG NumberOfMapRegisters); -ULONG HalGetBusData(BUS_DATA_TYPE BusDataType, +ULONG +HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length); -ULONG HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, +ULONG +HalGetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length); -ULONG HalGetDmaAlignmentRequirement(VOID); +ULONG +HalGetDmaAlignmentRequirement(VOID); -ULONG HalGetInterruptVector(INTERFACE_TYPE InterfaceType, +ULONG +HalGetInterruptVector(INTERFACE_TYPE InterfaceType, ULONG BusNumber, ULONG BusInterruptLevel, ULONG BusInterruptVector, PKIRQL Irql, PKAFFINITY Affinity); -BOOLEAN HalInitSystem (ULONG Phase, +BOOLEAN +HalInitSystem (ULONG Phase, boot_param *bp); -BOOLEAN HalMakeBeep (ULONG Frequency); +BOOLEAN +HalMakeBeep (ULONG Frequency); -VOID HalQueryDisplayParameters(PULONG DispSizeX, +VOID +HalQueryDisplayParameters(PULONG DispSizeX, PULONG DispSizeY, PULONG CursorPosX, PULONG CursorPosY); -VOID HalQueryRealTimeClock(PTIME_FIELDS pTime); -VOID HalSetRealTimeClock(PTIME_FIELDS Time); +VOID +HalQueryRealTimeClock(PTIME_FIELDS pTime); +VOID +HalSetRealTimeClock(PTIME_FIELDS Time); -VOID HalQuerySystemInformation(VOID); +VOID +HalQuerySystemInformation(VOID); -ULONG HalReadDmaCounter(PADAPTER_OBJECT AdapterObject); +ULONG +HalReadDmaCounter(PADAPTER_OBJECT AdapterObject); -VOID HalReturnToFirmware(ULONG Action); +VOID +HalReturnToFirmware(ULONG Action); -ULONG HalSetBusData(BUS_DATA_TYPE BusDataType, +ULONG +HalSetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length); -ULONG HalSetBusDataByOffset(BUS_DATA_TYPE BusDataType, +ULONG +HalSetBusDataByOffset(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Offset, ULONG Length); -VOID HalSetDisplayParameters(ULONG CursorPosX, +VOID +HalSetDisplayParameters(ULONG CursorPosX, ULONG CursorPosY); -BOOLEAN HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, +BOOLEAN +HalTranslateBusAddress(INTERFACE_TYPE InterfaceType, ULONG BusNumber, PHYSICAL_ADDRESS BusAddress, PULONG AddressSpace, @@ -172,8 +196,11 @@ typedef struct _KD_PORT_INFORMATION } KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; -extern ULONG KdComPortInUse; - +#if defined(__HAL__) || defined(__NTOSKRNL__) +extern ULONG KdComPortInUse __declspec(dllexport); +#else +extern ULONG KdComPortInUse __declspec(dllimport); +#endif BOOLEAN STDCALL @@ -191,39 +218,51 @@ KdPortPutByte (UCHAR ByteToSend); */ VOID +STDCALL READ_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Value, ULONG Count); VOID +STDCALL READ_PORT_BUFFER_ULONG (PULONG Port, PULONG Value, ULONG Count); VOID +STDCALL READ_PORT_BUFFER_USHORT (PUSHORT Port, PUSHORT Value, ULONG Count); UCHAR +STDCALL READ_PORT_UCHAR (PUCHAR Port); ULONG +STDCALL READ_PORT_ULONG (PULONG Port); USHORT +STDCALL READ_PORT_USHORT (PUSHORT Port); VOID +STDCALL WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Value, ULONG Count); VOID +STDCALL WRITE_PORT_BUFFER_ULONG (PULONG Port, PULONG Value, ULONG Count); VOID +STDCALL WRITE_PORT_BUFFER_USHORT (PUSHORT Port, PUSHORT Value, ULONG Count); VOID +STDCALL WRITE_PORT_UCHAR (PUCHAR Port, UCHAR Value); VOID +STDCALL WRITE_PORT_ULONG (PULONG Port, ULONG Value); VOID +STDCALL WRITE_PORT_USHORT (PUSHORT Port, USHORT Value); diff --git a/reactos/ntoskrnl/hal/x86/portio.c b/reactos/ntoskrnl/hal/x86/portio.c index db2ec7b6e71..e0ab9169043 100644 --- a/reactos/ntoskrnl/hal/x86/portio.c +++ b/reactos/ntoskrnl/hal/x86/portio.c @@ -1,4 +1,4 @@ -/* $Id: portio.c,v 1.2 1999/12/12 03:48:47 phreak Exp $ +/* $Id: portio.c,v 1.3 2000/03/04 20:45:34 ea Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -16,6 +16,7 @@ /* FUNCTIONS ****************************************************************/ VOID +STDCALL READ_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) @@ -25,6 +26,7 @@ READ_PORT_BUFFER_UCHAR (PUCHAR Port, VOID +STDCALL READ_PORT_BUFFER_ULONG (PULONG Port, PULONG Buffer, ULONG Count) @@ -34,6 +36,7 @@ READ_PORT_BUFFER_ULONG (PULONG Port, VOID +STDCALL READ_PORT_BUFFER_USHORT (PUSHORT Port, PUSHORT Buffer, ULONG Count) @@ -43,6 +46,7 @@ READ_PORT_BUFFER_USHORT (PUSHORT Port, UCHAR +STDCALL READ_PORT_UCHAR (PUCHAR Port) { return inb_p ((ULONG)Port); @@ -50,6 +54,7 @@ READ_PORT_UCHAR (PUCHAR Port) ULONG +STDCALL READ_PORT_ULONG (PULONG Port) { return inl_p ((ULONG)Port); @@ -57,6 +62,7 @@ READ_PORT_ULONG (PULONG Port) USHORT +STDCALL READ_PORT_USHORT (PUSHORT Port) { return inw_p ((ULONG)Port); @@ -64,6 +70,7 @@ READ_PORT_USHORT (PUSHORT Port) VOID +STDCALL WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, PUCHAR Buffer, ULONG Count) @@ -73,6 +80,7 @@ WRITE_PORT_BUFFER_UCHAR (PUCHAR Port, VOID +STDCALL WRITE_PORT_BUFFER_ULONG (PULONG Port, PULONG Buffer, ULONG Count) @@ -82,6 +90,7 @@ WRITE_PORT_BUFFER_ULONG (PULONG Port, VOID +STDCALL WRITE_PORT_BUFFER_USHORT (PUSHORT Port, PUSHORT Buffer, ULONG Count) @@ -91,6 +100,7 @@ WRITE_PORT_BUFFER_USHORT (PUSHORT Port, VOID +STDCALL WRITE_PORT_UCHAR (PUCHAR Port, UCHAR Value) { @@ -99,6 +109,7 @@ WRITE_PORT_UCHAR (PUCHAR Port, VOID +STDCALL WRITE_PORT_ULONG (PULONG Port, ULONG Value) { @@ -107,6 +118,7 @@ WRITE_PORT_ULONG (PULONG Port, VOID +STDCALL WRITE_PORT_USHORT (PUSHORT Port, USHORT Value) { diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def index 4d943124eb6..a537399289d 100644 --- a/reactos/ntoskrnl/ntoskrnl.def +++ b/reactos/ntoskrnl/ntoskrnl.def @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.def,v 1.49 2000/03/03 00:43:28 ekohl Exp $ +; $Id: ntoskrnl.def,v 1.50 2000/03/04 20:45:34 ea Exp $ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -686,18 +686,18 @@ KeStallExecutionProcessor ;KfLowerIrql ;KfRaiseIrql ;KfReleaseSpinLock -READ_PORT_BUFFER_UCHAR -READ_PORT_BUFFER_ULONG -READ_PORT_BUFFER_USHORT -READ_PORT_UCHAR -READ_PORT_ULONG -READ_PORT_USHORT -WRITE_PORT_BUFFER_UCHAR -WRITE_PORT_BUFFER_ULONG -WRITE_PORT_BUFFER_USHORT -WRITE_PORT_UCHAR -WRITE_PORT_ULONG -WRITE_PORT_USHORT +READ_PORT_BUFFER_UCHAR@12 +READ_PORT_BUFFER_ULONG@12 +READ_PORT_BUFFER_USHORT@12 +READ_PORT_UCHAR@4 +READ_PORT_ULONG@4 +READ_PORT_USHORT@4 +WRITE_PORT_BUFFER_UCHAR@12 +WRITE_PORT_BUFFER_ULONG@12 +WRITE_PORT_BUFFER_USHORT@12 +WRITE_PORT_UCHAR@8 +WRITE_PORT_ULONG@8 +WRITE_PORT_USHORT@8 InsertTailList RemoveEntryList _KeServiceDescriptorTable DATA diff --git a/reactos/ntoskrnl/ntoskrnl.edf b/reactos/ntoskrnl/ntoskrnl.edf index 6b9cc3b5a81..3835255052c 100644 --- a/reactos/ntoskrnl/ntoskrnl.edf +++ b/reactos/ntoskrnl/ntoskrnl.edf @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.edf,v 1.36 2000/03/03 00:43:29 ekohl Exp $ +; $Id: ntoskrnl.edf,v 1.37 2000/03/04 20:45:34 ea Exp $ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -600,18 +600,18 @@ KeStallExecutionProcessor ;KfLowerIrql ;KfRaiseIrql ;KfReleaseSpinLock -READ_PORT_BUFFER_UCHAR -READ_PORT_BUFFER_ULONG -READ_PORT_BUFFER_USHORT -READ_PORT_UCHAR -READ_PORT_ULONG -READ_PORT_USHORT -WRITE_PORT_BUFFER_UCHAR -WRITE_PORT_BUFFER_ULONG -WRITE_PORT_BUFFER_USHORT -WRITE_PORT_UCHAR -WRITE_PORT_ULONG -WRITE_PORT_USHORT +READ_PORT_BUFFER_UCHAR=READ_PORT_BUFFER_UCHAR@12 +READ_PORT_BUFFER_ULONG=READ_PORT_BUFFER_ULONG@12 +READ_PORT_BUFFER_USHORT=READ_PORT_BUFFER_USHORT@12 +READ_PORT_UCHAR=READ_PORT_UCHAR@4 +READ_PORT_ULONG=READ_PORT_ULONG@4 +READ_PORT_USHORT=READ_PORT_USHORT@4 +WRITE_PORT_BUFFER_UCHAR=WRITE_PORT_BUFFER_UCHAR@12 +WRITE_PORT_BUFFER_ULONG=WRITE_PORT_BUFFER_ULONG@12 +WRITE_PORT_BUFFER_USHORT=WRITE_PORT_BUFFER_USHORT@12 +WRITE_PORT_UCHAR=WRITE_PORT_UCHAR@8 +WRITE_PORT_ULONG=WRITE_PORT_ULONG@8 +WRITE_PORT_USHORT=WRITE_PORT_USHORT@8 InsertTailList RemoveEntryList KeServiceDescriptorTable DATA