Move definitions required by userland applications out of acpica_machdep.h.
This commit is contained in:
parent
8d744e473f
commit
b1ddd13145
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=252280
@ -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__ */
|
||||
|
@ -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"
|
||||
|
@ -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__ */
|
||||
|
@ -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__ */
|
||||
|
Loading…
Reference in New Issue
Block a user