branch update for HEAD-2003091401

[reactos.git] / hal / halx86 / include / hal.h

diff --git a/hal/halx86/include/hal.h b/hal/halx86/include/hal.h
index 87939c1..fb25649 100644 (file)
--- a/hal/halx86/include/hal.h
+++ b/hal/halx86/include/hal.h
@@ -5,9 +5,6 @@
 #ifndef __INTERNAL_HAL_HAL_H
 #define __INTERNAL_HAL_HAL_H
 
-//#include <ddk/service.h>
-//#include <internal/ntoskrnl.h>
-
 /*
  * FUNCTION: Probes for a BIOS32 extension
  */
@@ -18,8 +15,9 @@ VOID Hal_bios32_probe(VOID);
  */
 BOOLEAN Hal_bios32_is_service_present(ULONG service);
 
-VOID HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock);
-VOID HalResetDisplay (VOID);
+/* display.c */
+VOID FASTCALL HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock);
+VOID FASTCALL HalClearDisplay (UCHAR CharAttribute);
 
 VOID HalpInitBusHandlers (VOID);
 
@@ -36,6 +34,8 @@ VOID HalpInitPciBus (VOID);
 VOID HalpStartEnumerator (VOID);
 
 struct _ADAPTER_OBJECT {
+  INTERFACE_TYPE InterfaceType;
+  BOOLEAN Master;
   int Channel;
   PVOID PagePort;
   PVOID CountPort;
@@ -53,4 +53,12 @@ HalpQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass,
                           OUT PULONG ReturnedLength);
 
 
+/* Non-standard functions */
+VOID STDCALL
+HalReleaseDisplayOwnership();
+
+BOOLEAN STDCALL
+HalQueryDisplayOwnership();
+
+
 #endif /* __INTERNAL_HAL_HAL_H */