Skip to content

Commit be6788e

Browse files
committed
[ACPI]
- Fix ACPI warnings - Based on a patch by Love Nystrom svn path=/trunk/; revision=48928
1 parent 14f8621 commit be6788e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

reactos/drivers/bus/acpi/busmgr/bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1298,7 +1298,7 @@ acpi_bus_add (
12981298
* ----
12991299
* Fix for the system root bus device -- the only root-level device.
13001300
*/
1301-
if ((parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) {
1301+
if (((ACPI_HANDLE)parent == ACPI_ROOT_OBJECT) && (type == ACPI_BUS_TYPE_DEVICE)) {
13021302
hid = ACPI_BUS_HID;
13031303
sprintf(device->pnp.device_name, "%s", ACPI_BUS_DEVICE_NAME);
13041304
sprintf(device->pnp.device_class, "%s", ACPI_BUS_CLASS);

reactos/drivers/bus/acpi/busmgr/power.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ int acpi_power_nocheck;
6161

6262
static int acpi_power_add (struct acpi_device *device);
6363
static int acpi_power_remove (struct acpi_device *device, int type);
64-
static int acpi_power_resume(struct acpi_device *device);
64+
static int acpi_power_resume(struct acpi_device *device, int state);
6565

6666
static struct acpi_driver acpi_power_driver = {
6767
.name = ACPI_POWER_DRIVER_NAME,
@@ -128,7 +128,7 @@ acpi_power_get_state (
128128
int *state)
129129
{
130130
ACPI_STATUS status = AE_OK;
131-
unsigned long sta = 0;
131+
unsigned long long sta = 0;
132132
char node_name[5];
133133
ACPI_BUFFER buffer = { sizeof(node_name), node_name };
134134

@@ -632,9 +632,9 @@ acpi_power_remove (
632632
return_VALUE(0);
633633
}
634634

635-
static int acpi_power_resume(struct acpi_device *device)
635+
static int acpi_power_resume(struct acpi_device *device, int state)
636636
{
637-
int result = 0, state;
637+
int result = 0;
638638
struct acpi_power_resource *resource = NULL;
639639
struct acpi_power_reference *ref;
640640

reactos/drivers/bus/acpi/busmgr/utils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ acpi_extract_package (
166166
}
167167

168168
head = buffer->Pointer;
169-
tail = buffer->Pointer + tail_offset;
169+
tail = ((PUCHAR)buffer->Pointer) + tail_offset;
170170

171171
/*
172172
* Extract package data.

0 commit comments

Comments
 (0)