Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/bouyer-quota2]: src/sys Sync with HEAD
details: https://anonhg.NetBSD.org/src/rev/4c8c63027994
branches: bouyer-quota2
changeset: 761183:4c8c63027994
user: bouyer <bouyer%NetBSD.org@localhost>
date: Thu Feb 17 13:58:44 2011 +0000
description:
Sync with HEAD
diffstat:
sys/dev/acpi/acpi_ec.c | 10 +++---
sys/dev/acpi/acpi_wakedev.c | 15 +++++++---
sys/dev/acpi/acpica/OsdMisc.c | 8 ++++-
sys/external/bsd/acpica/conf/files.acpica | 4 ++-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 2 +-
sys/external/bsd/acpica/dist/include/acutils.h | 10 +++---
sys/external/bsd/acpica/dist/utilities/utdebug.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 14 +++++-----
sys/external/bsd/acpica/dist/utilities/utosi.c | 28 ++++++++++----------
10 files changed, 53 insertions(+), 42 deletions(-)
diffs (truncated from 314 to 300 lines):
diff -r 8c2205606fa6 -r 4c8c63027994 sys/dev/acpi/acpi_ec.c
--- a/sys/dev/acpi/acpi_ec.c Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/dev/acpi/acpi_ec.c Thu Feb 17 13:58:44 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.68 2011/01/07 14:08:29 cegger Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.68.4.1 2011/02/17 13:58:44 bouyer Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.68 2011/01/07 14:08:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.68.4.1 2011/02/17 13:58:44 bouyer Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -161,7 +161,7 @@
static void acpiec_callout(void *);
static void acpiec_gpe_query(void *);
-static uint32_t acpiec_gpe_handler(void *);
+static uint32_t acpiec_gpe_handler(ACPI_HANDLE, uint32_t, void *);
static ACPI_STATUS acpiec_space_setup(ACPI_HANDLE, uint32_t, void *, void **);
static ACPI_STATUS acpiec_space_handler(uint32_t, ACPI_PHYSICAL_ADDRESS,
uint32_t, ACPI_INTEGER *, void *, void *);
@@ -366,7 +366,7 @@
goto post_csr_map;
}
- rv = AcpiEnableGpe(sc->sc_gpeh, sc->sc_gpebit, ACPI_GPE_TYPE_RUNTIME);
+ rv = AcpiEnableGpe(sc->sc_gpeh, sc->sc_gpebit);
if (rv != AE_OK) {
aprint_error_dev(self, "unable to enable GPE: %s\n",
AcpiFormatException(rv));
@@ -844,7 +844,7 @@
}
static uint32_t
-acpiec_gpe_handler(void *arg)
+acpiec_gpe_handler(ACPI_HANDLE hdl, uint32_t gpebit, void *arg)
{
device_t dv = arg;
struct acpiec_softc *sc = device_private(dv);
diff -r 8c2205606fa6 -r 4c8c63027994 sys/dev/acpi/acpi_wakedev.c
--- a/sys/dev/acpi/acpi_wakedev.c Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/dev/acpi/acpi_wakedev.c Thu Feb 17 13:58:44 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.20 2011/01/02 12:06:02 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.20.4.1 2011/02/17 13:58:44 bouyer Exp $ */
/*-
* Copyright (c) 2009, 2010 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.20 2011/01/02 12:06:02 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.20.4.1 2011/02/17 13:58:44 bouyer Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -287,12 +287,17 @@
acpi_wakedev_power(ad, obj);
/*
- * Set both runtime and wake GPEs, but unset only wake GPEs.
+ * This affects only wake GPEs, provided that _PRW works.
*/
if (enable != 0)
- (void)AcpiEnableGpe(hdl, val, ACPI_GPE_TYPE_WAKE_RUN);
+ (void)AcpiSetGpe(hdl, val, ACPI_GPE_ENABLE);
else
- (void)AcpiDisableGpe(hdl, val, ACPI_GPE_TYPE_WAKE);
+ (void)AcpiSetGpe(hdl, val, ACPI_GPE_DISABLE);
+
+ /*
+ * XXX: Is this right?
+ */
+ (void)AcpiUpdateAllGpes();
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "wake GPE %s for %s\n",
(enable != 0) ? "enabled" : "disabled", ad->ad_name));
diff -r 8c2205606fa6 -r 4c8c63027994 sys/dev/acpi/acpica/OsdMisc.c
--- a/sys/dev/acpi/acpica/OsdMisc.c Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/dev/acpi/acpica/OsdMisc.c Thu Feb 17 13:58:44 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMisc.c,v 1.9.4.1 2011/02/17 12:00:10 bouyer Exp $ */
+/* $NetBSD: OsdMisc.c,v 1.9.4.2 2011/02/17 13:58:45 bouyer Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.9.4.1 2011/02/17 12:00:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.9.4.2 2011/02/17 13:58:45 bouyer Exp $");
#include "opt_acpi.h"
#include "opt_ddb.h"
@@ -58,6 +58,10 @@
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpi_osd.h>
+#ifdef ACPI_DEBUG
+#include <external/bsd/acpica/dist/include/acdebug.h>
+#endif
+
#ifdef ACPI_DSDT_OVERRIDE
#ifndef ACPI_DSDT_FILE
#define ACPI_DSDT_FILE "dsdt.hex"
diff -r 8c2205606fa6 -r 4c8c63027994 sys/external/bsd/acpica/conf/files.acpica
--- a/sys/external/bsd/acpica/conf/files.acpica Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/external/bsd/acpica/conf/files.acpica Thu Feb 17 13:58:44 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.2.2.2 2011/02/17 12:00:17 bouyer Exp $
+# $NetBSD: files.acpica,v 1.2.2.3 2011/02/17 13:58:45 bouyer Exp $
define acpica
makeoptions acpi CPPFLAGS+="-I$S/external/bsd/acpica/dist/include"
@@ -10,6 +10,8 @@
file external/bsd/acpica/dist/debugger/dbfileio.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbhistry.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbinput.c acpica & acpi_debug & ddb
+file external/bsd/acpica/dist/debugger/dbmethod.c acpica & acpi_debug & ddb
+file external/bsd/acpica/dist/debugger/dbnames.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbstats.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbutils.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbxface.c acpica & acpi_debug & ddb
diff -r 8c2205606fa6 -r 4c8c63027994 sys/external/bsd/acpica/dist/debugger/dbdisply.c
--- a/sys/external/bsd/acpica/dist/debugger/dbdisply.c Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbdisply.c Thu Feb 17 13:58:44 2011 +0000
@@ -925,7 +925,7 @@
typedef struct acpi_handler_info
{
void *Handler;
- char *Name;
+ const char *Name;
} ACPI_HANDLER_INFO;
diff -r 8c2205606fa6 -r 4c8c63027994 sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
--- a/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c Thu Feb 17 13:58:44 2011 +0000
@@ -370,7 +370,7 @@
/* Call to the OSL in case OS wants a piece of the action */
Status = AcpiOsSignal (ACPI_SIGNAL_BREAKPOINT,
- "Executed AML Breakpoint opcode");
+ __UNCONST("Executed AML Breakpoint opcode"));
break;
diff -r 8c2205606fa6 -r 4c8c63027994 sys/external/bsd/acpica/dist/include/acutils.h
--- a/sys/external/bsd/acpica/dist/include/acutils.h Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acutils.h Thu Feb 17 13:58:44 2011 +0000
@@ -137,7 +137,7 @@
AcpiUtGetTypeName (
ACPI_OBJECT_TYPE Type);
-char *
+const char *
AcpiUtGetNodeName (
void *Object);
@@ -149,15 +149,15 @@
AcpiUtGetReferenceName (
ACPI_OPERAND_OBJECT *Object);
-char *
+const char *
AcpiUtGetObjectTypeName (
ACPI_OPERAND_OBJECT *ObjDesc);
-char *
+const char *
AcpiUtGetRegionName (
UINT8 SpaceId);
-char *
+const char *
AcpiUtGetEventName (
UINT32 EventId);
@@ -375,7 +375,7 @@
const char *FunctionName,
const char *ModuleName,
UINT32 ComponentId,
- char *String);
+ const char *String);
void
AcpiUtExit (
diff -r 8c2205606fa6 -r 4c8c63027994 sys/external/bsd/acpica/dist/utilities/utdebug.c
--- a/sys/external/bsd/acpica/dist/utilities/utdebug.c Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utdebug.c Thu Feb 17 13:58:44 2011 +0000
@@ -374,7 +374,7 @@
const char *FunctionName,
const char *ModuleName,
UINT32 ComponentId,
- char *String)
+ const char *String)
{
AcpiGbl_NestingLevel++;
diff -r 8c2205606fa6 -r 4c8c63027994 sys/external/bsd/acpica/dist/utilities/utdecode.c
--- a/sys/external/bsd/acpica/dist/utilities/utdecode.c Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utdecode.c Thu Feb 17 13:58:44 2011 +0000
@@ -192,7 +192,7 @@
};
-char *
+const char *
AcpiUtGetRegionName (
UINT8 SpaceId)
{
@@ -238,7 +238,7 @@
};
-char *
+const char *
AcpiUtGetEventName (
UINT32 EventId)
{
@@ -326,7 +326,7 @@
}
-char *
+const char *
AcpiUtGetObjectTypeName (
ACPI_OPERAND_OBJECT *ObjDesc)
{
@@ -352,7 +352,7 @@
*
******************************************************************************/
-char *
+const char *
AcpiUtGetNodeName (
void *Object)
{
@@ -428,7 +428,7 @@
};
-char *
+const char *
AcpiUtGetDescriptorName (
void *Object)
{
@@ -522,7 +522,7 @@
/* Names for internal mutex objects, used for debug output */
-static char *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
+static const char *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
{
"ACPI_MTX_Interpreter",
"ACPI_MTX_Namespace",
@@ -534,7 +534,7 @@
"ACPI_MTX_CommandReady"
};
-char *
+const char *
AcpiUtGetMutexName (
UINT32 MutexId)
{
diff -r 8c2205606fa6 -r 4c8c63027994 sys/external/bsd/acpica/dist/utilities/utosi.c
--- a/sys/external/bsd/acpica/dist/utilities/utosi.c Thu Feb 17 13:28:15 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utosi.c Thu Feb 17 13:58:44 2011 +0000
@@ -64,23 +64,23 @@
*/
static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] =
{
- /* Operating System Vendor Strings */
+ /* Operating System Vendor Strings */
- {"Windows 2000", NULL, 0, ACPI_OSI_WIN_2000}, /* Windows 2000 */
- {"Windows 2001", NULL, 0, ACPI_OSI_WIN_XP}, /* Windows XP */
- {"Windows 2001 SP1", NULL, 0, ACPI_OSI_WIN_XP_SP1}, /* Windows XP SP1 */
- {"Windows 2001.1", NULL, 0, ACPI_OSI_WINSRV_2003}, /* Windows Server 2003 */
- {"Windows 2001 SP2", NULL, 0, ACPI_OSI_WIN_XP_SP2}, /* Windows XP SP2 */
- {"Windows 2001.1 SP1", NULL, 0, ACPI_OSI_WINSRV_2003_SP1}, /* Windows Server 2003 SP1 - Added 03/2006 */
- {"Windows 2006", NULL, 0, ACPI_OSI_WIN_VISTA}, /* Windows Vista - Added 03/2006 */
- {"Windows 2006.1", NULL, 0, ACPI_OSI_WINSRV_2008}, /* Windows Server 2008 - Added 09/2009 */
- {"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1}, /* Windows Vista SP1 - Added 09/2009 */
- {"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2}, /* Windows Vista SP2 - Added 09/2010 */
- {"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */
+ {__UNCONST("Windows 2000"), NULL, 0, ACPI_OSI_WIN_2000}, /* Windows 2000 */
+ {__UNCONST("Windows 2001"), NULL, 0, ACPI_OSI_WIN_XP}, /* Windows XP */
+ {__UNCONST("Windows 2001 SP1"), NULL, 0, ACPI_OSI_WIN_XP_SP1}, /* Windows XP SP1 */
+ {__UNCONST("Windows 2001.1"), NULL, 0, ACPI_OSI_WINSRV_2003}, /* Windows Server 2003 */
+ {__UNCONST("Windows 2001 SP2"), NULL, 0, ACPI_OSI_WIN_XP_SP2}, /* Windows XP SP2 */
+ {__UNCONST("Windows 2001.1 SP1"), NULL, 0, ACPI_OSI_WINSRV_2003_SP1}, /* Windows Server 2003 SP1 - Added 03/2006 */
Home |
Main Index |
Thread Index |
Old Index