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

Remove ACPI_NO_OSDFUNC_INLINE option from kernel configuration. Now

Browse Source 
that it's enabled in acpireg.h only if DIAGNOSTIC option is specified.
ACPICA OSD functions will be compiled in machine/acpi_machdep.c again
tentatively (if DIAGNOSTIC option is specified).
# Should we have acpica_osd.c ?
This commit is contained in:
Mitsuru IWASAKI 2000-10-01 08:17:47 +00:00
parent 240474e6a9
commit 3ffcacc9d8
10 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/conf/NOTES
View File

@ -1231,7 +1231,6 @@ hint.npx.0.irq="13"
device acpi
options ACPI_DEBUG
#!options ACPI_NO_ENABLE_ON_BOOT
#!options ACPI_NO_OSDFUNC_INLINE
options AML_DEBUG
#

1
sys/conf/options
View File

@ -463,7 +463,6 @@ WITNESS opt_global.h
ACPI_DEBUG opt_acpi.h
AML_DEBUG opt_acpi.h
ACPI_NO_ENABLE_ON_BOOT opt_acpi.h
ACPI_NO_OSDFUNC_INLINE opt_acpi.h
# options for DEVFS, see sys/fs/devfs/devfs.h
NDEVFSINO opt_devfs.h

3
sys/dev/acpi/acpireg.h
View File

@ -310,6 +310,9 @@ typedef UINT32 ACPI_STATUS;
/*
* ACPICA Osd family functions
*/
#if defined(DIAGNOSTIC)
#define ACPI_NO_OSDFUNC_INLINE
#endif
#ifdef ACPI_NO_OSDFUNC_INLINE
ACPI_STATUS OsdMapMemory(void *, UINT32, void **);

3
sys/dev/acpi/aml/aml_common.c
View File

@ -42,7 +42,10 @@
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <machine/bus.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#ifndef ACPI_NO_OSDFUNC_INLINE
#include <machine/acpica_osd.h>
#endif /* !ACPI_NO_OSDFUNC_INLINE */

2
sys/dev/acpi/aml/aml_region.c
View File

@ -35,12 +35,14 @@
#include "opt_acpi.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/aml/aml_common.h>
#include <dev/acpi/aml/aml_region.h>
#include <dev/acpi/aml/aml_name.h>

1
sys/i386/conf/NOTES
View File

@ -1231,7 +1231,6 @@ hint.npx.0.irq="13"
device acpi
options ACPI_DEBUG
#!options ACPI_NO_ENABLE_ON_BOOT
#!options ACPI_NO_OSDFUNC_INLINE
options AML_DEBUG
#

4
sys/i386/i386/acpi_machdep.c
View File

@ -43,6 +43,10 @@
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#ifdef ACPI_NO_OSDFUNC_INLINE
#include <machine/acpica_osd.h>
#endif
struct ACPIrsdp *
acpi_find_rsdp(void)
{

5
sys/i386/include/acpica_osd.h
View File

@ -37,15 +37,12 @@
#include <vm/vm.h>
#include <vm/pmap.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include "pcib_if.h"
#ifdef ACPI_NO_OSDFUNC_INLINE
#define _ACPICA_INLINE_
#else
#define _ACPICA_INLINE_ static __inline
#define _ACPICA_INLINE_ static __inline
#endif
/*

3
usr.sbin/acpi/amldb/aml/aml_common.c
View File

@ -42,7 +42,10 @@
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <machine/bus.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#ifndef ACPI_NO_OSDFUNC_INLINE
#include <machine/acpica_osd.h>
#endif /* !ACPI_NO_OSDFUNC_INLINE */

2
usr.sbin/acpi/amldb/aml/aml_region.c
View File

@ -35,12 +35,14 @@
#include "opt_acpi.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
#include <dev/acpi/aml/aml_common.h>
#include <dev/acpi/aml/aml_region.h>
#include <dev/acpi/aml/aml_name.h>