Moved all standard C headers to environment.h

date	99.06.09.17.30.00;	author rmoore1;	state Exp;

source/include/acpi.h

@@ -98,19 +98,12 @@
 #ifndef __ACPI_H__
 #define __ACPI_H__
 
-/*
- * Standard C library headers.
- * We want to keep these to a minimum.
- */
-#include <stdio.h>
-#include <limits.h>
-
-
 /* 
  * Common includes for all ACPI driver files
  * We put them here because we don't want to duplicate them
  * in the rest of the source code again and again.
  */
+#include <environment.h>    /* Target environment specific items */
 #include <datatypes.h>      /* Fundamental data types */
 #include <excep.h>          /* Local exception codes */
 #include <config.h>         /* Configuration constants */
@@ -123,7 +116,6 @@
 #include <common.h>         /* Common (global) interfaces */
 
 
-
 /* Version string */
 
 #define ACPI_LIB_VER "032"

source/include/acpiosxf.h

@@ -97,57 +97,16 @@
  *****************************************************************************/
 
 
+#include <environment.h>
 #include <datatypes.h>
 #include <acpiasm.h>
-#include <stdarg.h>
 
 
 
-/* File I/O */
 
-//#define LogHandle void*
-
-OSD_FILE *
-OsdOpen (
-    const char      *filename, 
-    const char      *mode);
-
-INT32 
-OsdClose (
-    OSD_FILE        *stream);
-
-UINT32 
-OsdRead (
-    void            *buffer, 
-    UINT32          size, 
-    UINT32          count, 
-    OSD_FILE        *stream);
-
-UINT32 
-OsdWrite (
-    const void      *buffer, 
-    UINT32          size, 
-    UINT32          count, 
-    OSD_FILE        *stream); 
-
-INT32 
-OsdPrintf (
-    OSD_FILE        *stream, 
-    const char      *format, 
-    ...);
-
-INT32
-OsdVprintf (
-    OSD_FILE        *stream, 
-    const char      *format, 
-    va_list         args);
-
-INT32 
-OsdFlushall (
-    void);
-
-
-/* Memory allocation */
+/* 
+ * Memory allocation and mapping 
+ */
 
 void *
 OsdAllocate (
@@ -161,9 +120,6 @@ void
 OsdFree (
     void *          mem);
 
-
-/* Memory mapping */
-
 char *
 OsdMapMemory (
     UINT32          where,
@@ -175,8 +131,9 @@ OsdUnMapMemory (
     UINT32          length);
 
 
-
-/* Interrupt handlers */
+/* 
+ * Interrupt handlers 
+ */
 
 UINT32
 OsdInstallInterruptHandler (
@@ -189,7 +146,9 @@ OsdRemoveInterruptHandler (
     UINT32          Handle);
 
 
-/* Scheduling */
+/* 
+ * Scheduling 
+ */
 
 void
 OsdSleep (
@@ -201,7 +160,6 @@ OsdSleepUsec (
     UINT32          microseconds);
 
 
-
 /*
  * Platform/Hardware independent I/O interfaces
  */
@@ -281,5 +239,52 @@ OsdWritePciCfgDword (
     UINT32          Value);
 
 
+/*
+ * Debug print routines 
+ */
+
+INT32 
+OsdPrintf (
+    OSD_FILE        *stream, 
+    const char      *format, 
+    ...);
+
+INT32
+OsdVprintf (
+    OSD_FILE        *stream, 
+    const char      *format, 
+    va_list         args);
+
+
+/* 
+ * File I/O 
+ * TBD: These may be removed completely since it is not always
+ * possible to do file I/O from a kernel mode driver, especially
+ * during system initialization!
+ */
+
+OSD_FILE *
+OsdOpen (
+    const char      *filename, 
+    const char      *mode);
+
+INT32 
+OsdClose (
+    OSD_FILE        *stream);
+
+UINT32 
+OsdRead (
+    void            *buffer, 
+    UINT32          size, 
+    UINT32          count, 
+    OSD_FILE        *stream);
+
+UINT32 
+OsdWrite (
+    const void      *buffer, 
+    UINT32          size, 
+    UINT32          count, 
+    OSD_FILE        *stream); 
+