Merge ACPICA 20100121.

3 files changed, 14 insertions, 14 deletions

diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c
index 2289982..2b6ac5d 100644
--- a/sys/dev/acpi_support/acpi_ibm.c
+++ b/sys/dev/acpi_support/acpi_ibm.c
@@ -526,7 +526,7 @@ out:
 static int
 acpi_ibm_sysctl_get(struct acpi_ibm_softc *sc, int method)
 {
-	ACPI_INTEGER	val_ec;
+	UINT64		val_ec;
 	int 		val = 0, key;
 
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
@@ -657,7 +657,7 @@ static int
 acpi_ibm_sysctl_set(struct acpi_ibm_softc *sc, int method, int arg)
 {
 	int			val, step;
-	ACPI_INTEGER		val_ec;
+	UINT64			val_ec;
 	ACPI_OBJECT		Arg;
 	ACPI_OBJECT_LIST	Args;
 	ACPI_STATUS		status;
diff --git a/sys/dev/acpi_support/acpi_panasonic.c b/sys/dev/acpi_support/acpi_panasonic.c
index 595ca08..ad8b239 100644
--- a/sys/dev/acpi_support/acpi_panasonic.c
+++ b/sys/dev/acpi_support/acpi_panasonic.c
@@ -82,9 +82,9 @@ static int	acpi_panasonic_attach(device_t dev);
 static int	acpi_panasonic_detach(device_t dev);
 static int	acpi_panasonic_shutdown(device_t dev);
 static int	acpi_panasonic_sysctl(SYSCTL_HANDLER_ARGS);
-static ACPI_INTEGER acpi_panasonic_sinf(ACPI_HANDLE h, ACPI_INTEGER index);
-static void	acpi_panasonic_sset(ACPI_HANDLE h, ACPI_INTEGER index,
-		    ACPI_INTEGER val);
+static UINT64	acpi_panasonic_sinf(ACPI_HANDLE h, UINT64 index);
+static void	acpi_panasonic_sset(ACPI_HANDLE h, UINT64 index,
+		    UINT64 val);
 static int	acpi_panasonic_hkey_event(struct acpi_panasonic_softc *sc,
 		    ACPI_HANDLE h, UINT32 *arg);
 static void	acpi_panasonic_hkey_action(struct acpi_panasonic_softc *sc,
@@ -265,12 +265,12 @@ out:
 	return (error);
 }
 
-static ACPI_INTEGER
-acpi_panasonic_sinf(ACPI_HANDLE h, ACPI_INTEGER index)
+static UINT64
+acpi_panasonic_sinf(ACPI_HANDLE h, UINT64 index)
 {
 	ACPI_BUFFER buf;
 	ACPI_OBJECT *res;
-	ACPI_INTEGER ret;
+	UINT64 ret;
 
 	ACPI_SERIAL_ASSERT(panasonic);
 	ret = -1;
@@ -286,7 +286,7 @@ acpi_panasonic_sinf(ACPI_HANDLE h, ACPI_INTEGER index)
 }
 
 static void
-acpi_panasonic_sset(ACPI_HANDLE h, ACPI_INTEGER index, ACPI_INTEGER val)
+acpi_panasonic_sset(ACPI_HANDLE h, UINT64 index, UINT64 val)
 {
 	ACPI_OBJECT_LIST args;
 	ACPI_OBJECT obj[2];
@@ -394,7 +394,7 @@ acpi_panasonic_hkey_event(struct acpi_panasonic_softc *sc, ACPI_HANDLE h,
 {
 	ACPI_BUFFER buf;
 	ACPI_OBJECT *res;
-	ACPI_INTEGER val;
+	UINT64 val;
 	int status;
 
 	ACPI_SERIAL_ASSERT(panasonic);
diff --git a/sys/dev/acpi_support/acpi_wmi.c b/sys/dev/acpi_support/acpi_wmi.c
index 07c2d71..9da790c 100644
--- a/sys/dev/acpi_support/acpi_wmi.c
+++ b/sys/dev/acpi_support/acpi_wmi.c
@@ -141,7 +141,7 @@ static void		acpi_wmi_notify_handler(ACPI_HANDLE h, UINT32 notify,
 			    void *context);
 static ACPI_STATUS	acpi_wmi_ec_handler(UINT32 function,
 			    ACPI_PHYSICAL_ADDRESS address, UINT32 width,
-			    ACPI_INTEGER *value, void *context,
+			    UINT64 *value, void *context,
 			    void *region_context);
 /* helpers */
 static ACPI_STATUS	acpi_wmi_read_wdg_blocks(ACPI_HANDLE h);
@@ -646,12 +646,12 @@ acpi_wmi_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context)
  */
 static ACPI_STATUS
 acpi_wmi_ec_handler(UINT32 function, ACPI_PHYSICAL_ADDRESS address,
-    UINT32 width, ACPI_INTEGER *value, void *context,
+    UINT32 width, UINT64 *value, void *context,
     void *region_context)
 {
 	struct acpi_wmi_softc *sc;
 	int i;
-	ACPI_INTEGER ec_data;
+	UINT64 ec_data;
 	UINT8 ec_addr;
 	ACPI_STATUS status;
 
@@ -672,7 +672,7 @@ acpi_wmi_ec_handler(UINT32 function, ACPI_PHYSICAL_ADDRESS address,
 		case ACPI_READ:
 			status = ACPI_EC_READ(sc->ec_dev, ec_addr, &ec_data, 1);
 			if (ACPI_SUCCESS(status))
-				*value |= ((ACPI_INTEGER)ec_data) << i;
+				*value |= ((UINT64)ec_data) << i;
 		break;
 		case ACPI_WRITE:
 			ec_data = (UINT8)((*value) >> i);