diff options
| author | msmith <msmith@FreeBSD.org> | 2001-06-29 20:19:59 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2001-06-29 20:19:59 +0000 |
| commit | 00fd1050c517bb395de620f5279efdfd9344aadd (patch) | |
| tree | 0535053dce68d7a687e540a83db6cb7edbc64788 /sys/contrib | |
| parent | 6067484852824122b9e563d289d7eafa7f9e9998 (diff) | |
| download | FreeBSD-src-00fd1050c517bb395de620f5279efdfd9344aadd.zip FreeBSD-src-00fd1050c517bb395de620f5279efdfd9344aadd.tar.gz | |
Merge FreeBSD-specific changes.
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/dev/acpica/acconfig.h | 4 | ||||
| -rw-r--r-- | sys/contrib/dev/acpica/acpiosxf.h | 5 | ||||
| -rw-r--r-- | sys/contrib/dev/acpica/acpixf.h | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/sys/contrib/dev/acpica/acconfig.h b/sys/contrib/dev/acpica/acconfig.h index 4a1e275..771d62f 100644 --- 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 */ diff --git a/sys/contrib/dev/acpica/acpiosxf.h b/sys/contrib/dev/acpica/acpiosxf.h index b84c442..f4e1642 100644 --- 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 diff --git a/sys/contrib/dev/acpica/acpixf.h b/sys/contrib/dev/acpica/acpixf.h index e314c5b..00dc6d1 100644 --- 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 |
