From 407af313ca1b889cc9954f67c4dece9221e324ee Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Wed, 11 May 2011 09:05:43 +0000 Subject: [PATCH] Make the signature argument to get_table() const. Should fix the GCC4 build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41433 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/drivers/ACPI.h | 2 +- src/add-ons/kernel/bus_managers/acpi/acpi_busman.c | 6 +++--- src/add-ons/kernel/bus_managers/acpi/acpi_priv.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/headers/os/drivers/ACPI.h b/headers/os/drivers/ACPI.h index 335d914695..32a5341aa6 100644 --- a/headers/os/drivers/ACPI.h +++ b/headers/os/drivers/ACPI.h @@ -253,7 +253,7 @@ struct acpi_module_info { status_t (*reboot)(void); /* Table Access */ - status_t (*get_table)(char *signature, uint32 instance, + status_t (*get_table)(const char *signature, uint32 instance, void **tableHeader); }; 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 b34cddd159..e3e09d124e 100644 --- a/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c +++ b/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c @@ -714,10 +714,10 @@ reboot(void) status_t -get_table(char* signature, uint32 instance, void** tableHeader) +get_table(const char* signature, uint32 instance, void** tableHeader) { - return AcpiGetTable(signature, instance, (ACPI_TABLE_HEADER**)tableHeader) - == AE_OK ? B_OK : B_ERROR; + return AcpiGetTable((char*)signature, instance, + (ACPI_TABLE_HEADER**)tableHeader) == 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 3722229186..a4d4462bc0 100644 --- a/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h +++ b/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h @@ -136,7 +136,7 @@ typedef struct acpi_root_info { status_t (*reboot)(void); /* Table Access */ - status_t (*get_table)(char *signature, uint32 instance, + status_t (*get_table)(const char *signature, uint32 instance, void **tableHeader); } acpi_root_info; @@ -215,7 +215,7 @@ status_t enter_sleep_state(uint8 state); status_t reboot(void); -status_t get_table(char* signature, uint32 instance, void** tableHeader); +status_t get_table(const char* signature, uint32 instance, void** tableHeader); __END_DECLS