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

* Fixing acpi_embedded_controller to work with the acpi 20100428.

Browse Source 
* Fixed one instance where ACPI and BeOS status codes was not handled right.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36897 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Fredrik Holmqvist
2010-05-22 09:45:18 +00:00
parent 0514b0cad2
commit e427cb78f7
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/acpi/acpi_embedded_controller.cpp
+9 -14
View File
@@ -374,14 +374,8 @@ embedded_controller_init_driver(device_node* dev, void** _driverCookie)
} }
// Enable runtime GPEs for the handler. // Enable runtime GPEs for the handler.
status = sc->ec_acpi_module->set_gpe(sc->ec_gpehandle, sc->ec_gpebit,
ACPI_GPE_ENABLE);
if (status != B_OK) {
TRACE("AcpiSetGpeType failed.\n");
goto error;
}
status = sc->ec_acpi_module->enable_gpe(sc->ec_gpehandle, sc->ec_gpebit, status = sc->ec_acpi_module->enable_gpe(sc->ec_gpehandle, sc->ec_gpebit,
ACPI_NOT_ISR); ACPI_GPE_TYPE_RUNTIME);
if (status != B_OK) { if (status != B_OK) {
TRACE("AcpiEnableGpe failed.\n"); TRACE("AcpiEnableGpe failed.\n");
goto error; goto error;
@@ -507,9 +501,9 @@ EcGpeQueryHandler(void* context)
// interrupt source since we are edge-triggered. To prevent the GPE // interrupt source since we are edge-triggered. To prevent the GPE
// that may arise from running the query from causing another query // that may arise from running the query from causing another query
// to be queued, we clear the pending flag only after running it. // to be queued, we clear the pending flag only after running it.
status = EcCommand(sc, EC_COMMAND_QUERY); acpi_status acpi_status = EcCommand(sc, EC_COMMAND_QUERY);
sc->ec_sci_pending = FALSE; sc->ec_sci_pending = FALSE;
if (status != B_OK) { if (acpi_status != AE_OK) {
EcUnlock(sc); EcUnlock(sc);
TRACE("GPE query failed.\n"); TRACE("GPE query failed.\n");
return; return;
@@ -606,15 +600,16 @@ EcSpaceHandler(uint32 function, acpi_physical_address address, uint32 width,
/* /*
* If booting, check if we need to run the query handler. If so, we * If booting, check if we need to run the query handler. If so, we
* we call it directly here since our thread taskq is not active yet. * we call it directly here as scheduling and dpc might not be up yet.
* (Not sure if it's needed)
*/ */
/*
if (cold || rebooting || sc->ec_suspending) { if (gKernelStartup || sc->ec_suspending) {
if ((EC_GET_CSR(sc) & EC_EVENT_SCI)) { if ((EC_GET_CSR(sc) & EC_EVENT_SCI)) {
//CTR0(KTR_ACPI, "ec running gpe handler directly"); //CTR0(KTR_ACPI, "ec running gpe handler directly");
EcGpeQueryHandler(sc); EcGpeQueryHandler(sc);
} }
} */ }
// Serialize with EcGpeQueryHandler() at transaction granularity. // Serialize with EcGpeQueryHandler() at transaction granularity.
status = EcLock(sc); status = EcLock(sc);
@@ -854,7 +849,7 @@ EcWrite(struct acpi_ec_cookie* sc, uint8 address, uint8* writeData)
EC_SET_DATA(sc, address); EC_SET_DATA(sc, address);
status = EcWaitEvent(sc, EC_EVENT_INPUT_BUFFER_EMPTY, generationCount); status = EcWaitEvent(sc, EC_EVENT_INPUT_BUFFER_EMPTY, generationCount);
if (status != AE_OK) { if (status != AE_OK) {
TRACE("EcRead: failed waiting for sent address\n"); TRACE("EcWrite: failed waiting for sent address\n");
return status; return status;
} }