Refactor of keyboard LED

src/board/system76/galp3-c/dac.c

@@ -1,8 +0,0 @@
-#include <board/dac.h>
-
-void dac_init(void) {
-    // Enable DAC5, used for KBLIGHT_ADJ
-    DACPDREG &= ~(1 << 5);
-    // Set DAC5 to 0V
-    DACDAT5 = 0;
-}

src/board/system76/galp3-c/include/board/dac.h

@@ -1,8 +0,0 @@
-#ifndef _BOARD_DAC_H
-#define _BOARD_DAC_H
-
-#include <ec/dac.h>
-
-void dac_init(void);
-
-#endif // _BOARD_DAC_H

src/board/system76/galp3-c/include/board/kbled.h

@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 
+void kbled_init(void);
 uint8_t kbled_get(void);
 void kbled_set(uint8_t level);
 

src/board/system76/galp3-c/kbled.c

@@ -1,6 +1,6 @@
-#include <board/dac.h>
 #include <board/kbled.h>
 #include <common/macro.h>
+#include <ec/dac.h>
 
 static uint8_t __code levels[] = {
     0x00,
@@ -11,6 +11,13 @@ static uint8_t __code levels[] = {
     0xFF
 };
 
+void kbled_init(void) {
+    // Enable DAC5, used for KBLIGHT_ADJ
+    DACPDREG &= ~(1 << 5);
+    // Set DAC5 to 0V
+    DACDAT5 = 0;
+}
+
 uint8_t kbled_get(void) {
     uint8_t level;
     uint8_t raw = DACDAT5;

src/board/system76/galp3-c/main.c

@@ -4,10 +4,10 @@
 
 #include <arch/delay.h>
 #include <board/battery.h>
-#include <board/dac.h>
 #include <board/gpio.h>
 #include <board/gctrl.h>
 #include <board/kbc.h>
+#include <board/kbled.h>
 #include <board/kbscan.h>
 #include <board/peci.h>
 #include <board/pmc.h>
@@ -47,10 +47,10 @@ void timer_2(void) __interrupt(5) {
 void init(void) {
     gpio_init();
     gctrl_init();
-    dac_init();
     pwm_init();
 
     kbc_init();
+    kbled_init();
     kbscan_init();
     pmc_init();
     peci_init();

src/board/system76/lemp9/dac.c

@@ -1,8 +0,0 @@
-#include <board/dac.h>
-
-void dac_init(void) {
-    // Enable DAC2, used for KBLIGHT_ADJ
-    DACPDREG &= ~(1 << 2);
-    // Set DAC2 to 0V
-    DACDAT2 = 0;
-}

src/board/system76/lemp9/include/board/dac.h

@@ -1,8 +0,0 @@
-#ifndef _BOARD_DAC_H
-#define _BOARD_DAC_H
-
-#include <ec/dac.h>
-
-void dac_init(void);
-
-#endif // _BOARD_DAC_H

src/board/system76/lemp9/include/board/kbled.h

@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 
+void kbled_init(void);
 uint8_t kbled_get(void);
 void kbled_set(uint8_t level);
 

src/board/system76/lemp9/kbled.c

@@ -1,6 +1,6 @@
-#include <board/dac.h>
 #include <board/kbled.h>
 #include <common/macro.h>
+#include <ec/dac.h>
 
 static uint8_t __code levels[] = {
     0x00,
@@ -11,6 +11,13 @@ static uint8_t __code levels[] = {
     0xFF
 };
 
+void kbled_init(void) {
+    // Enable DAC2, used for KBLIGHT_ADJ
+    DACPDREG &= ~(1 << 2);
+    // Set DAC2 to 0V
+    DACDAT2 = 0;
+}
+
 uint8_t kbled_get(void) {
     uint8_t level;
     uint8_t raw = DACDAT2;

src/board/system76/lemp9/main.c

@@ -4,10 +4,10 @@
 
 #include <arch/delay.h>
 #include <board/battery.h>
-#include <board/dac.h>
 #include <board/gpio.h>
 #include <board/gctrl.h>
 #include <board/kbc.h>
+#include <board/kbled.h>
 #include <board/kbscan.h>
 #include <board/peci.h>
 #include <board/pmc.h>
@@ -47,10 +47,10 @@ void timer_2(void) __interrupt(5) {
 void init(void) {
     gpio_init();
     gctrl_init();
-    dac_init();
     pwm_init();
 
     kbc_init();
+    kbled_init();
     kbscan_init();
     pmc_init();
     peci_init();