From 2800b0646257f6b82c44e4f4176cb812a86bb09f Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Mon, 9 May 2011 13:05:28 +0000 Subject: [PATCH] Add missing const to the path argument of get_handle(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41398 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/drivers/ACPI.h | 2 +- src/add-ons/kernel/bus_managers/acpi/acpi_busman.c | 4 ++-- src/add-ons/kernel/bus_managers/acpi/acpi_priv.h | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/headers/os/drivers/ACPI.h b/headers/os/drivers/ACPI.h index 64f48f7b86..1d09820540 100644 --- a/headers/os/drivers/ACPI.h +++ b/headers/os/drivers/ACPI.h @@ -160,7 +160,7 @@ typedef void (*acpi_notify_handler)(acpi_handle device, uint32 value, struct acpi_module_info { module_info info; - status_t (*get_handle)(acpi_handle parent, char *pathname, + status_t (*get_handle)(acpi_handle parent, const char *pathname, acpi_handle *retHandle); /* Global Lock */ diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c b/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c index 4b6186882b..2512e3c0bb 100644 --- a/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c +++ b/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c @@ -262,9 +262,9 @@ acpi_std_ops(int32 op,...) status_t -get_handle(acpi_handle parent, char *pathname, acpi_handle *retHandle) +get_handle(acpi_handle parent, const char *pathname, acpi_handle *retHandle) { - return AcpiGetHandle(parent, pathname, retHandle) == AE_OK + return AcpiGetHandle(parent, (ACPI_STRING)pathname, retHandle) == AE_OK ? B_OK : B_ERROR; } diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h b/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h index b8c723d5df..cb5c833568 100644 --- a/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h +++ b/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h @@ -43,7 +43,7 @@ typedef struct acpi_device_cookie { typedef struct acpi_root_info { driver_module_info info; - status_t (*get_handle)(acpi_handle parent, char *pathname, + status_t (*get_handle)(acpi_handle parent, const char *pathname, acpi_handle *retHandle); /* Global Lock */ @@ -147,7 +147,8 @@ extern struct device_module_info embedded_controller_device_module; extern acpi_device_module_info gACPIDeviceModule; -status_t get_handle(acpi_handle parent, char* pathname, acpi_handle* retHandle); +status_t get_handle(acpi_handle parent, const char* pathname, + acpi_handle* retHandle); status_t acquire_global_lock(uint16 timeout, uint32* handle); status_t release_global_lock(uint32 handle);