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

Fix conflicts of import of Intel ACPI-CA 20041119 with system includes fixups.

Browse Source
This commit is contained in:
David E. O'Brien 2005-10-24 04:35:20 +00:00
parent 763384f7cd
commit 3e50df5a3e
18 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/contrib/dev/acpica/acenv.h
View File

@ -205,7 +205,7 @@
#include "acdos16.h"
#elif defined(__FreeBSD__)
#include "acfreebsd.h"
#include <contrib/dev/acpica/acfreebsd.h>
#elif defined(__NetBSD__)
#include "acnetbsd.h"

2
sys/contrib/dev/acpica/acfreebsd.h
View File

@ -120,7 +120,7 @@
/* FreeBSD uses GCC */
#include "acgcc.h"
#include <contrib/dev/acpica/acgcc.h>
#include <sys/types.h>
#include <machine/acpica_machdep.h>

30
sys/contrib/dev/acpica/acpi.h
View File

@ -122,21 +122,21 @@
* We put them here because we don't want to duplicate them
* in the rest of the source code again and again.
*/
#include "acconfig.h" /* Configuration constants */
#include "acenv.h" /* Target environment specific items */
#include "actypes.h" /* Fundamental common data types */
#include "acexcep.h" /* ACPI exception codes */
#include "acmacros.h" /* C macros */
#include "actbl.h" /* ACPI table definitions */
#include "aclocal.h" /* Internal data types */
#include "acoutput.h" /* Error output and Debug macros */
#include "acpiosxf.h" /* Interfaces to the ACPI-to-OS layer*/
#include "acpixf.h" /* ACPI core subsystem external interfaces */
#include "acobject.h" /* ACPI internal object */
#include "acstruct.h" /* Common structures */
#include "acglobal.h" /* All global variables */
#include "achware.h" /* Hardware defines and interfaces */
#include "acutils.h" /* Utility interfaces */
#include <contrib/dev/acpica/acconfig.h> /* Configuration constants */
#include <contrib/dev/acpica/acenv.h> /* Target environment specific items */
#include <contrib/dev/acpica/actypes.h> /* Fundamental common data types */
#include <contrib/dev/acpica/acexcep.h> /* ACPI exception codes */
#include <contrib/dev/acpica/acmacros.h> /* C macros */
#include <contrib/dev/acpica/actbl.h> /* ACPI table definitions */
#include <contrib/dev/acpica/aclocal.h> /* Internal data types */
#include <contrib/dev/acpica/acoutput.h> /* Error output and Debug macros */
#include <contrib/dev/acpica/acpiosxf.h> /* Interfaces to the ACPI-to-OS layer*/
#include <contrib/dev/acpica/acpixf.h> /* ACPI core subsystem external interfaces */
#include <contrib/dev/acpica/acobject.h> /* ACPI internal object */
#include <contrib/dev/acpica/acstruct.h> /* Common structures */
#include <contrib/dev/acpica/acglobal.h> /* All global variables */
#include <contrib/dev/acpica/achware.h> /* Hardware defines and interfaces */
#include <contrib/dev/acpica/acutils.h> /* Utility interfaces */
#endif /* __ACPI_H__ */

4
sys/contrib/dev/acpica/acpiosxf.h
View File

@ -121,8 +121,8 @@
#ifndef __ACPIOSXF_H__
#define __ACPIOSXF_H__
#include "acenv.h"
#include "actypes.h"
#include <contrib/dev/acpica/acenv.h>
#include <contrib/dev/acpica/actypes.h>
/* Priorities for AcpiOsQueueForExecution */

4
sys/contrib/dev/acpica/acpixf.h
View File

@ -118,8 +118,8 @@
#ifndef __ACXFACE_H__
#define __ACXFACE_H__
#include "actypes.h"
#include "actbl.h"
#include <contrib/dev/acpica/actypes.h>
#include <contrib/dev/acpica/actbl.h>
/*

18
sys/contrib/dev/acpica/dbcmds.c
View File

@ -115,17 +115,17 @@
*****************************************************************************/
#include "acpi.h"
#include "acdispat.h"
#include "amlcode.h"
#include "acnamesp.h"
#include "acevents.h"
#include "acdebug.h"
#include "acresrc.h"
#include "acdisasm.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acdispat.h>
#include <contrib/dev/acpica/amlcode.h>
#include <contrib/dev/acpica/acnamesp.h>
#include <contrib/dev/acpica/acevents.h>
#include <contrib/dev/acpica/acdebug.h>
#include <contrib/dev/acpica/acresrc.h>
#include <contrib/dev/acpica/acdisasm.h>
#include "acparser.h"
#include <contrib/dev/acpica/acparser.h>
#ifdef ACPI_DEBUGGER

8
sys/contrib/dev/acpica/dbfileio.c
View File

