- Move non-DDK HAL function prototypes from ROS DDK to NTOS headers.

Modified: trunk/reactos/include/ddk/halfuncs.h
Modified: trunk/reactos/include/ntos/halfuncs.h

--- trunk/reactos/include/ddk/halfuncs.h	2005-06-18 15:50:23 UTC (rev 16045)
+++ trunk/reactos/include/ddk/halfuncs.h	2005-06-18 15:55:23 UTC (rev 16046)
@@ -9,9 +9,6 @@

 HalAcquireDisplayOwnership(IN PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters);
 
 NTSTATUS STDCALL

-HalAdjustResourceList(PCM_RESOURCE_LIST	Resources);
-
-NTSTATUS STDCALL

 HalAllocateAdapterChannel(IN PADAPTER_OBJECT AdapterObject,
 			  IN PWAIT_CONTEXT_BLOCK WaitContextBlock,
 			  IN ULONG NumberOfMapRegisters,
@@ -39,17 +36,11 @@

 	PCM_RESOURCE_LIST	*AllocatedResources
 	);
 

-VOID STDCALL
-HalCalibratePerformanceCounter(ULONG Count);
-

 /*
 FASTCALL
 HalClearSoftwareInterrupt
 */
 

-VOID STDCALL
-HalDisplayString(IN PCH String);
-

 /*
  * HalExamineMBR() is not exported explicitly.
  * It is exported by the HalDispatchTable.
@@ -61,16 +52,6 @@

  *               PVOID Buffer);
  */
 

-BOOLEAN STDCALL
-HalFlushCommonBuffer(ULONG Unknown1,
-		     ULONG Unknown2,
-		     ULONG Unknown3,
-		     ULONG Unknown4,
-		     ULONG Unknown5,
-		     ULONG Unknown6,
-		     ULONG Unknown7,
-		     ULONG Unknown8);
-

 VOID STDCALL
 HalFreeCommonBuffer(PADAPTER_OBJECT AdapterObject,
 		    ULONG Length,
@@ -97,23 +78,11 @@

 		      ULONG Offset,
 		      ULONG Length);
 

-/* Is this function really exported ??
-ULONG
-HalGetDmaAlignmentRequirement(VOID);
-NTOSAPI
-DDKAPI
-*/
-

 ULONG STDCALL
 HalGetDmaAlignmentRequirement( 
   VOID);
 
 			   

