From a9d517d95c419b00dadcd10c82a62b681264da9c Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Wed, 27 Jul 2005 05:09:05 +0000 Subject: [PATCH] - Fix all ACPI warnings and add default case for unhandled ACPI cases. svn path=/trunk/; revision=16790 --- reactos/drivers/bus/acpi/include/acpi.h | 1 + reactos/drivers/bus/acpi/include/platform/types.h | 1 + reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c | 2 +- reactos/drivers/bus/acpi/ospm/fdo.c | 12 ++++++++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/reactos/drivers/bus/acpi/include/acpi.h b/reactos/drivers/bus/acpi/include/acpi.h index 7f4f34f9b48..7aaf7ae7466 100644 --- a/reactos/drivers/bus/acpi/include/acpi.h +++ b/reactos/drivers/bus/acpi/include/acpi.h @@ -50,6 +50,7 @@ #include "acglobal.h" /* All global variables */ #include "achware.h" /* Hardware defines and interfaces */ #include "accommon.h" /* Common interfaces */ +#include "acresrc.h" /* Resource Manager function prototypes */ #endif /* __ACPI_H__ */ diff --git a/reactos/drivers/bus/acpi/include/platform/types.h b/reactos/drivers/bus/acpi/include/platform/types.h index 952bb543f95..d4956e62611 100644 --- a/reactos/drivers/bus/acpi/include/platform/types.h +++ b/reactos/drivers/bus/acpi/include/platform/types.h @@ -14,6 +14,7 @@ #define __INCLUDE_ACPI_TYPES_H #include +#include typedef UCHAR UINT8; typedef USHORT UINT16; diff --git a/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c b/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c index 40931876ead..6d263066d63 100644 --- a/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c +++ b/reactos/drivers/bus/acpi/ospm/busmgr/bmutils.c @@ -279,7 +279,7 @@ bm_extract_package_data ( } head = buffer->pointer; - tail = buffer->pointer + tail_offset; + tail = head + tail_offset; /* * Extract package data: diff --git a/reactos/drivers/bus/acpi/ospm/fdo.c b/reactos/drivers/bus/acpi/ospm/fdo.c index 411206ba308..d752658a60f 100644 --- a/reactos/drivers/bus/acpi/ospm/fdo.c +++ b/reactos/drivers/bus/acpi/ospm/fdo.c @@ -162,6 +162,10 @@ AcpiCreateResourceList(PCM_RESOURCE_LIST* pResourceList, Done = TRUE; break; } + default: + { + break; + } } resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); } @@ -301,6 +305,10 @@ AcpiCreateResourceList(PCM_RESOURCE_LIST* pResourceList, Done = TRUE; break; } + default: + { + break; + } } resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); } @@ -471,7 +479,7 @@ FdoQueryBusRelations( return Status; } - +#ifndef NDEBUG static VOID ACPIPrintInfo( PFDO_DEVICE_EXTENSION DeviceExtension) @@ -491,7 +499,7 @@ ACPIPrintInfo( (DeviceExtension->SystemStates[5]?'+':'-')); DbgPrint("+------------------------------------------------------------\n"); } - +#endif static NTSTATUS ACPIInitializeInternalDriver(