Merge FreeBSD-specific changes.

2001-06-29 20:19:59 +00:00 · 2001-06-29 20:19:59 +00:00 · 47d9ea1be8
commit 47d9ea1be8
parent 12c1e8d4b6
3 changed files with 14 additions and 2 deletions
--- a/sys/contrib/dev/acpica/acconfig.h
+++ b/sys/contrib/dev/acpica/acconfig.h
@ -1,7 +1,7 @@
 /******************************************************************************
 *
 * Name: acconfig.h - Global configuration constants
- *       $Revision: 64 $
+ *       $Revision: 65 $
 *
 *****************************************************************************/

@ -144,7 +144,7 @@

 /* Version string */

-#define ACPI_CA_VERSION             0x20010518
+#define ACPI_CA_VERSION             0x20010615


 /* Maximum objects in the various object caches */
--- a/sys/contrib/dev/acpica/acpiosxf.h
+++ b/sys/contrib/dev/acpica/acpiosxf.h
@ -392,6 +392,11 @@ AcpiOsWritable (
    void                    *Pointer,
    UINT32                  Length);

+UINT32
+AcpiOsGetTimer (
+    void);
+
+

 /*
 * Debug print routines
--- a/sys/contrib/dev/acpica/acpixf.h
+++ b/sys/contrib/dev/acpica/acpixf.h
@ -205,6 +205,13 @@ AcpiGetTable (
    UINT32                  Instance,
    ACPI_BUFFER             *RetBuffer);

+ACPI_STATUS
+AcpiGetFirmwareTable (
+    ACPI_STRING             Signature,
+    UINT32                  Instance,
+    UINT32                  Flags,
+    ACPI_TABLE_HEADER       **TablePointer);
+

 /*
 * Namespace and name interfaces