[ros-diffs] [cgutman] 48928: [ACPI] - Fix ACPI warnings - Based on a patch by Love Nystrom

Author: cgutman
Date: Wed Sep 29 02:16:18 2010
New Revision: 48928

URL: http://svn.reactos.org/svn/reactos?rev=48928&view=rev
Log:
[ACPI]
- Fix ACPI warnings
- Based on a patch by Love Nystrom

Modified:
    trunk/reactos/drivers/bus/acpi/busmgr/bus.c
    trunk/reactos/drivers/bus/acpi/busmgr/power.c
    trunk/reactos/drivers/bus/acpi/busmgr/utils.c

Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Wed Sep 29 02:16:18 2010
@@ -1298,7 +1298,7 @@
 	 * ----
 	 * Fix for the system root bus device -- the only root-level device.
 	 */
-	if ((parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) {
+	if (((ACPI_HANDLE)parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE))
{
 		hid = ACPI_BUS_HID;
 		sprintf(device->pnp.device_name, "%s", ACPI_BUS_DEVICE_NAME);
 		sprintf(device->pnp.device_class, "%s", ACPI_BUS_CLASS);

Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Wed Sep 29 02:16:18 2010
@@ -61,7 +61,7 @@
 
 static int acpi_power_add (struct acpi_device *device);
 static int acpi_power_remove (struct acpi_device *device, int type);
-static int acpi_power_resume(struct acpi_device *device);
+static int acpi_power_resume(struct acpi_device *device, int state);
 
 static struct acpi_driver acpi_power_driver = {
 	.name =		ACPI_POWER_DRIVER_NAME,
@@ -128,7 +128,7 @@
 	int *state)
 {
 	ACPI_STATUS		status = AE_OK;
-	unsigned long		sta = 0;
+	unsigned long long	sta = 0;
 	char node_name[5];
 	ACPI_BUFFER buffer = { sizeof(node_name), node_name };
 
@@ -632,9 +632,9 @@
 	return_VALUE(0);
 }
 
-static int acpi_power_resume(struct acpi_device *device)
-{
-	int result = 0, state;
+static int acpi_power_resume(struct acpi_device *device, int state)
+{
+	int result = 0;
 	struct acpi_power_resource *resource = NULL;
 	struct acpi_power_reference *ref;
 

Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/ut…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] Wed Sep 29 02:16:18 2010
@@ -166,7 +166,7 @@
 	}
 
 	head = buffer->Pointer;
-	tail = buffer->Pointer + tail_offset;
+	tail = ((PUCHAR)buffer->Pointer) + tail_offset;
 
 	/*
 	 * Extract package data.