diff --git a/src/arch/8051/arch.mk b/src/arch/8051/arch.mk index 4e6255a..f31d0cd 100644 --- a/src/arch/8051/arch.mk +++ b/src/arch/8051/arch.mk @@ -1,4 +1,4 @@ -CC=sdcc -mmcs51 +CC=sdcc -mmcs51 --Werror OBJ=$(patsubst src/%.c,$(BUILD)/%.rel,$(SRC)) # Run EC rom in simulator diff --git a/src/board/system76/galp3-c/battery.c b/src/board/system76/galp3-c/battery.c index 7a68cea..9157e01 100644 --- a/src/board/system76/galp3-c/battery.c +++ b/src/board/system76/galp3-c/battery.c @@ -69,6 +69,8 @@ uint8_t battery_charger_disable(void) { // Disable charge voltage err = smbus_write(0x09, 0x15, 0); if (err) return err; + + return 0; } uint8_t battery_charger_enable(void) { diff --git a/src/board/system76/galp3-c/gpio.c b/src/board/system76/galp3-c/gpio.c index ae58602..4b4753b 100644 --- a/src/board/system76/galp3-c/gpio.c +++ b/src/board/system76/galp3-c/gpio.c @@ -12,7 +12,7 @@ void gpio_init() { GPDRC = 0; GPDRD = (1 << 5) | (1 << 4) | (1 << 3); GPDRE = 0; - GPDRF = (1 << 7) | (1 << 6); + GPDRF = 0xC0; // (1 << 7) | (1 << 6) GPDRG = 0; GPDRH = 0; GPDRI = 0; diff --git a/src/board/system76/galp3-c/keymap.c b/src/board/system76/galp3-c/keymap.c index 418f3f8..c512857 100644 --- a/src/board/system76/galp3-c/keymap.c +++ b/src/board/system76/galp3-c/keymap.c @@ -1,3 +1,5 @@ +#include + #include uint16_t __code KEYMAP[KM_OUT][KM_IN][KM_LAY] = { @@ -276,5 +278,9 @@ uint16_t keymap_translate(uint16_t key) { case K_LEFT: return (K_E0 | 0x4B); case K_DOWN: return (K_E0 | 0x50); case K_RIGHT: return (K_E0 | 0x4D); + + default: + printf("keymap_translate: unknown %02X\n", key); + return 0; } } diff --git a/src/board/system76/galp3-c/main.c b/src/board/system76/galp3-c/main.c index ddc4077..3382b3c 100644 --- a/src/board/system76/galp3-c/main.c +++ b/src/board/system76/galp3-c/main.c @@ -272,9 +272,9 @@ void power_button() { last = new; } -void touchpad_event(struct Ps2 * ps2) { - //TODO -} +// void touchpad_event(struct Ps2 * ps2) { +// //TODO +// } struct Gpio __code LED_SSD_N = GPIO(G, 6); struct Gpio __code LED_AIRPLANE_N = GPIO(G, 6); @@ -317,7 +317,7 @@ void main(void) { ac_adapter(); power_button(); kbscan_event(); - touchpad_event(&PS2_3); + //TODO: touchpad_event(&PS2_3); kbc_event(&KBC); pmc_event(&PMC_1); } diff --git a/src/board/system76/galp3-c/stdio.c b/src/board/system76/galp3-c/stdio.c index d2c8365..5a4adf5 100644 --- a/src/board/system76/galp3-c/stdio.c +++ b/src/board/system76/galp3-c/stdio.c @@ -4,7 +4,7 @@ void i2c_write(unsigned char value) { // Write value to 0x76 - TRASLAA = 0x76 << 1; + TRASLAA = 0xEC; // 0x76 << 1 HOCMDA = value; for (;;) {