diff options
| author | Mark Santcroos <marks@FreeBSD.org> | 2004-07-02 08:34:19 +0000 |
|---|---|---|
| committer | Mark Santcroos <marks@FreeBSD.org> | 2004-07-02 08:34:19 +0000 |
| commit | 727fde6f33f9dae8e59c2d597db15cead4d3a2f3 (patch) | |
| tree | 8a46422a6595e9bfa1246e80ba85cd78b1fbb813 /sys/contrib/dev | |
| parent | 648474d5f411c86beb1a628593fa9ef2a3d4fba3 (diff) | |
| download | src-727fde6f33f9dae8e59c2d597db15cead4d3a2f3.tar.gz src-727fde6f33f9dae8e59c2d597db15cead4d3a2f3.zip | |
Unchanged files that are off the vendor branch.
Notes
Notes:
svn path=/head/; revision=131443
Diffstat (limited to 'sys/contrib/dev')
| -rw-r--r-- | sys/contrib/dev/acpica/acconfig.h | 15 | ||||
| -rw-r--r-- | sys/contrib/dev/acpica/acfreebsd.h | 3 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sys/contrib/dev/acpica/acconfig.h b/sys/contrib/dev/acpica/acconfig.h index f88098bed096..a953ca60109a 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: 156 $ + * $Revision: 158 $ * *****************************************************************************/ @@ -137,7 +137,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20040514 +#define ACPI_CA_VERSION 0x20040527 /* * OS name, used for the _OS object. The _OS object is essentially obsolete, @@ -151,7 +151,7 @@ /* Maximum objects in the various object caches */ -#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects for stacks */ +#define ACPI_MAX_STATE_CACHE_DEPTH 64 /* State objects */ #define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */ #define ACPI_MAX_EXTPARSE_CACHE_DEPTH 64 /* Parse tree objects */ #define ACPI_MAX_OBJECT_CACHE_DEPTH 64 /* Interpreter operand objects */ @@ -235,10 +235,11 @@ /* Constants used in searching for the RSDP in low memory */ -#define ACPI_LO_RSDP_WINDOW_BASE 0 /* Physical Address */ -#define ACPI_HI_RSDP_WINDOW_BASE 0xE0000 /* Physical Address */ -#define ACPI_LO_RSDP_WINDOW_SIZE 0x400 -#define ACPI_HI_RSDP_WINDOW_SIZE 0x20000 +#define ACPI_EBDA_PTR_LOCATION 0x0000040E /* Physical Address */ +#define ACPI_EBDA_PTR_LENGTH 2 +#define ACPI_EBDA_WINDOW_SIZE 1024 +#define ACPI_HI_RSDP_WINDOW_BASE 0x000E0000 /* Physical Address */ +#define ACPI_HI_RSDP_WINDOW_SIZE 0x00020000 #define ACPI_RSDP_SCAN_STEP 16 /* Operation regions */ diff --git a/sys/contrib/dev/acpica/acfreebsd.h b/sys/contrib/dev/acpica/acfreebsd.h index 9df8639df865..3ffaccb66175 100644 --- a/sys/contrib/dev/acpica/acfreebsd.h +++ b/sys/contrib/dev/acpica/acfreebsd.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acfreebsd.h - OS specific defines, etc. - * $Revision: 15 $ + * $Revision: 17 $ * *****************************************************************************/ @@ -156,6 +156,7 @@ /* Not building kernel code, so use libc */ #define ACPI_USE_STANDARD_HEADERS #define ACPI_FLUSH_CPU_CACHE() + #if __STDC_HOSTED__ #include <ctype.h> #endif |