diff options
author | jkim <jkim@FreeBSD.org> | 2013-06-27 00:22:40 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2013-06-27 00:22:40 +0000 |
commit | 70506a4dd6c199d14c230a8786477b0bac30dc5f (patch) | |
tree | f7e9cac83683879e0f3e67d501318e94e2945f92 /sys | |
parent | faabc5353932108c96a32e7422578294fe30ab63 (diff) | |
download | FreeBSD-src-70506a4dd6c199d14c230a8786477b0bac30dc5f.zip FreeBSD-src-70506a4dd6c199d14c230a8786477b0bac30dc5f.tar.gz |
Move definitions required by userland applications out of acpica_machdep.h.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/include/acpica_machdep.h | 8 | ||||
-rw-r--r-- | sys/contrib/dev/acpica/include/platform/acfreebsd.h | 12 | ||||
-rw-r--r-- | sys/i386/include/acpica_machdep.h | 8 | ||||
-rw-r--r-- | sys/ia64/include/acpica_machdep.h | 9 |
4 files changed, 17 insertions, 20 deletions
diff --git a/sys/amd64/include/acpica_machdep.h b/sys/amd64/include/acpica_machdep.h index 9943af7..eb0282a 100644 --- a/sys/amd64/include/acpica_machdep.h +++ b/sys/amd64/include/acpica_machdep.h @@ -69,16 +69,12 @@ extern int acpi_release_global_lock(uint32_t *lock); (Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock)); \ } while (0) -#endif /* _KERNEL */ - -#define ACPI_MACHINE_WIDTH 64 -#define COMPILER_DEPENDENT_INT64 long -#define COMPILER_DEPENDENT_UINT64 unsigned long - void acpi_SetDefaultIntrModel(int model); void acpi_cpu_c1(void); void *acpi_map_table(vm_paddr_t pa, const char *sig); void acpi_unmap_table(void *table); vm_paddr_t acpi_find_table(const char *sig); +#endif /* _KERNEL */ + #endif /* __ACPICA_MACHDEP_H__ */ diff --git a/sys/contrib/dev/acpica/include/platform/acfreebsd.h b/sys/contrib/dev/acpica/include/platform/acfreebsd.h index 6b32ce7..34786c3 100644 --- a/sys/contrib/dev/acpica/include/platform/acfreebsd.h +++ b/sys/contrib/dev/acpica/include/platform/acfreebsd.h @@ -49,12 +49,21 @@ #include <contrib/dev/acpica/include/platform/acgcc.h> #include <sys/types.h> -#include <machine/acpica_machdep.h> + +#ifdef __LP64__ +#define ACPI_MACHINE_WIDTH 64 +#else +#define ACPI_MACHINE_WIDTH 32 +#endif + +#define COMPILER_DEPENDENT_INT64 int64_t +#define COMPILER_DEPENDENT_UINT64 uint64_t #define ACPI_UINTPTR_T uintptr_t #define ACPI_USE_DO_WHILE_0 #define ACPI_USE_LOCAL_CACHE +#define ACPI_USE_NATIVE_DIVIDE #define ACPI_USE_SYSTEM_CLIBRARY #ifdef _KERNEL @@ -63,6 +72,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/libkern.h> +#include <machine/acpica_machdep.h> #include <machine/stdarg.h> #include "opt_acpi.h" diff --git a/sys/i386/include/acpica_machdep.h b/sys/i386/include/acpica_machdep.h index d5bfe65..c4419f2 100644 --- a/sys/i386/include/acpica_machdep.h +++ b/sys/i386/include/acpica_machdep.h @@ -88,12 +88,6 @@ extern int acpi_release_global_lock(uint32_t *lock); :"0"(n_hi), "1"(n_lo)) /*! [End] no source code translation !*/ -#endif /* _KERNEL */ - -#define ACPI_MACHINE_WIDTH 32 -#define COMPILER_DEPENDENT_INT64 long long -#define COMPILER_DEPENDENT_UINT64 unsigned long long -#define ACPI_USE_NATIVE_DIVIDE void acpi_SetDefaultIntrModel(int model); void acpi_cpu_c1(void); @@ -101,4 +95,6 @@ void *acpi_map_table(vm_paddr_t pa, const char *sig); void acpi_unmap_table(void *table); vm_paddr_t acpi_find_table(const char *sig); +#endif /* _KERNEL */ + #endif /* __ACPICA_MACHDEP_H__ */ diff --git a/sys/ia64/include/acpica_machdep.h b/sys/ia64/include/acpica_machdep.h index 38efffd..f64ab8f 100644 --- a/sys/ia64/include/acpica_machdep.h +++ b/sys/ia64/include/acpica_machdep.h @@ -37,7 +37,6 @@ #define __ACPICA_MACHDEP_H__ #ifdef _KERNEL -#define _IA64 /* * Calling conventions: @@ -71,12 +70,8 @@ extern int acpi_release_global_lock(uint32_t *lock); (Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock)); \ } while (0) -#endif /* _KERNEL */ - -#define ACPI_MACHINE_WIDTH 64 -#define COMPILER_DEPENDENT_INT64 long -#define COMPILER_DEPENDENT_UINT64 unsigned long - void acpi_cpu_c1(void); +#endif /* _KERNEL */ + #endif /* __ACPICA_MACHDEP_H__ */ |