sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow system to power off, enable logging, change kbc logging from debug to trace

Browse Source
This commit is contained in:
Jeremy Soller
2019-11-23 20:02:52 -07:00
parent 0426c066b6
commit bcd480ec85
4 changed files with 120 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/board/system76/galp3-c/kbc.c
View File

@ -30,7 +30,7 @@ bool kbc_scancode(struct Kbc * kbc, uint16_t key, bool pressed) {
if (!key) return true;
switch (key & 0xFF00) {
case K_E0:
DEBUG(" E0\n");
TRACE(" E0\n");
if (!kbc_keyboard(kbc, 0xE0, KBC_TIMEOUT)) return false;
key &= 0xFF;
// Fall through
@ -39,11 +39,11 @@ bool kbc_scancode(struct Kbc * kbc, uint16_t key, bool pressed) {
if (kbc_translate) {
key |= 0x80;
} else {
DEBUG(" F0\n");
TRACE(" F0\n");
if (!kbc_keyboard(kbc, 0xF0, KBC_TIMEOUT)) return false;
}
}
DEBUG(" %02X\n", key);
TRACE(" %02X\n", key);
if (!kbc_keyboard(kbc, (uint8_t)key, KBC_TIMEOUT)) return false;
break;
}
@ -69,12 +69,12 @@ void kbc_event(struct Kbc * kbc) {
if (sts & KBC_STS_IBF) {
uint8_t data = kbc_read(kbc);
if (sts & KBC_STS_CMD) {
DEBUG("kbc cmd: %02X\n", data);
TRACE("kbc cmd: %02X\n", data);
state = KBC_STATE_NORMAL;
switch (data) {
case 0x20:
DEBUG(" read configuration byte\n");
TRACE(" read configuration byte\n");
uint8_t config = *kbc->control & 0x03;
if (kbc_system) {
config |= (1 << 2);
@ -91,81 +91,81 @@ void kbc_event(struct Kbc * kbc) {
kbc_keyboard(kbc, config, KBC_TIMEOUT);
break;
case 0x60:
DEBUG(" write configuration byte\n");
TRACE(" write configuration byte\n");
state = KBC_STATE_WRITE_CONFIG;
break;
case 0xA7:
DEBUG(" disable second port\n");
TRACE(" disable second port\n");
kbc_second = false;
break;
case 0xA8:
DEBUG(" enable second port\n");
TRACE(" enable second port\n");
kbc_second = true;
break;
case 0xA9:
DEBUG(" test second port\n");
TRACE(" test second port\n");
// TODO: communicate with touchpad?
kbc_keyboard(kbc, 0x00, KBC_TIMEOUT);
break;
case 0xAA:
DEBUG(" test controller\n");
TRACE(" test controller\n");
// Why not pass the test?
kbc_keyboard(kbc, 0x55, KBC_TIMEOUT);
break;
case 0xAB:
DEBUG(" test first port\n");
TRACE(" test first port\n");
// We _ARE_ the keyboard, so everything is good.
kbc_keyboard(kbc, 0x00, KBC_TIMEOUT);
break;
case 0xAD:
DEBUG(" disable first port\n");
TRACE(" disable first port\n");
kbc_first = false;
break;
case 0xAE:
DEBUG(" enable first port\n");
TRACE(" enable first port\n");
kbc_first = true;
break;
case 0xD1:
DEBUG(" write port byte\n");
TRACE(" write port byte\n");
state = KBC_STATE_WRITE_PORT;
break;
case 0xD2:
DEBUG(" write first port output\n");
TRACE(" write first port output\n");
state = KBC_STATE_FIRST_PORT_OUTPUT;
break;
case 0xD3:
DEBUG(" write second port output\n");
TRACE(" write second port output\n");
state = KBC_STATE_SECOND_PORT_OUTPUT;
break;
case 0xD4:
DEBUG(" write second port input\n");
TRACE(" write second port input\n");
state = KBC_STATE_SECOND_PORT_INPUT;
break;
}
} else {
DEBUG("kbc data: %02X\n", data);
TRACE("kbc data: %02X\n", data);
switch (state) {
case KBC_STATE_NORMAL:
DEBUG(" keyboard command\n");
TRACE(" keyboard command\n");
switch (data) {
case 0xED:
DEBUG(" set leds\n");
TRACE(" set leds\n");
state = KBC_STATE_SET_LEDS;
kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT);
break;
case 0xEE:
DEBUG(" echo\n");
TRACE(" echo\n");
// Hey, this is easy. I like easy commands
kbc_keyboard(kbc, 0xEE, KBC_TIMEOUT);
break;
case 0xF0:
DEBUG(" get/set scancode\n");
TRACE(" get/set scancode\n");
state = KBC_STATE_SCANCODE;
kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT);
break;
case 0xF2:
DEBUG(" identify keyboard\n");
TRACE(" identify keyboard\n");
if (kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT)) {
if (kbc_keyboard(kbc, 0xAB, KBC_TIMEOUT)) {
kbc_keyboard(kbc, 0x83, KBC_TIMEOUT);
@ -173,17 +173,17 @@ void kbc_event(struct Kbc * kbc) {
}
break;
case 0xF4:
DEBUG(" enable scanning\n");
TRACE(" enable scanning\n");
kbscan_enabled = true;
kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT);
break;
case 0xF5:
DEBUG(" disable scanning\n");
TRACE(" disable scanning\n");
kbscan_enabled = false;
kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT);
break;
case 0xFF:
DEBUG(" self test\n");
TRACE(" self test\n");
if (kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT)) {
// Yep, everything is still good, I promise
kbc_keyboard(kbc, 0xAA, KBC_TIMEOUT);
@ -192,7 +192,7 @@ void kbc_event(struct Kbc * kbc) {
}
break;
case KBC_STATE_WRITE_CONFIG:
DEBUG(" write configuration byte\n");
TRACE(" write configuration byte\n");
state = KBC_STATE_NORMAL;
uint8_t control = *kbc->control;
if (data & 1) {
@ -212,38 +212,38 @@ void kbc_event(struct Kbc * kbc) {
*kbc->control = control;
break;
case KBC_STATE_SET_LEDS:
DEBUG(" set leds\n");
TRACE(" set leds\n");
state = KBC_STATE_NORMAL;
kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT);
break;
case KBC_STATE_SCANCODE:
DEBUG(" get/set scancode\n");
TRACE(" get/set scancode\n");
state = KBC_STATE_NORMAL;
#if LEVEL >= LEVEL_DEBUG
#if LEVEL >= LEVEL_TRACE
switch (data) {
case 0x02:
DEBUG(" set scancode set 2\n");
TRACE(" set scancode set 2\n");
break;
}
#endif
kbc_keyboard(kbc, 0xFA, KBC_TIMEOUT);
break;
case KBC_STATE_WRITE_PORT:
DEBUG(" write port byte\n");
TRACE(" write port byte\n");
state = KBC_STATE_NORMAL;
break;
case KBC_STATE_FIRST_PORT_OUTPUT:
DEBUG(" write first port output\n");
TRACE(" write first port output\n");
state = KBC_STATE_NORMAL;
kbc_keyboard(kbc, data, KBC_TIMEOUT);
break;
case KBC_STATE_SECOND_PORT_OUTPUT:
DEBUG(" write second port output\n");
TRACE(" write second port output\n");
state = KBC_STATE_NORMAL;
kbc_mouse(kbc, data, KBC_TIMEOUT);
break;
case KBC_STATE_SECOND_PORT_INPUT:
DEBUG(" write second port input\n");
TRACE(" write second port input\n");
state = KBC_STATE_NORMAL;
ps2_write(&PS2_3, &data, 1);
break;