Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI Module info for prepare_sleep_state, enter_sleep_state, reboot didn't look to be right.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37260 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Fredrik Holmqvist 2010-06-26 09:59:36 +00:00
parent 45bd7bb3db
commit cfb281bd72
3 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/add-ons/kernel/bus_managers/acpi/acpi_busman.c
View File

@ -566,7 +566,7 @@ get_irq_routing_table(acpi_handle busDeviceHandle, acpi_data *retBuffer)
}
static status_t
status_t
prepare_sleep_state(uint8 state, void (*wakeFunc)(void), size_t size)
{
ACPI_STATUS acpiStatus;
@ -605,7 +605,7 @@ prepare_sleep_state(uint8 state, void (*wakeFunc)(void), size_t size)
}
static status_t
status_t
enter_sleep_state(uint8 state)
{
ACPI_STATUS status;
@ -624,7 +624,7 @@ enter_sleep_state(uint8 state)
}
static status_t
status_t
reboot(void)
{
ACPI_STATUS status;

4
src/add-ons/kernel/bus_managers/acpi/acpi_module.c
View File

@ -217,6 +217,10 @@ static struct acpi_root_info sACPIRootModule = {
ns_handle_to_pathname,
evaluate_object,
evaluate_method,
get_irq_routing_table,
prepare_sleep_state,
enter_sleep_state,
reboot
};

25
src/add-ons/kernel/bus_managers/acpi/acpi_priv.h
View File

@ -47,6 +47,7 @@ typedef struct acpi_root_info {
acpi_handle *retHandle);
/* Global Lock */
status_t (*acquire_global_lock)(uint16 timeout, uint32 *handle);
status_t (*release_global_lock)(uint32 handle);
@ -72,10 +73,12 @@ typedef struct acpi_root_info {
/* Address Space Handler */
status_t (*install_address_space_handler)(acpi_handle handle,
uint32 spaceID, acpi_adr_space_handler handler,
uint32 spaceId,
acpi_adr_space_handler handler,
acpi_adr_space_setup setup, void *data);
status_t (*remove_address_space_handler)(acpi_handle handle,
uint32 spaceID, acpi_adr_space_handler handler);
uint32 spaceId,
acpi_adr_space_handler handler);
/* Fixed Event Management */
@ -93,8 +96,8 @@ typedef struct acpi_root_info {
/* Namespace Access */
status_t (*get_next_entry)(uint32 object_type, const char* base,
char* result, size_t len, void** counter);
status_t (*get_next_entry)(uint32 objectType, const char *base,
char *result, size_t length, void **_counter);
status_t (*get_device)(const char *hid, uint32 index, char *result,
size_t resultLength);
@ -118,7 +121,14 @@ typedef struct acpi_root_info {
/* Resource info */
status_t (*get_irq_routing_table)(acpi_handle busDeviceHandle,
acpi_data* returnValue);
acpi_data *retBuffer);
/* Power state setting */
status_t (*prepare_sleep_state)(uint8 state, void (*wakeFunc)(void),
size_t size);
status_t (*enter_sleep_state)(uint8 state);
status_t (*reboot)(void);
} acpi_root_info;
@ -183,6 +193,11 @@ status_t evaluate_method(acpi_handle handle, const char* method,
status_t get_irq_routing_table(acpi_handle busDeviceHandle,
acpi_data* returnValue);
status_t prepare_sleep_state(uint8 state, void (*wakeFunc)(void), size_t size);
status_t enter_sleep_state(uint8 state);
status_t reboot(void);
__END_DECLS