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) prepare_sleep_state(uint8 state, void (*wakeFunc)(void), size_t size)
{ {
ACPI_STATUS acpiStatus; 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) enter_sleep_state(uint8 state)
{ {
ACPI_STATUS status; ACPI_STATUS status;
@ -624,7 +624,7 @@ enter_sleep_state(uint8 state)
} }
static status_t status_t
reboot(void) reboot(void)
{ {
ACPI_STATUS status; 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, ns_handle_to_pathname,
evaluate_object, evaluate_object,
evaluate_method, evaluate_method,
get_irq_routing_table,
prepare_sleep_state,
enter_sleep_state,
reboot
}; };

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

@ -43,11 +43,12 @@ typedef struct acpi_device_cookie {
typedef struct acpi_root_info { typedef struct acpi_root_info {
driver_module_info info; driver_module_info info;
status_t (*get_handle)(acpi_handle parent, char* pathname, status_t (*get_handle)(acpi_handle parent, char *pathname,
acpi_handle* retHandle); acpi_handle *retHandle);
/* Global Lock */ /* Global Lock */
status_t (*acquire_global_lock)(uint16 timeout, uint32* handle);
status_t (*acquire_global_lock)(uint16 timeout, uint32 *handle);
status_t (*release_global_lock)(uint32 handle); status_t (*release_global_lock)(uint32 handle);
/* Notify Handler */ /* Notify Handler */
@ -65,60 +66,69 @@ typedef struct acpi_root_info {
status_t (*set_gpe)(acpi_handle handle, uint32 gpeNumber, status_t (*set_gpe)(acpi_handle handle, uint32 gpeNumber,
uint8 action); uint8 action);
status_t (*install_gpe_handler)(acpi_handle handle, uint32 gpeNumber, status_t (*install_gpe_handler)(acpi_handle handle, uint32 gpeNumber,
uint32 type, acpi_event_handler handler, void* data); uint32 type, acpi_event_handler handler, void *data);
status_t (*remove_gpe_handler)(acpi_handle handle, uint32 gpeNumber, status_t (*remove_gpe_handler)(acpi_handle handle, uint32 gpeNumber,
acpi_event_handler address); acpi_event_handler address);
/* Address Space Handler */ /* Address Space Handler */
status_t (*install_address_space_handler)(acpi_handle handle, status_t (*install_address_space_handler)(acpi_handle handle,
uint32 spaceID, acpi_adr_space_handler handler, uint32 spaceId,
acpi_adr_space_setup setup, void* data); acpi_adr_space_handler handler,
acpi_adr_space_setup setup, void *data);
status_t (*remove_address_space_handler)(acpi_handle handle, 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 */ /* Fixed Event Management */
void (*enable_fixed_event)(uint32 event); void (*enable_fixed_event)(uint32 event);
void (*disable_fixed_event)(uint32 event); void (*disable_fixed_event)(uint32 event);
uint32 (*fixed_event_status)(uint32 event); uint32 (*fixed_event_status) (uint32 event);
/* Returns 1 if event set, 0 otherwise */ /* Returns 1 if event set, 0 otherwise */
void (*reset_fixed_event)(uint32 event); void (*reset_fixed_event) (uint32 event);
status_t (*install_fixed_event_handler)(uint32 event, status_t (*install_fixed_event_handler)(uint32 event,
interrupt_handler* handler, void* data); interrupt_handler *handler, void *data);
status_t (*remove_fixed_event_handler)(uint32 event, status_t (*remove_fixed_event_handler)(uint32 event,
interrupt_handler* handler); interrupt_handler *handler);
/* Namespace Access */ /* Namespace Access */
status_t (*get_next_entry)(uint32 object_type, const char* base, status_t (*get_next_entry)(uint32 objectType, const char *base,
char* result, size_t len, void** counter); char *result, size_t length, void **_counter);
status_t (*get_device)(const char* hid, uint32 index, char* result, status_t (*get_device)(const char *hid, uint32 index, char *result,
size_t resultLength); size_t resultLength);
status_t (*get_device_hid)(const char* path, char* hid, status_t (*get_device_hid)(const char *path, char *hid,
size_t hidLength); size_t hidLength);
uint32 (*get_object_type)(const char* path); uint32 (*get_object_type)(const char *path);
status_t (*get_object)(const char* path, status_t (*get_object)(const char *path,
acpi_object_type** _returnValue); acpi_object_type **_returnValue);
status_t (*get_object_typed)(const char* path, status_t (*get_object_typed)(const char *path,
acpi_object_type** _returnValue, uint32 objectType); acpi_object_type **_returnValue, uint32 objectType);
status_t (*ns_handle_to_pathname)(acpi_handle targetHandle, status_t (*ns_handle_to_pathname)(acpi_handle targetHandle,
acpi_data* buffer); acpi_data *buffer);
/* Control method execution and data acquisition */ /* Control method execution and data acquisition */
status_t (*evaluate_object)(const char* object, status_t (*evaluate_object)(const char* object,
acpi_object_type* returnValue, size_t bufferLength); acpi_object_type *returnValue, size_t bufferLength);
status_t (*evaluate_method)(acpi_handle handle, const char* method, status_t (*evaluate_method)(acpi_handle handle, const char *method,
acpi_objects* args, acpi_data* returnValue); acpi_objects *args, acpi_data *returnValue);
/* Resource info */ /* Resource info */
status_t (*get_irq_routing_table)(acpi_handle busDeviceHandle, 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; } 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, status_t get_irq_routing_table(acpi_handle busDeviceHandle,
acpi_data* returnValue); 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 __END_DECLS