diff options
-rw-r--r-- | sys/conf/files | 1 | ||||
-rw-r--r-- | sys/conf/files.i386 | 1 | ||||
-rw-r--r-- | sys/dev/acpica/Osd/OsdEnvironment.c | 64 |
3 files changed, 1 insertions, 65 deletions
diff --git a/sys/conf/files b/sys/conf/files index 4b7dba2..98488a4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -209,7 +209,6 @@ dev/acpica/acpi_resource.c optional acpica dev/acpica/acpi_thermal.c optional acpica dev/acpica/acpi_timer.c optional acpica dev/acpica/Osd/OsdDebug.c optional acpica -dev/acpica/Osd/OsdEnvironment.c optional acpica dev/acpica/Osd/OsdHardware.c optional acpica dev/acpica/Osd/OsdInterrupt.c optional acpica dev/acpica/Osd/OsdMemory.c optional acpica diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 4f24805..5ebc449 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -160,6 +160,7 @@ gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate +i386/acpica/Osd/OsdEnvironment.c optional acpica i386/acpica/acpi_wakeup.c optional acpica acpi_wakecode.h optional acpica \ dependency "$S/i386/acpica/acpi_wakecode.S" \ diff --git a/sys/dev/acpica/Osd/OsdEnvironment.c b/sys/dev/acpica/Osd/OsdEnvironment.c deleted file mode 100644 index 8b8e663..0000000 --- a/sys/dev/acpica/Osd/OsdEnvironment.c +++ /dev/null @@ -1,64 +0,0 @@ -/*- - * Copyright (c) 2000 Michael Smith - * Copyright (c) 2000 BSDi - * 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$ - */ - -/* - * 6.1 : Environmental support - */ - -#include "acpi.h" - -#ifdef __i386__ -#include <machine/pc/bios.h> -#endif - -ACPI_STATUS -AcpiOsInitialize(void) -{ -#ifdef __i386__ - /* - * Prevent the PnP BIOS code from interfering with our own scan of ISA devices. - */ - PnPBIOStable = NULL; -#endif - return(NULL); -} - -ACPI_STATUS -AcpiOsTerminate(void) -{ - return(NULL); -} - -ACPI_STATUS -AcpiOsGetRootPointer( - UINT32 Flags, - ACPI_PHYSICAL_ADDRESS *RsdpPhysicalAddress) -{ - return(AcpiFindRootPointer(Flags, RsdpPhysicalAddress)); -} |