Author: mmlr Date: 2011-05-09 15:05:28 +0200 (Mon, 09 May 2011) New Revision: 41398 Changeset: https://dev.haiku-os.org/changeset/41398 Modified: haiku/trunk/headers/os/drivers/ACPI.h haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h Log: Add missing const to the path argument of get_handle(). Modified: haiku/trunk/headers/os/drivers/ACPI.h =================================================================== --- haiku/trunk/headers/os/drivers/ACPI.h 2011-05-09 12:19:41 UTC (rev 41397) +++ haiku/trunk/headers/os/drivers/ACPI.h 2011-05-09 13:05:28 UTC (rev 41398) @@ -160,7 +160,7 @@ 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 */ Modified: haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c =================================================================== --- haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c 2011-05-09 12:19:41 UTC (rev 41397) +++ haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c 2011-05-09 13:05:28 UTC (rev 41398) @@ -262,9 +262,9 @@ 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; } Modified: haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h =================================================================== --- haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h 2011-05-09 12:19:41 UTC (rev 41397) +++ haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h 2011-05-09 13:05:28 UTC (rev 41398) @@ -43,7 +43,7 @@ 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 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);