diff options
| author | msmith <msmith@FreeBSD.org> | 2000-09-30 20:12:27 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2000-09-30 20:12:27 +0000 |
| commit | 43b494595ef50e9426434fd028f71567c7fc2e36 (patch) | |
| tree | 04488cdbfa2a244cc961901253683a6d7f5405b8 /usr.sbin/acpi | |
| parent | 8cc643d7ff3e76e0d1cadc99dbd6ad666b8a0171 (diff) | |
| download | FreeBSD-src-43b494595ef50e9426434fd028f71567c7fc2e36.zip FreeBSD-src-43b494595ef50e9426434fd028f71567c7fc2e36.tar.gz | |
More updates to the ACPI code:
- Move all register I/O into acpi_io.c
- Move event handling into acpi_event.c
- Reorganise headers into acpivar/acpireg/acpiio
- Move find-RSDT and find-ACPI-owned-memory into acpi_machdep
- Allocate all resources (except those detailed only by AML)
as real resources. Add infrastructure that will make adding
resource support to AML code easy.
- Remove all ACPI #ifdefs in non-ACPI code
- Removed unnecessary includes
- Minor style and commenting fixes
Reviewed by: iwasaki
Diffstat (limited to 'usr.sbin/acpi')
| -rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_common.c | 2 | ||||
| -rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_region.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/acpi/amldb/aml/aml_common.c b/usr.sbin/acpi/amldb/aml/aml_common.c index 4721b7f..a00f971 100644 --- a/usr.sbin/acpi/amldb/aml/aml_common.c +++ b/usr.sbin/acpi/amldb/aml/aml_common.c @@ -42,7 +42,7 @@ #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/systm.h> -#include <sys/acpi.h> +#include <dev/acpi/acpireg.h> #ifndef ACPI_NO_OSDFUNC_INLINE #include <machine/acpica_osd.h> #endif /* !ACPI_NO_OSDFUNC_INLINE */ diff --git a/usr.sbin/acpi/amldb/aml/aml_region.c b/usr.sbin/acpi/amldb/aml/aml_region.c index e50091a..a96b2b6 100644 --- a/usr.sbin/acpi/amldb/aml/aml_region.c +++ b/usr.sbin/acpi/amldb/aml/aml_region.c @@ -32,10 +32,15 @@ * Region I/O subroutine */ +#include "opt_acpi.h" #include <sys/param.h> #include <sys/systm.h> -#include <sys/acpi.h> +#include <machine/bus.h> +#include <machine/resource.h> +#include <sys/rman.h> + +#include <dev/acpi/acpireg.h> #include <dev/acpi/aml/aml_common.h> #include <dev/acpi/aml/aml_region.h> #include <dev/acpi/aml/aml_name.h> |
