diff options
| author | jkim <jkim@FreeBSD.org> | 2007-03-22 18:16:43 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2007-03-22 18:16:43 +0000 |
| commit | c06098a4065d7be63bd57c45889a91da9bc0f5e4 (patch) | |
| tree | cdaa579af45ece33bafe9e4fe4c9aef8bd85ed29 /sys/i386/include/acpica_machdep.h | |
| parent | 07ec417491720a77d28b1083886826f0141b171c (diff) | |
| download | FreeBSD-src-c06098a4065d7be63bd57c45889a91da9bc0f5e4.zip FreeBSD-src-c06098a4065d7be63bd57c45889a91da9bc0f5e4.tar.gz | |
Catch up with ACPI-CA 20070320 import.
Diffstat (limited to 'sys/i386/include/acpica_machdep.h')
| -rw-r--r-- | sys/i386/include/acpica_machdep.h | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/sys/i386/include/acpica_machdep.h b/sys/i386/include/acpica_machdep.h index 57d39cc..f90b213 100644 --- a/sys/i386/include/acpica_machdep.h +++ b/sys/i386/include/acpica_machdep.h @@ -34,7 +34,7 @@ *****************************************************************************/ #ifndef __ACPICA_MACHDEP_H__ -#define __ACPICA_MACHDEP_H__ +#define __ACPICA_MACHDEP_H__ #ifdef _KERNEL /* @@ -45,41 +45,43 @@ * ACPI_INTERNAL_XFACE - Internal ACPI interfaces * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces */ -#define ACPI_SYSTEM_XFACE -#define ACPI_EXTERNAL_XFACE -#define ACPI_INTERNAL_XFACE -#define ACPI_INTERNAL_VAR_XFACE +#define ACPI_SYSTEM_XFACE +#define ACPI_EXTERNAL_XFACE +#define ACPI_INTERNAL_XFACE +#define ACPI_INTERNAL_VAR_XFACE /* Asm macros */ -#define ACPI_ASM_MACROS -#define BREAKPOINT3 -#define ACPI_DISABLE_IRQS() disable_intr() -#define ACPI_ENABLE_IRQS() enable_intr() +#define ACPI_ASM_MACROS +#define BREAKPOINT3 +#define ACPI_DISABLE_IRQS() disable_intr() +#define ACPI_ENABLE_IRQS() enable_intr() -#define ACPI_FLUSH_CPU_CACHE() wbinvd() +#define ACPI_FLUSH_CPU_CACHE() wbinvd() /* Section 5.2.9.1: global lock acquire/release functions */ extern int acpi_acquire_global_lock(uint32_t *lock); extern int acpi_release_global_lock(uint32_t *lock); -#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ - ((Acq) = acpi_acquire_global_lock(GLptr)) -#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ - ((Acq) = acpi_release_global_lock(GLptr)) +#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) do { \ + (Acq) = acpi_acquire_global_lock(&((GLptr)->GlobalLock)); \ +} while (0) +#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) do { \ + (Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock)); \ +} while (0) /*! [Begin] no source code translation * * Math helper asm macros */ -#define asm __asm -#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ +#define asm __asm +#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ asm("divl %2;" \ :"=a"(q32), "=d"(r32) \ :"r"(d32), \ "0"(n_lo), "1"(n_hi)) -#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ +#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ asm("shrl $1,%2;" \ "rcrl $1,%3;" \ :"=r"(n_hi), "=r"(n_lo) \ @@ -88,10 +90,10 @@ extern int acpi_release_global_lock(uint32_t *lock); /*! [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 +#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); |
