Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes for ACPI-CA 20050408.

Browse Source
This commit is contained in:
kochi 2005-05-02 14:54:46 +00:00
parent a7c9d49c21
commit 42773dd406
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/i386/acpi/acpi_wakeup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_wakeup.c,v 1.15 2005/04/21 14:03:24 yamt Exp $ */
/* $NetBSD: acpi_wakeup.c,v 1.16 2005/05/02 14:54:46 kochi Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.15 2005/04/21 14:03:24 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.16 2005/05/02 14:54:46 kochi Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
@ -149,7 +149,8 @@ enter_s4_with_bios(void)
ef = read_eflags();
disable_intr();
AcpiHwDisableNonWakeupGpes();
AcpiHwDisableAllGpes(ACPI_ISR);
AcpiHwEnableAllWakeupGpes(ACPI_ISR);
/* flush caches */
@ -168,7 +169,8 @@ enter_s4_with_bios(void)
break;
} while (!ret);
AcpiHwEnableNonWakeupGpes();
AcpiHwDisableAllGpes(ACPI_NOT_ISR);
AcpiHwEnableAllRuntimeGpes(ACPI_NOT_ISR);
write_eflags(ef);

6
sys/arch/x86/include/acpi_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_machdep.h,v 1.1 2003/05/11 18:20:38 fvdl Exp $ */
/* $NetBSD: acpi_machdep.h,v 1.2 2005/05/02 14:55:12 kochi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -54,8 +54,8 @@ ACPI_STATUS acpi_md_OsGetRootPointer(UINT32, ACPI_POINTER *);
#define acpi_md_OsOut16(x, v) outw((x), (v))
#define acpi_md_OsOut32(x, v) outl((x), (v))
ACPI_STATUS acpi_md_OsInstallInterruptHandler(UINT32, OSD_HANDLER, void *,
void **);
ACPI_STATUS acpi_md_OsInstallInterruptHandler(UINT32,
ACPI_OSD_HANDLER, void *, void **);
void acpi_md_OsRemoveInterruptHandler(void *);
ACPI_STATUS acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS, UINT32, void **);

8
sys/arch/x86/x86/acpi_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_machdep.c,v 1.6 2004/04/10 14:17:21 kochi Exp $ */
/* $NetBSD: acpi_machdep.c,v 1.7 2005/05/02 14:55:12 kochi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.6 2004/04/10 14:17:21 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.7 2005/05/02 14:55:12 kochi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -76,7 +76,7 @@ static int acpi_intrcold = 1;
struct acpi_intr_defer {
UINT32 number;
OSD_HANDLER function;
ACPI_OSD_HANDLER function;
void *context;
void *ih;
LIST_ENTRY(acpi_intr_defer) list;
@ -110,7 +110,7 @@ acpi_md_OsGetRootPointer(UINT32 Flags, ACPI_POINTER *PhysicalAddress)
ACPI_STATUS
acpi_md_OsInstallInterruptHandler(UINT32 InterruptNumber,
OSD_HANDLER ServiceRoutine, void *Context, void **cookiep)
ACPI_OSD_HANDLER ServiceRoutine, void *Context, void **cookiep)
{
void *ih;
struct pic *pic;