d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow EFI and ACPI to be included together. When ACPI is included

Browse Source 
first, EFI will use its definitions for {,U}INT{8,16,32,64} and
BOOLEAN. When EFI is included first, define ACPI_USE_SYSTEM_INTTYPES
to tell ACPI that these are already defined.

Differential Revision: https://reviews.freebsd.org/D1905
This commit is contained in:
imp 2015-02-20 01:40:55 +00:00
parent 579c83b67c
commit 61f8188c8c
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/efi/include/amd64/efibind.h
View File

@ -85,6 +85,9 @@ Revision History
// Basic EFI types of various widths
//
#ifndef ACPI_THREAD_ID /* ACPI's definitions are fine */
#define ACPI_USE_SYSTEM_INTTYPES 1 /* Tell ACPI we've defined types */
typedef uint64_t UINT64;
typedef int64_t INT64;
@ -98,6 +101,7 @@ typedef int16_t INT16;
typedef uint8_t UINT8;
typedef int8_t INT8;
#endif
#undef VOID
#define VOID void

2
sys/boot/efi/include/efidef.h
View File

@ -30,7 +30,9 @@ Revision History
typedef UINT16 CHAR16;
typedef UINT8 CHAR8;
#ifndef ACPI_THREAD_ID /* ACPI's definitions are fine */
typedef UINT8 BOOLEAN;
#endif
#ifndef TRUE
#define TRUE ((BOOLEAN) 1)

4
sys/boot/efi/include/i386/efibind.h
View File

@ -85,6 +85,9 @@ Revision History
// Basic EFI types of various widths
//
#ifndef ACPI_THREAD_ID /* ACPI's definitions are fine, use those */
#define ACPI_USE_SYSTEM_INTTYPES 1 /* Tell ACPI we've defined types */
typedef uint64_t UINT64;
typedef int64_t INT64;
@ -98,6 +101,7 @@ typedef int16_t INT16;
typedef uint8_t UINT8;
typedef int8_t INT8;
#endif
#undef VOID
#define VOID void