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

Made acpi_button clear the button status register, if not properly, at least in a way that works.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11464 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Nathan Whitehorn 2005-02-24 02:12:42 +00:00
parent 20a7c7863d
commit a28a2204fb
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/add-ons/kernel/drivers/power/acpi_button/acpi_button.c
View File

@ -19,8 +19,7 @@ init_hardware (void)
status_t
init_driver (void)
{
get_module(B_ACPI_MODULE_NAME,(module_info **)&acpi);
return B_OK;
return get_module(B_ACPI_MODULE_NAME,(module_info **)&acpi);
}
void
@ -61,7 +60,21 @@ acpi_button_read (void* cookie, off_t position, void *buf, size_t* num_bytes)
return B_IO_ERROR;
*((uint8 *)(buf)) = acpi->read_acpi_reg((uint32)(cookie));
acpi->write_acpi_reg((uint32)(cookie),0); //--- Clear sticky status reg
/* acpi->write_acpi_reg((uint32)(cookie),0); */
/* The above simple clearing of the status register doesn't seem to work.
So we toggle the ENABLE bit instead. Hopefully this doesn't interfere
with the debounce logic and result in two events */
if ((uint32)(cookie) == ACPI_BITREG_POWER_BUTTON_STATUS) {
acpi->write_acpi_reg(ACPI_BITREG_POWER_BUTTON_ENABLE,1);
acpi->write_acpi_reg(ACPI_BITREG_POWER_BUTTON_ENABLE,0);
} else if ((uint32)(cookie) == ACPI_BITREG_SLEEP_BUTTON_STATUS) {
acpi->write_acpi_reg(ACPI_BITREG_SLEEP_BUTTON_ENABLE,1);
acpi->write_acpi_reg(ACPI_BITREG_SLEEP_BUTTON_ENABLE,0);
}
*num_bytes = 1;
return B_OK;
}