diff --git a/src/board/system76/galp3-c/dac.c b/src/board/system76/galp3-c/dac.c deleted file mode 100644 index 52f1bd6..0000000 --- a/src/board/system76/galp3-c/dac.c +++ /dev/null @@ -1,8 +0,0 @@ -#include - -void dac_init(void) { - // Enable DAC5, used for KBLIGHT_ADJ - DACPDREG &= ~(1 << 5); - // Set DAC5 to 0V - DACDAT5 = 0; -} diff --git a/src/board/system76/galp3-c/include/board/dac.h b/src/board/system76/galp3-c/include/board/dac.h deleted file mode 100644 index fedf609..0000000 --- a/src/board/system76/galp3-c/include/board/dac.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _BOARD_DAC_H -#define _BOARD_DAC_H - -#include - -void dac_init(void); - -#endif // _BOARD_DAC_H diff --git a/src/board/system76/galp3-c/include/board/kbled.h b/src/board/system76/galp3-c/include/board/kbled.h index 84db299..c4826f2 100644 --- a/src/board/system76/galp3-c/include/board/kbled.h +++ b/src/board/system76/galp3-c/include/board/kbled.h @@ -3,6 +3,7 @@ #include +void kbled_init(void); uint8_t kbled_get(void); void kbled_set(uint8_t level); diff --git a/src/board/system76/galp3-c/kbled.c b/src/board/system76/galp3-c/kbled.c index c4a02b7..0583a3f 100644 --- a/src/board/system76/galp3-c/kbled.c +++ b/src/board/system76/galp3-c/kbled.c @@ -1,6 +1,6 @@ -#include #include #include +#include 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; diff --git a/src/board/system76/galp3-c/main.c b/src/board/system76/galp3-c/main.c index 6266062..24755ab 100644 --- a/src/board/system76/galp3-c/main.c +++ b/src/board/system76/galp3-c/main.c @@ -4,10 +4,10 @@ #include #include -#include #include #include #include +#include #include #include #include @@ -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(); diff --git a/src/board/system76/lemp9/dac.c b/src/board/system76/lemp9/dac.c deleted file mode 100644 index b410a00..0000000 --- a/src/board/system76/lemp9/dac.c +++ /dev/null @@ -1,8 +0,0 @@ -#include - -void dac_init(void) { - // Enable DAC2, used for KBLIGHT_ADJ - DACPDREG &= ~(1 << 2); - // Set DAC2 to 0V - DACDAT2 = 0; -} diff --git a/src/board/system76/lemp9/include/board/dac.h b/src/board/system76/lemp9/include/board/dac.h deleted file mode 100644 index fedf609..0000000 --- a/src/board/system76/lemp9/include/board/dac.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _BOARD_DAC_H -#define _BOARD_DAC_H - -#include - -void dac_init(void); - -#endif // _BOARD_DAC_H diff --git a/src/board/system76/lemp9/include/board/kbled.h b/src/board/system76/lemp9/include/board/kbled.h index 84db299..c4826f2 100644 --- a/src/board/system76/lemp9/include/board/kbled.h +++ b/src/board/system76/lemp9/include/board/kbled.h @@ -3,6 +3,7 @@ #include +void kbled_init(void); uint8_t kbled_get(void); void kbled_set(uint8_t level); diff --git a/src/board/system76/lemp9/kbled.c b/src/board/system76/lemp9/kbled.c index 481255b..17fff1b 100644 --- a/src/board/system76/lemp9/kbled.c +++ b/src/board/system76/lemp9/kbled.c @@ -1,6 +1,6 @@ -#include #include #include +#include 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; diff --git a/src/board/system76/lemp9/main.c b/src/board/system76/lemp9/main.c index 6266062..24755ab 100644 --- a/src/board/system76/lemp9/main.c +++ b/src/board/system76/lemp9/main.c @@ -4,10 +4,10 @@ #include #include -#include #include #include #include +#include #include #include #include @@ -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();