Add ACPI_BUS_SPACE stuff definitions in acpi_machdep.h.
Change to include this file rather than acpica_osd.h to use only ACPI_BUS_SPACE stuff.
This commit is contained in:
parent
0b32abca7c
commit
09ab664412
sys
@ -56,7 +56,7 @@
|
||||
#include <dev/acpi/aml/aml_parse.h>
|
||||
#include <dev/acpi/aml/aml_memman.h>
|
||||
|
||||
#include <machine/acpica_osd.h> /* for ACPI_BUS_SPACE_IO */
|
||||
#include <machine/acpi_machdep.h> /* for ACPI_BUS_SPACE_IO */
|
||||
|
||||
/*
|
||||
* ACPI pmap subsystem
|
||||
|
@ -29,6 +29,8 @@
|
||||
|
||||
#include "opt_acpi.h"
|
||||
|
||||
#include <machine/acpi_machdep.h>
|
||||
|
||||
#ifdef ACPI_NO_OSDFUNC_INLINE
|
||||
#include <machine/acpica_osd.h>
|
||||
#endif /* ACPI_NO_OSDFUNC_INLINE */
|
||||
|
35
sys/i386/include/acpi_machdep.h
Normal file
35
sys/i386/include/acpi_machdep.h
Normal file
@ -0,0 +1,35 @@
|
||||
/*-
|
||||
* Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_ACPI_MACHDEP_H_
|
||||
#define _MACHINE_ACPI_MACHDEP_H_
|
||||
|
||||
#define ACPI_BUS_SPACE_IO I386_BUS_SPACE_IO
|
||||
#define ACPI_BUS_SPACE_MEM I386_BUS_SPACE_MEM
|
||||
|
||||
#endif /* ! _MACHINE_ACPI_MACHDEP_H_ */
|
@ -32,6 +32,7 @@
|
||||
#include <sys/systm.h>
|
||||
#include <sys/bus.h>
|
||||
#include <machine/bus.h>
|
||||
#include <machine/acpi_machdep.h>
|
||||
#include <machine/vmparam.h>
|
||||
#include <sys/acpi.h>
|
||||
#include <vm/vm.h>
|
||||
@ -39,8 +40,6 @@
|
||||
|
||||
#include "pcib_if.h"
|
||||
|
||||
#define ACPI_BUS_SPACE_IO I386_BUS_SPACE_IO
|
||||
|
||||
/*
|
||||
* ACPICA compatibility
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user