i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

acpi: use acpi_event_handler instead of interrupt_handler.

Browse Source
This commit is contained in:
Jérôme Duval
2013-10-30 22:29:37 +01:00
parent 577411006e
commit daf95c6d8c
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/drivers/ACPI.h
+4 -4
View File
@@ -154,9 +154,9 @@ typedef struct acpi_resource acpi_resource;
#endif // __ACTYPES_H__ #endif // __ACTYPES_H__
typedef uint32 (*acpi_event_handler)(void *Context); typedef uint32 (*acpi_event_handler)(void *context);
typedef uint32 (*acpi_gpe_handler) (acpi_handle GpeDevice, uint32 GpeNumber, typedef uint32 (*acpi_gpe_handler) (acpi_handle GpeDevice, uint32 GpeNumber,
void *Context); void *context);
typedef acpi_status (*acpi_adr_space_handler)(uint32 function, typedef acpi_status (*acpi_adr_space_handler)(uint32 function,
acpi_physical_address address, uint32 bitWidth, int *value, acpi_physical_address address, uint32 bitWidth, int *value,
@@ -225,9 +225,9 @@ struct acpi_module_info {
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); acpi_event_handler handler, void *data);
status_t (*remove_fixed_event_handler)(uint32 event, status_t (*remove_fixed_event_handler)(uint32 event,
interrupt_handler *handler); acpi_event_handler handler);
/* Namespace Access */ /* Namespace Access */
src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h
+4 -4
View File
@@ -97,9 +97,9 @@ typedef struct acpi_root_info {
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); acpi_event_handler handler, void *data);
status_t (*remove_fixed_event_handler)(uint32 event, status_t (*remove_fixed_event_handler)(uint32 event,
interrupt_handler *handler); acpi_event_handler handler);
/* Namespace Access */ /* Namespace Access */
@@ -196,9 +196,9 @@ void disable_fixed_event(uint32 event);
uint32 fixed_event_status(uint32 event); uint32 fixed_event_status(uint32 event);
void reset_fixed_event(uint32 event); void reset_fixed_event(uint32 event);
status_t install_fixed_event_handler(uint32 event, interrupt_handler* handler, status_t install_fixed_event_handler(uint32 event, acpi_event_handler handler,
void* data); void* data);
status_t remove_fixed_event_handler(uint32 event, interrupt_handler* handler); status_t remove_fixed_event_handler(uint32 event, acpi_event_handler handler);
status_t get_next_entry(uint32 object_type, const char* base, char* result, status_t get_next_entry(uint32 object_type, const char* base, char* result,
size_t length, void** _counter); size_t length, void** _counter);
src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
+2 -2
View File
@@ -375,7 +375,7 @@ reset_fixed_event(uint32 event)
status_t status_t
install_fixed_event_handler(uint32 event, interrupt_handler* handler, install_fixed_event_handler(uint32 event, acpi_event_handler handler,
void *data) void *data)
{ {
return AcpiInstallFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler, data) == AE_OK return AcpiInstallFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler, data) == AE_OK
@@ -384,7 +384,7 @@ install_fixed_event_handler(uint32 event, interrupt_handler* handler,
status_t status_t
remove_fixed_event_handler(uint32 event, interrupt_handler* handler) remove_fixed_event_handler(uint32 event, acpi_event_handler handler)
{ {
return AcpiRemoveFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler) == AE_OK return AcpiRemoveFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler) == AE_OK
? B_OK : B_ERROR; ? B_OK : B_ERROR;