@ -116,10 +116,10 @@
*****************************************************************************/
#include "acpi.h"
#include "acdebug.h"
#include "acnamesp.h"
#include "actables.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acdebug.h>
#include <contrib/dev/acpica/acnamesp.h>
#include <contrib/dev/acpica/actables.h>
#if (defined ACPI_DEBUGGER || defined ACPI_DISASSEMBLER)

8
sys/contrib/dev/acpica/dbxface.c
View File

@ -115,10 +115,10 @@
*****************************************************************************/
#include "acpi.h"
#include "amlcode.h"
#include "acdebug.h"
#include "acdisasm.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/amlcode.h>
#include <contrib/dev/acpica/acdebug.h>
#include <contrib/dev/acpica/acdisasm.h>
#ifdef ACPI_DEBUGGER

8
sys/contrib/dev/acpica/dmopcode.c
View File

@ -114,10 +114,10 @@
*
*****************************************************************************/
#include "acpi.h"
#include "acparser.h"
#include "amlcode.h"
#include "acdisasm.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acparser.h>
#include <contrib/dev/acpica/amlcode.h>
#include <contrib/dev/acpica/acdisasm.h>
#ifdef ACPI_DISASSEMBLER

10
sys/contrib/dev/acpica/exfldio.c
View File

@ -117,11 +117,11 @@
#define __EXFLDIO_C__
#include "acpi.h"
#include "acinterp.h"
#include "amlcode.h"
#include "acevents.h"
#include "acdispat.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acinterp.h>
#include <contrib/dev/acpica/amlcode.h>
#include <contrib/dev/acpica/acevents.h>
#include <contrib/dev/acpica/acdispat.h>
#define _COMPONENT ACPI_EXECUTER

6
sys/contrib/dev/acpica/exsystem.c
View File

@ -117,9 +117,9 @@
#define __EXSYSTEM_C__
#include "acpi.h"
#include "acinterp.h"
#include "acevents.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acinterp.h>
#include <contrib/dev/acpica/acevents.h>
#define _COMPONENT ACPI_EXECUTER
ACPI_MODULE_NAME ("exsystem")

6
sys/contrib/dev/acpica/hwregs.c
View File

@ -118,9 +118,9 @@
#define __HWREGS_C__
#include "acpi.h"
#include "acnamesp.h"
#include "acevents.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acnamesp.h>
#include <contrib/dev/acpica/acevents.h>
#define _COMPONENT ACPI_HARDWARE
ACPI_MODULE_NAME ("hwregs")

2
sys/contrib/dev/acpica/hwsleep.c
View File

@ -115,7 +115,7 @@
*
*****************************************************************************/
#include "acpi.h"
#include <contrib/dev/acpica/acpi.h>
#define _COMPONENT ACPI_HARDWARE
ACPI_MODULE_NAME ("hwsleep")

12
sys/contrib/dev/acpica/psparse.c
View File

@ -124,12 +124,12 @@
* templates in AmlOpInfo[]
*/
#include "acpi.h"
#include "acparser.h"
#include "acdispat.h"
#include "amlcode.h"
#include "acnamesp.h"
#include "acinterp.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acparser.h>
#include <contrib/dev/acpica/acdispat.h>
#include <contrib/dev/acpica/amlcode.h>
#include <contrib/dev/acpica/acnamesp.h>
#include <contrib/dev/acpica/acinterp.h>
#define _COMPONENT ACPI_PARSER
ACPI_MODULE_NAME ("psparse")

8
sys/contrib/dev/acpica/rscreate.c
View File

@ -117,10 +117,10 @@
#define __RSCREATE_C__
#include "acpi.h"
#include "acresrc.h"
#include "amlcode.h"
#include "acnamesp.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acresrc.h>
#include <contrib/dev/acpica/amlcode.h>
#include <contrib/dev/acpica/acnamesp.h>
#define _COMPONENT ACPI_RESOURCES
ACPI_MODULE_NAME ("rscreate")

4
sys/contrib/dev/acpica/tbget.c
View File

@ -116,8 +116,8 @@
#define __TBGET_C__
#include "acpi.h"
#include "actables.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/actables.h>
#define _COMPONENT ACPI_TABLES

6
sys/contrib/dev/acpica/uteval.c
View File

@ -116,9 +116,9 @@
#define __UTEVAL_C__
#include "acpi.h"
#include "acnamesp.h"
#include "acinterp.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acnamesp.h>
#include <contrib/dev/acpica/acinterp.h>
#define _COMPONENT ACPI_UTILITIES

4
sys/contrib/dev/acpica/utglobal.c
View File

@ -117,8 +117,8 @@
#define __UTGLOBAL_C__
#define DEFINE_ACPI_GLOBALS
#include "acpi.h"
#include "acnamesp.h"
#include <contrib/dev/acpica/acpi.h>
#include <contrib/dev/acpica/acnamesp.h>
#define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME ("utglobal")