From f3688be9196cedba17a2f36b2b84395ea61ba79c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 21 Sep 2020 14:03:36 -0600 Subject: [PATCH] Use enum for EC OS --- src/board/system76/common/acpi.c | 8 ++++---- src/board/system76/common/include/board/acpi.h | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/board/system76/common/acpi.c b/src/board/system76/common/acpi.c index 7efb403..47114cb 100644 --- a/src/board/system76/common/acpi.c +++ b/src/board/system76/common/acpi.c @@ -16,7 +16,7 @@ extern uint8_t sci_extra; -uint8_t acpi_ecos = 0; +enum EcOs acpi_ecos = EC_OS_NONE; static uint8_t fcmd = 0; static uint8_t fdat = 0; @@ -56,8 +56,8 @@ void acpi_reset(void) { // Disable lid wake lid_wake = false; - // ECOS: No ACPI - acpi_ecos = 0; + // ECOS: No ACPI or driver + acpi_ecos = EC_OS_NONE; #if HAVE_LED_AIRPLANE_N // Clear airplane mode LED @@ -182,7 +182,7 @@ void acpi_write(uint8_t addr, uint8_t data) { break; case 0x68: - acpi_ecos = data; + acpi_ecos = (enum EcOs)data; break; case 0xBC: diff --git a/src/board/system76/common/include/board/acpi.h b/src/board/system76/common/include/board/acpi.h index c4a36eb..49a3759 100644 --- a/src/board/system76/common/include/board/acpi.h +++ b/src/board/system76/common/include/board/acpi.h @@ -5,7 +5,15 @@ #include -extern uint8_t acpi_ecos; +enum EcOs { + // No ACPI or driver support + EC_OS_NONE=0, + // ACPI, but no driver support + EC_OS_ACPI=1, + // ACPI with driver, full support + EC_OS_FULL=2, +}; +extern enum EcOs acpi_ecos; void acpi_reset(void); uint8_t acpi_read(uint8_t addr);