diff options
-rw-r--r-- | usr.sbin/acpi/amldb/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_amlmem.c | 6 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_amlmem.h | 2 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_common.c | 16 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_env.h | 6 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_evalobj.c | 20 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_memman.c | 2 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_name.c | 8 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_name.h | 2 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_obj.c | 12 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_parse.c | 18 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_region.c | 6 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/aml/aml_store.c | 18 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/amldb.c | 10 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/debug.c | 20 | ||||
-rw-r--r-- | usr.sbin/acpi/amldb/region.c | 8 |
16 files changed, 79 insertions, 79 deletions
diff --git a/usr.sbin/acpi/amldb/Makefile b/usr.sbin/acpi/amldb/Makefile index e0f92a5..e518eb8 100644 --- a/usr.sbin/acpi/amldb/Makefile +++ b/usr.sbin/acpi/amldb/Makefile @@ -6,7 +6,7 @@ SRCS= amldb.c debug.c region.c SRCS+= aml_parse.c aml_name.c aml_amlmem.c aml_memman.c aml_store.c aml_obj.c aml_evalobj.c aml_common.c MAN8= amldb.8 #DEBUG_FLAGS= -g -CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} +CFLAGS+= -I${.CURDIR} .include <bsd.prog.mk> -.PATH: ${.CURDIR}/../../../sys/dev/acpi/aml +.PATH: ${.CURDIR}/aml diff --git a/usr.sbin/acpi/amldb/aml/aml_amlmem.c b/usr.sbin/acpi/amldb/aml/aml_amlmem.c index 6498f63..e8f42b9 100644 --- a/usr.sbin/acpi/amldb/aml/aml_amlmem.c +++ b/usr.sbin/acpi/amldb/aml/aml_amlmem.c @@ -33,9 +33,9 @@ #include <sys/param.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_memman.h> -#include <dev/acpi/aml/aml_name.h> +#include <aml/aml_env.h> +#include <aml/aml_memman.h> +#include <aml/aml_name.h> MEMMAN_INITIALSTORAGE_DESC(struct aml_namestr, _aml_namestr_storage); MEMMAN_INITIALSTORAGE_DESC(struct aml_num, _aml_num_storage); diff --git a/usr.sbin/acpi/amldb/aml/aml_amlmem.h b/usr.sbin/acpi/amldb/aml/aml_amlmem.h index ed76565..d210a7e 100644 --- a/usr.sbin/acpi/amldb/aml/aml_amlmem.h +++ b/usr.sbin/acpi/amldb/aml/aml_amlmem.h @@ -34,7 +34,7 @@ * AML Namespace Memory Management */ -#include <dev/acpi/aml/aml_memman.h> +#include <aml/aml_memman.h> enum { memid_aml_namestr = 0, diff --git a/usr.sbin/acpi/amldb/aml/aml_common.c b/usr.sbin/acpi/amldb/aml/aml_common.c index da616a6..0b8816b 100644 --- a/usr.sbin/acpi/amldb/aml/aml_common.c +++ b/usr.sbin/acpi/amldb/aml/aml_common.c @@ -51,14 +51,14 @@ #endif /* !ACPI_NO_OSDFUNC_INLINE */ #endif /* !_KERNEL */ -#include <dev/acpi/aml/aml_common.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_evalobj.h> -#include <dev/acpi/aml/aml_name.h> -#include <dev/acpi/aml/aml_obj.h> -#include <dev/acpi/aml/aml_parse.h> -#include <dev/acpi/aml/aml_status.h> -#include <dev/acpi/aml/aml_store.h> +#include <aml/aml_common.h> +#include <aml/aml_env.h> +#include <aml/aml_evalobj.h> +#include <aml/aml_name.h> +#include <aml/aml_obj.h> +#include <aml/aml_parse.h> +#include <aml/aml_status.h> +#include <aml/aml_store.h> /* for debugging */ #ifdef AML_DEBUG diff --git a/usr.sbin/acpi/amldb/aml/aml_env.h b/usr.sbin/acpi/amldb/aml/aml_env.h index e78330d..f155f2d 100644 --- a/usr.sbin/acpi/amldb/aml/aml_env.h +++ b/usr.sbin/acpi/amldb/aml/aml_env.h @@ -30,9 +30,9 @@ #ifndef _AML_ENV_H_ #define _AML_ENV_H_ -#include <dev/acpi/aml/aml_name.h> -#include <dev/acpi/aml/aml_obj.h> -#include <dev/acpi/aml/aml_status.h> +#include <aml/aml_name.h> +#include <aml/aml_obj.h> +#include <aml/aml_status.h> struct aml_environ { u_int8_t *dp; diff --git a/usr.sbin/acpi/amldb/aml/aml_evalobj.c b/usr.sbin/acpi/amldb/aml/aml_evalobj.c index b73ef70..83f7cd2 100644 --- a/usr.sbin/acpi/amldb/aml/aml_evalobj.c +++ b/usr.sbin/acpi/amldb/aml/aml_evalobj.c @@ -30,16 +30,16 @@ #include <sys/param.h> -#include <dev/acpi/aml/aml_amlmem.h> -#include <dev/acpi/aml/aml_common.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_evalobj.h> -#include <dev/acpi/aml/aml_name.h> -#include <dev/acpi/aml/aml_obj.h> -#include <dev/acpi/aml/aml_parse.h> -#include <dev/acpi/aml/aml_region.h> -#include <dev/acpi/aml/aml_status.h> -#include <dev/acpi/aml/aml_store.h> +#include <aml/aml_amlmem.h> +#include <aml/aml_common.h> +#include <aml/aml_env.h> +#include <aml/aml_evalobj.h> +#include <aml/aml_name.h> +#include <aml/aml_obj.h> +#include <aml/aml_parse.h> +#include <aml/aml_region.h> +#include <aml/aml_status.h> +#include <aml/aml_store.h> #ifndef _KERNEL #include <sys/param.h> diff --git a/usr.sbin/acpi/amldb/aml/aml_memman.c b/usr.sbin/acpi/amldb/aml/aml_memman.c index 7fe8c55..46e6aa7 100644 --- a/usr.sbin/acpi/amldb/aml/aml_memman.c +++ b/usr.sbin/acpi/amldb/aml/aml_memman.c @@ -33,7 +33,7 @@ #include <sys/param.h> -#include <dev/acpi/aml/aml_memman.h> +#include <aml/aml_memman.h> #ifndef _KERNEL #include <stdlib.h> diff --git a/usr.sbin/acpi/amldb/aml/aml_name.c b/usr.sbin/acpi/amldb/aml/aml_name.c index 04da36e..1e07956 100644 --- a/usr.sbin/acpi/amldb/aml/aml_name.c +++ b/usr.sbin/acpi/amldb/aml/aml_name.c @@ -31,10 +31,10 @@ #include <sys/param.h> -#include <dev/acpi/aml/aml_amlmem.h> -#include <dev/acpi/aml/aml_common.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_name.h> +#include <aml/aml_amlmem.h> +#include <aml/aml_common.h> +#include <aml/aml_env.h> +#include <aml/aml_name.h> #ifndef _KERNEL #include <stdio.h> diff --git a/usr.sbin/acpi/amldb/aml/aml_name.h b/usr.sbin/acpi/amldb/aml/aml_name.h index ab203ce..3d22d8b 100644 --- a/usr.sbin/acpi/amldb/aml/aml_name.h +++ b/usr.sbin/acpi/amldb/aml/aml_name.h @@ -34,7 +34,7 @@ #include <machine/stdarg.h> -#include <dev/acpi/aml/aml_obj.h> +#include <aml/aml_obj.h> struct aml_name { char name[4]; diff --git a/usr.sbin/acpi/amldb/aml/aml_obj.c b/usr.sbin/acpi/amldb/aml/aml_obj.c index 62c443f..17f2a50 100644 --- a/usr.sbin/acpi/amldb/aml/aml_obj.c +++ b/usr.sbin/acpi/amldb/aml/aml_obj.c @@ -30,12 +30,12 @@ #include <sys/param.h> -#include <dev/acpi/aml/aml_amlmem.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_name.h> -#include <dev/acpi/aml/aml_obj.h> -#include <dev/acpi/aml/aml_status.h> -#include <dev/acpi/aml/aml_store.h> +#include <aml/aml_amlmem.h> +#include <aml/aml_env.h> +#include <aml/aml_name.h> +#include <aml/aml_obj.h> +#include <aml/aml_status.h> +#include <aml/aml_store.h> #ifndef _KERNEL #include <sys/stat.h> diff --git a/usr.sbin/acpi/amldb/aml/aml_parse.c b/usr.sbin/acpi/amldb/aml/aml_parse.c index dc6f46b..348c616 100644 --- a/usr.sbin/acpi/amldb/aml/aml_parse.c +++ b/usr.sbin/acpi/amldb/aml/aml_parse.c @@ -30,15 +30,15 @@ #include <sys/param.h> -#include <dev/acpi/aml/aml_amlmem.h> -#include <dev/acpi/aml/aml_common.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_evalobj.h> -#include <dev/acpi/aml/aml_name.h> -#include <dev/acpi/aml/aml_obj.h> -#include <dev/acpi/aml/aml_parse.h> -#include <dev/acpi/aml/aml_status.h> -#include <dev/acpi/aml/aml_store.h> +#include <aml/aml_amlmem.h> +#include <aml/aml_common.h> +#include <aml/aml_env.h> +#include <aml/aml_evalobj.h> +#include <aml/aml_name.h> +#include <aml/aml_obj.h> +#include <aml/aml_parse.h> +#include <aml/aml_status.h> +#include <aml/aml_store.h> #ifndef _KERNEL #include <sys/stat.h> diff --git a/usr.sbin/acpi/amldb/aml/aml_region.c b/usr.sbin/acpi/amldb/aml/aml_region.c index e643b66..f8f403f9 100644 --- a/usr.sbin/acpi/amldb/aml/aml_region.c +++ b/usr.sbin/acpi/amldb/aml/aml_region.c @@ -43,9 +43,9 @@ #include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> -#include <dev/acpi/aml/aml_common.h> -#include <dev/acpi/aml/aml_region.h> -#include <dev/acpi/aml/aml_name.h> +#include <aml/aml_common.h> +#include <aml/aml_region.h> +#include <aml/aml_name.h> #ifndef ACPI_NO_OSDFUNC_INLINE #include <machine/acpica_osd.h> diff --git a/usr.sbin/acpi/amldb/aml/aml_store.c b/usr.sbin/acpi/amldb/aml/aml_store.c index 20040b7..5a49db4 100644 --- a/usr.sbin/acpi/amldb/aml/aml_store.c +++ b/usr.sbin/acpi/amldb/aml/aml_store.c @@ -30,15 +30,15 @@ #include <sys/param.h> -#include <dev/acpi/aml/aml_amlmem.h> -#include <dev/acpi/aml/aml_common.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_evalobj.h> -#include <dev/acpi/aml/aml_name.h> -#include <dev/acpi/aml/aml_obj.h> -#include <dev/acpi/aml/aml_region.h> -#include <dev/acpi/aml/aml_status.h> -#include <dev/acpi/aml/aml_store.h> +#include <aml/aml_amlmem.h> +#include <aml/aml_common.h> +#include <aml/aml_env.h> +#include <aml/aml_evalobj.h> +#include <aml/aml_name.h> +#include <aml/aml_obj.h> +#include <aml/aml_region.h> +#include <aml/aml_status.h> +#include <aml/aml_store.h> #ifndef _KERNEL #include <assert.h> diff --git a/usr.sbin/acpi/amldb/amldb.c b/usr.sbin/acpi/amldb/amldb.c index 007a1ab..ede55be 100644 --- a/usr.sbin/acpi/amldb/amldb.c +++ b/usr.sbin/acpi/amldb/amldb.c @@ -31,11 +31,11 @@ #include <sys/mman.h> #include <sys/stat.h> -#include <dev/acpi/aml/aml_amlmem.h> -#include <dev/acpi/aml/aml_common.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_parse.h> -#include <dev/acpi/aml/aml_region.h> +#include <aml/aml_amlmem.h> +#include <aml/aml_common.h> +#include <aml/aml_env.h> +#include <aml/aml_parse.h> +#include <aml/aml_region.h> #include <assert.h> #include <err.h> diff --git a/usr.sbin/acpi/amldb/debug.c b/usr.sbin/acpi/amldb/debug.c index 080cb53..cf5b7d3 100644 --- a/usr.sbin/acpi/amldb/debug.c +++ b/usr.sbin/acpi/amldb/debug.c @@ -30,16 +30,16 @@ #include <sys/param.h> -#include <dev/acpi/aml/aml_name.h> -#include <dev/acpi/aml/aml_amlmem.h> -#include <dev/acpi/aml/aml_status.h> -#include <dev/acpi/aml/aml_env.h> -#include <dev/acpi/aml/aml_obj.h> -#include <dev/acpi/aml/aml_evalobj.h> -#include <dev/acpi/aml/aml_parse.h> -#include <dev/acpi/aml/aml_region.h> -#include <dev/acpi/aml/aml_store.h> -#include <dev/acpi/aml/aml_common.h> +#include <aml/aml_name.h> +#include <aml/aml_amlmem.h> +#include <aml/aml_status.h> +#include <aml/aml_env.h> +#include <aml/aml_obj.h> +#include <aml/aml_evalobj.h> +#include <aml/aml_parse.h> +#include <aml/aml_region.h> +#include <aml/aml_store.h> +#include <aml/aml_common.h> #include <assert.h> #include <err.h> diff --git a/usr.sbin/acpi/amldb/region.c b/usr.sbin/acpi/amldb/region.c index c97b006..4763862 100644 --- a/usr.sbin/acpi/amldb/region.c +++ b/usr.sbin/acpi/amldb/region.c @@ -34,10 +34,10 @@ #include <sys/param.h> #include <sys/queue.h> -#include <dev/acpi/aml/aml_amlmem.h> -#include <dev/acpi/aml/aml_name.h> -#include <dev/acpi/aml/aml_region.h> -#include <dev/acpi/aml/aml_common.h> +#include <aml/aml_amlmem.h> +#include <aml/aml_name.h> +#include <aml/aml_region.h> +#include <aml/aml_common.h> #include <assert.h> #include <err.h> |