1 files changed, 44 insertions, 7 deletions

diff --git a/sys/contrib/dev/acpica/acpiosxf.h b/sys/contrib/dev/acpica/acpiosxf.h
index e96dcb9..acbd985 100644
--- a/sys/contrib/dev/acpica/acpiosxf.h
+++ b/sys/contrib/dev/acpica/acpiosxf.h
@@ -12,7 +12,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -121,7 +121,7 @@
 #ifndef __ACPIOSXF_H__
 #define __ACPIOSXF_H__
 
-#include "platform/acenv.h"
+#include "acenv.h"
 #include "actypes.h"
 
 
@@ -141,7 +141,7 @@
 #define ACPI_SIGNAL_FATAL           0
 #define ACPI_SIGNAL_BREAKPOINT      1
 
-typedef struct AcpiFatalInfo
+typedef struct acpi_signal_fatal_info
 {
     UINT32                  Type;
     UINT32                  Code;
@@ -186,6 +186,11 @@ AcpiOsGetRootPointer (
     ACPI_POINTER            *Address);
 
 ACPI_STATUS
+AcpiOsPredefinedOverride (
+    const ACPI_PREDEFINED_NAMES *InitVal,
+    ACPI_STRING                 *NewVal);
+
+ACPI_STATUS
 AcpiOsTableOverride (
     ACPI_TABLE_HEADER       *ExistingTable,
     ACPI_TABLE_HEADER       **NewTable);
@@ -338,6 +343,14 @@ AcpiOsWritePciConfiguration (
     ACPI_INTEGER            Value,
     UINT32                  Width);
 
+/*
+ * Interim function needed for PCI IRQ routing
+ */
+void
+AcpiOsDerivePciId(
+    ACPI_HANDLE             rhandle,
+    ACPI_HANDLE             chandle,
+    ACPI_PCI_ID             **PciId);
 
 /*
  * Miscellaneous
@@ -368,12 +381,12 @@ AcpiOsSignal (
 
 void ACPI_INTERNAL_VAR_XFACE
 AcpiOsPrintf (
-    const NATIVE_CHAR       *Format,
+    const char              *Format,
     ...);
 
 void
 AcpiOsVprintf (
-    const NATIVE_CHAR       *Format,
+    const char              *Format,
     va_list                 Args);
 
 void
@@ -387,8 +400,32 @@ AcpiOsRedirectOutput (
 
 UINT32
 AcpiOsGetLine (
-    NATIVE_CHAR             *Buffer);
+    char                    *Buffer);
+
+
+/*
+ * Directory manipulation
+ */
+
+void *
+AcpiOsOpenDirectory (
+    char                    *Pathname,
+    char                    *WildcardSpec,
+    char                    RequestedFileType);
+
+/* RequesteFileType values */
 
+#define REQUEST_FILE_ONLY                   0
+#define REQUEST_DIR_ONLY                    1
+
+
+char *
+AcpiOsGetNextFilename (
+    void                    *DirHandle);
+
+void
+AcpiOsCloseDirectory (
+    void                    *DirHandle);
 
 /*
  * Debug
@@ -399,7 +436,7 @@ AcpiOsDbgAssert(
     void                    *FailedAssertion,
     void                    *FileName,
     UINT32                  LineNumber,
-    NATIVE_CHAR             *Message);
+    char                    *Message);
 
 
 #endif /* __ACPIOSXF_H__ */