From 055cb92844795a7363ad07e53f61e5a2f32f0421 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 19 Nov 2019 12:31:30 -0700
Subject: [PATCH] Allow compilation with lower log level, change level to warn

---
 src/board/system76/galp3-c/acpi.c   |  4 ++++
 src/board/system76/galp3-c/board.mk |  4 ++--
 src/board/system76/galp3-c/kbc.c    | 12 +++++++-----
 src/board/system76/galp3-c/main.c   | 19 +++++++++++--------
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/board/system76/galp3-c/acpi.c b/src/board/system76/galp3-c/acpi.c
index 0dfe748..b295662 100644
--- a/src/board/system76/galp3-c/acpi.c
+++ b/src/board/system76/galp3-c/acpi.c
@@ -36,6 +36,9 @@ uint8_t acpi_read(uint8_t addr) {
     return data;
 }
 
+// If not in debug mode, data is not used, ignore warning
+#pragma save
+#pragma disable_warning 85
 void acpi_write(uint8_t addr, uint8_t data) {
     DEBUG("acpi_write %02X = %02X\n", addr, data);
 
@@ -43,3 +46,4 @@ void acpi_write(uint8_t addr, uint8_t data) {
     //TODO
     }
 }
+#pragma restore
diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk
index 32f49ae..e1a3a97 100644
--- a/src/board/system76/galp3-c/board.mk
+++ b/src/board/system76/galp3-c/board.mk
@@ -3,8 +3,8 @@ EC=it8587e
 # Add keymaps to include
 INCLUDE+=$(wildcard $(BOARD_DIR)/keymap/*.h)
 
-# Set debug level to debug
-CFLAGS+=-DLEVEL=4
+# Set debug level to warn
+CFLAGS+=-DLEVEL=2
 
 # Enable I2C debug on 0x76
 # CFLAGS+=-DI2C_DEBUGGER=0x76
diff --git a/src/board/system76/galp3-c/kbc.c b/src/board/system76/galp3-c/kbc.c
index 2ddf9f4..99529fe 100644
--- a/src/board/system76/galp3-c/kbc.c
+++ b/src/board/system76/galp3-c/kbc.c
@@ -219,11 +219,13 @@ void kbc_event(struct Kbc * kbc) {
                 case KBC_STATE_SCANCODE:
                     DEBUG("  get/set scancode\n");
                     state = KBC_STATE_NORMAL;
-                    switch (data) {
-                        case 0x02:
-                            DEBUG("    set scancode set 2\n");
-                            break;
-                    }
+                    #if LEVEL >= LEVEL_DEBUG
+                        switch (data) {
+                            case 0x02:
+                                DEBUG("    set scancode set 2\n");
+                                break;
+                        }
+                    #endif
                     kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT);
                     break;
                 case KBC_STATE_WRITE_PORT:
diff --git a/src/board/system76/galp3-c/main.c b/src/board/system76/galp3-c/main.c
index eaf0bea..803ec52 100644
--- a/src/board/system76/galp3-c/main.c
+++ b/src/board/system76/galp3-c/main.c
@@ -299,15 +299,18 @@ void power_button() {
 
         TRACE("LED_PWR: %d\n", power);
         gpio_set(&LED_PWR, power);
-    } else if (new && !last) {
-        DEBUG("Power switch release\n");
-
-        TRACE("SUSWARN_N: %d\n", gpio_get(&SUSWARN_N));
-        TRACE("SUSC_N_PCH: %d\n", gpio_get(&SUSC_N_PCH));
-        TRACE("SUSB_N_PCH: %d\n", gpio_get(&SUSB_N_PCH));
-        TRACE("ALL_SYS_PWRGD: %d\n", gpio_get(&ALL_SYS_PWRGD));
-        TRACE("BUF_PLT_RST_N: %d\n", gpio_get(&BUF_PLT_RST_N));
     }
+    #if LEVEL >= LEVEL_DEBUG
+        else if (new && !last) {
+            DEBUG("Power switch release\n");
+
+            TRACE("SUSWARN_N: %d\n", gpio_get(&SUSWARN_N));
+            TRACE("SUSC_N_PCH: %d\n", gpio_get(&SUSC_N_PCH));
+            TRACE("SUSB_N_PCH: %d\n", gpio_get(&SUSB_N_PCH));
+            TRACE("ALL_SYS_PWRGD: %d\n", gpio_get(&ALL_SYS_PWRGD));
+            TRACE("BUF_PLT_RST_N: %d\n", gpio_get(&BUF_PLT_RST_N));
+        }
+    #endif
 
     last = new;
 }