diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
| commit | e1150713a203c7b933939d575ea80f12c6877665 (patch) | |
| tree | e90efa2f0b6a55e4114028b09fc286948d8516ea /sys/contrib/dev/acpica/acgcc.h | |
| parent | 5577165db58ddb7157c690a8eabdb3df64d3ca38 (diff) | |
| download | FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.zip FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.tar.gz | |
Resolve conflicts arising from the ACPI CA 20020404 import.
Diffstat (limited to 'sys/contrib/dev/acpica/acgcc.h')
| -rw-r--r-- | sys/contrib/dev/acpica/acgcc.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/contrib/dev/acpica/acgcc.h b/sys/contrib/dev/acpica/acgcc.h index a297173..514e63e 100644 --- a/sys/contrib/dev/acpica/acgcc.h +++ b/sys/contrib/dev/acpica/acgcc.h @@ -121,7 +121,8 @@ #ifdef __ia64__ #define _IA64 -#define COMPILER_DEPENDENT_UINT64 unsigned long +#define COMPILER_DEPENDENT_INT64 long +#define COMPILER_DEPENDENT_UINT64 unsigned long /* * Calling conventions: @@ -145,10 +146,9 @@ /* Asm macros */ #define ACPI_ASM_MACROS -#define causeinterrupt(level) #define BREAKPOINT3 -#define acpi_disable_irqs() __cli() -#define acpi_enable_irqs() __sti() +#define ACPI_DISABLE_IRQS() __cli() +#define ACPI_ENABLE_IRQS() __sti() /*! [Begin] no source code translation */ @@ -198,7 +198,8 @@ #else /* DO IA32 */ -#define COMPILER_DEPENDENT_UINT64 unsigned long long +#define COMPILER_DEPENDENT_INT64 long long +#define COMPILER_DEPENDENT_UINT64 unsigned long long /* * Calling conventions: @@ -216,11 +217,9 @@ /* Asm macros */ #define ACPI_ASM_MACROS -#define causeinterrupt(level) #define BREAKPOINT3 -#define acpi_disable_irqs() __cli() -#define acpi_enable_irqs() __sti() -#define halt() __asm__ __volatile__ ("sti; hlt":::"memory") +#define ACPI_DISABLE_IRQS() __cli() +#define ACPI_ENABLE_IRQS() __sti() /*! [Begin] no source code translation * |