-BOOLEAN STDCALL
-HalGetEnvironmentVariable(IN PCH Name,
-			  OUT PCH Value,
-			  IN USHORT ValueLength);
-

 ULONG STDCALL
 HalGetInterruptVector(INTERFACE_TYPE InterfaceType,
 		      ULONG BusNumber,
@@ -125,15 +94,6 @@

 BOOLEAN STDCALL
 HalMakeBeep(ULONG Frequency);
 

-VOID STDCALL
-HalQueryDisplayParameters(PULONG DispSizeX,
-			  PULONG DispSizeY,
-			  PULONG CursorPosX,
-			  PULONG CursorPosY);
-
-VOID STDCALL
-HalQueryRealTimeClock(PTIME_FIELDS Time);
-

 /*
  * HalQuerySystemInformation() is not exported explicitly.
  * It is exported by the HalDispatchTable.
@@ -145,9 +105,6 @@

 ULONG STDCALL
 HalReadDmaCounter(PADAPTER_OBJECT AdapterObject);
 

-VOID STDCALL
-HalRequestIpi(ULONG Unknown);
-

 /*
 FASTCALL
 HalRequestSoftwareInterrupt
@@ -168,14 +125,6 @@

 		      ULONG Offset,
 		      ULONG Length);
 

-VOID STDCALL
-HalSetDisplayParameters(ULONG CursorPosX,
-			ULONG CursorPosY);
-
-BOOLEAN STDCALL
-HalSetEnvironmentVariable(IN PCH Name,
-			  IN PCH Value);
-

 /*
 HalSetProfileInterval
 */
@@ -199,10 +148,6 @@

 HalStopProfileInterrupt
 */
 

-ULONG FASTCALL
-HalSystemVectorDispatchEntry(ULONG Unknown1,
-			     ULONG Unknown2,
-			     ULONG Unknown3);

 
 BOOLEAN STDCALL
 HalTranslateBusAddress(INTERFACE_TYPE InterfaceType,
@@ -213,25 +158,6 @@

 
 
 /*

- * Kernel debugger support functions
- */
-
-BOOLEAN STDCALL
-KdPortInitialize(PKD_PORT_INFORMATION PortInformation,
-		 DWORD Unknown1,
-		 DWORD Unknown2);
-
-BOOLEAN STDCALL
-KdPortGetByte(PUCHAR ByteRecieved);
-
-BOOLEAN STDCALL
-KdPortPollByte(PUCHAR ByteRecieved);
-
-VOID STDCALL
-KdPortPutByte(UCHAR ByteToSend);
-
-
-/*

  * Port I/O functions
  */
 

--- trunk/reactos/include/ntos/halfuncs.h	2005-06-18 15:50:23 UTC (rev 16045)
+++ trunk/reactos/include/ntos/halfuncs.h	2005-06-18 15:55:23 UTC (rev 16046)
@@ -3,6 +3,9 @@

 
 #include <ntos/haltypes.h>
 

+NTSTATUS STDCALL
+HalAdjustResourceList(PCM_RESOURCE_LIST	Resources);
+

 BOOLEAN STDCALL
 HalAllProcessorsStarted(VOID);
 
@@ -17,10 +20,16 @@

   KIRQL Irql,
   PKIRQL OldIrql);
 

+VOID STDCALL
+HalCalibratePerformanceCounter(ULONG Count);
+

 BOOLEAN STDCALL
 HalDisableSystemInterrupt(ULONG Vector,
   KIRQL Irql);
 

+VOID STDCALL
+HalDisplayString(IN PCH String);
+

 BOOLEAN STDCALL
 HalEnableSystemInterrupt(ULONG Vector,
   KIRQL Irql,
@@ -30,6 +39,21 @@

 HalEndSystemInterrupt(KIRQL Irql,
   ULONG Unknown2);
 

+BOOLEAN STDCALL
+HalFlushCommonBuffer(ULONG Unknown1,
+		     ULONG Unknown2,
+		     ULONG Unknown3,
+		     ULONG Unknown4,
+		     ULONG Unknown5,
+		     ULONG Unknown6,
+		     ULONG Unknown7,
+		     ULONG Unknown8);
+
+BOOLEAN STDCALL
+HalGetEnvironmentVariable(IN PCH Name,
+			  OUT PCH Value,
+			  IN USHORT ValueLength);
+

 VOID STDCALL
 HalInitializeProcessor(ULONG ProcessorNumber,
   PVOID ProcessorStack);
@@ -39,8 +63,33 @@

   PLOADER_PARAMETER_BLOCK LoaderBlock);
 
 VOID STDCALL

+HalQueryDisplayParameters(PULONG DispSizeX,
+			  PULONG DispSizeY,
+			  PULONG CursorPosX,
+			  PULONG CursorPosY);
+
+VOID STDCALL
+HalQueryRealTimeClock(PTIME_FIELDS Time);
+
+VOID STDCALL

 HalReportResourceUsage(VOID);
 

+VOID STDCALL
+HalRequestIpi(ULONG Unknown);
+
+VOID STDCALL
+HalSetDisplayParameters(ULONG CursorPosX,
+			ULONG CursorPosY);
+
+BOOLEAN STDCALL
+HalSetEnvironmentVariable(IN PCH Name,
+			  IN PCH Value);
+
+ULONG FASTCALL
+HalSystemVectorDispatchEntry(ULONG Unknown1,
+			     ULONG Unknown2,
+			     ULONG Unknown3);
+

 VOID
 STDCALL
 IoAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock,
@@ -58,6 +107,24 @@

 VOID FASTCALL
 HalRequestSoftwareInterrupt(KIRQL SoftwareInterruptRequested);
 

+/*
+ * Kernel debugger support functions
+ */
+
+BOOLEAN STDCALL
+KdPortInitialize(PKD_PORT_INFORMATION PortInformation,
+		 DWORD Unknown1,
+		 DWORD Unknown2);
+
+BOOLEAN STDCALL
+KdPortGetByte(PUCHAR ByteRecieved);
+
+BOOLEAN STDCALL
+KdPortPollByte(PUCHAR ByteRecieved);
+
+VOID STDCALL
+KdPortPutByte(UCHAR ByteToSend);
+

 /* Non-standard functions */
 VOID STDCALL
 HalReleaseDisplayOwnership();