X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fprotocol%2Fibmpc.c;h=0e3998aae6a846e5e512e078f70ecb609436cdd2;hb=0cf9dfc888755e18a88f71f40863e3dc035ab91a;hp=374e7fa4b7341e2308aa827607526aeec240dcba;hpb=4588ae8dacea53384827351f4460ffe62f111ea0;p=max%2Ftmk_keyboard.git diff --git a/tmk_core/protocol/ibmpc.c b/tmk_core/protocol/ibmpc.c index 374e7fa4..0e3998aa 100644 --- a/tmk_core/protocol/ibmpc.c +++ b/tmk_core/protocol/ibmpc.c @@ -56,7 +56,8 @@ POSSIBILITY OF SUCH DAMAGE. } while (0) -volatile uint8_t ibmpc_protocol = IBMPC_PROTOCOL_AT; +volatile uint16_t ibmpc_isr_debug = 0; +volatile uint8_t ibmpc_protocol = IBMPC_PROTOCOL_NO; volatile uint8_t ibmpc_error = IBMPC_ERR_NONE; /* 2-byte buffer for data received from keyhboard @@ -68,7 +69,8 @@ volatile uint8_t ibmpc_error = IBMPC_ERR_NONE; */ static volatile uint16_t recv_data = 0xFFFF; /* internal state of receiving data */ -static volatile uint16_t isr_data = 0x8000; +static volatile uint16_t isr_state = 0x8000; +static uint8_t timer_start = 0; void ibmpc_host_init(void) { @@ -96,8 +98,6 @@ int16_t ibmpc_host_send(uint8_t data) bool parity = true; ibmpc_error = IBMPC_ERR_NONE; - if (ibmpc_protocol == IBMPC_PROTOCOL_XT) return -1; - dprintf("w%02X ", data); IBMPC_INT_OFF(); @@ -175,8 +175,8 @@ int16_t ibmpc_host_recv(void) } } + if ((data | 0x00FF) != 0xFFFF) dprintf("b%04X ", data); if (ret != 0xFF) dprintf("r%02X ", ret); - if (recv_data != 0xFFFF) dprintf("b%04X ", recv_data); return ((ret != 0xFF) ? ret : -1); } @@ -194,7 +194,7 @@ int16_t ibmpc_host_recv_response(void) void ibmpc_host_isr_clear(void) { - isr_data = 0x8000; + isr_state = 0x8000; recv_data = 0xFFFF; } @@ -205,68 +205,107 @@ ISR(IBMPC_INT_VECT) { uint8_t dbit; dbit = IBMPC_DATA_PIN&(1<>1; - if (dbit) isr_data |= 0x8000; - - // isr_data: state of receiving data from keyboard - // 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 - // ----------------------------------------------------- - // Initial: *1 0 0 0 0 0 0 0 | 0 0 0 0 0 0 0 0 MSB sentinel - // XT IBM: b7 b6 b5 b4 b3 b2 b1 b0 | s1 s0 *1 0 0 0 0 0 after receiving ** - // XT Clone: b7 b6 b5 b4 b3 b2 b1 b0 | s1 *1 0 0 0 0 0 0 after receiving - // AT: st pr b7 b6 b5 b4 b3 b2 | b1 b0 s0 *1 0 0 0 0 after receiving - // AT**: pr b7 b6 b5 b4 b3 b2 b1 | b0 s0 *1 0 0 0 0 0 before stop bit ** + + // Timeout check + uint8_t t; + // use only the least byte of millisecond timer + asm("lds %0, %1" : "=r" (t) : "p" (&timer_count)); + //t = (uint8_t)timer_count; // compiler uses four registers instead of one + if (isr_state == 0x8000) { + timer_start = t; + } else { + // should not take more than 1ms + if (timer_start != t && (uint8_t)(timer_start + 1) != t) { + ibmpc_error = IBMPC_ERR_TIMEOUT; + //goto ERROR; + // timeout error recovery by clearing isr_state? + timer_start = t; + isr_state = 0x8000; + } + } + + isr_state = isr_state>>1; + if (dbit) isr_state |= 0x8000; + + // isr_state: state of receiving data from keyboard + // + // This should be initialized with 0x8000 before receiving data and + // the MSB '*1' works as marker to discrimitate between protocols. + // It stores sampled bit at MSB after right shift on each clock falling edge. // - // x x x x x x x x | 0 0 0 0 0 0 0 0 midway(0-7 bits received) - // x x x x x x x x | 1 0 0 0 0 0 0 0 midway(8 bits received) - // x x x x x x x x | 0 1 0 0 0 0 0 0 XT IBM-midway or AT-midway - // x x x x x x x x | 1 1 0 0 0 0 0 0 XT Clone-done - // x x x x x x x x | 0 0 1 0 0 0 0 0 AT-midway - // x x x x x x x x | 1 0 1 0 0 0 0 0 XT IBM-done or AT-midway ** - // x x x x x x x x | x 1 1 0 0 0 0 0 illegal - // x x x x x x x x | x x 0 1 0 0 0 0 AT-done - // x x x x x x x x | x x 1 1 0 0 0 0 illegal - // other states than avobe illegal + // XT protocol has two variants of signaling; XT_IBM and XT_Clone. + // XT_IBM uses two start bits 0 and 1 while XT_Clone uses just start bit 1. + // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-XT-Keyboard-Protocol // - // **: AT can take same as end sate of XT IBM(1010 000) when b0 is 1, - // to discriminate between them we will have to wait a while for stop bit. + // 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 + // ----------------------------------------------------- + // *1 0 0 0 0 0 0 0 | 0 0 0 0 0 0 0 0 Initial state(0x8000) // - // mask for isr_data: - // 0x00A0(1010 0000) when XT IBM - // 0x00C0(1100 0000) when XT Clone - // 0x0010(xx01 0000) when AT + // x x x x x x x x | 0 0 0 0 0 0 0 0 midway(0-7 bits received) + // x x x x x x x x | *1 0 0 0 0 0 0 0 midway(8 bits received) + // b6 b5 b4 b3 b2 b1 b0 1 | 0 *1 0 0 0 0 0 0 XT_IBM-midway ^1 + // b7 b6 b5 b4 b3 b2 b1 b0 | 0 *1 0 0 0 0 0 0 AT-midway ^1 + // b7 b6 b5 b4 b3 b2 b1 b0 | 1 *1 0 0 0 0 0 0 XT_Clone-done ^3 + // b6 b5 b4 b3 b2 b1 b0 1 | 1 *1 0 0 0 0 0 0 XT_IBM-error ^3 + // pr b7 b6 b5 b4 b3 b2 b1 | 0 0 *1 0 0 0 0 0 AT-midway[b0=0] + // b7 b6 b5 b4 b3 b2 b1 b0 | 1 0 *1 0 0 0 0 0 XT_IBM-done ^2 + // pr b7 b6 b5 b4 b3 b2 b1 | 1 0 *1 0 0 0 0 0 AT-midway[b0=1] ^2 + // b7 b6 b5 b4 b3 b2 b1 b0 | 1 1 *1 0 0 0 0 0 XT_IBM-error-done + // x x x x x x x x | x 1 1 0 0 0 0 0 illegal + // st pr b7 b6 b5 b4 b3 b2 | b1 b0 0 *1 0 0 0 0 AT-done + // x x x x x x x x | x x 1 *1 0 0 0 0 illegal + // all other states than above illegal // - switch (isr_data & 0xFF) { + // ^1: AT and XT_IBM takes same state. + // ^2: AT and XT_IBM takes same state in case that AT b0 is 1, + // we have to check AT stop bit to discriminate between the two protocol. + switch (isr_state & 0xFF) { case 0b00000000: case 0b10000000: - case 0b01000000: + case 0b01000000: // ^1 case 0b00100000: // midway - return; + goto NEXT; break; - case 0b11000000: - // XT Clone-done - recv_data = recv_data<<8; - recv_data |= (isr_data>>8) & 0xFF; + case 0b11000000: // ^3 + { + uint8_t us = 100; + // wait for rising and falling edge of b7 of XT_IBM + while (!(IBMPC_CLOCK_PIN&(1<>8; + ibmpc_protocol = IBMPC_PROTOCOL_XT_CLONE; + goto DONE; + } + } + break; + case 0b11100000: + // XT_IBM-error-done + ibmpc_isr_debug = isr_state; + isr_state = isr_state>>8; + ibmpc_protocol = IBMPC_PROTOCOL_XT_ERROR; goto DONE; break; - case 0b10100000: + case 0b10100000: // ^2 { uint8_t us = 100; - // wait for rising and falling edge of AT stop bit + // wait for rising and falling edge of AT stop bit to discriminate between XT and AT while (!(IBMPC_CLOCK_PIN&(1<>8) & 0xFF; + // no stop bit: XT_IBM-done + isr_state = isr_state>>8; + ibmpc_protocol = IBMPC_PROTOCOL_XT_IBM; goto DONE; } } @@ -276,31 +315,51 @@ PINB|=0x01; case 0b01010000: case 0b11010000: // AT-done - recv_data = recv_data<<8; - recv_data |= (isr_data>>6) & 0xFF; + // DO NOT check stop bit. Zenith Z-150(AT) asserts stop bit as low for no reason. + // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#zenith-z-150-beige + // TODO: parity check? + isr_state = isr_state>>6; + ibmpc_protocol = IBMPC_PROTOCOL_AT; goto DONE; break; case 0b01100000: - case 0b11100000: case 0b00110000: case 0b10110000: case 0b01110000: case 0b11110000: default: // xxxx_oooo(any 1 in low nibble) - recv_data = isr_data; + // Illegal + ibmpc_isr_debug = isr_state; + ibmpc_error = IBMPC_ERR_ILLEGAL; + goto ERROR; break; } + +ERROR: + ibmpc_isr_debug = isr_state; + isr_state = 0x8000; + recv_data = 0xFF00; // clear data and scancode of error 0x00 + return; DONE: - // TODO: check protocol change to support keyboard howswap - // not correct if there is clock edge within short time like 100us after receving data - // TODO: process error code: 0x00(AT), 0xFF(XT) in particular - isr_data = 0x8000; // clear to next data + if ((isr_state & 0x00FF) == 0x00FF) { + // receive error code 0xFF + ibmpc_error = IBMPC_ERR_FF; + } + if ((recv_data & 0xFF00) != 0xFF00) { + // buffer full and overwritten + ibmpc_error = IBMPC_ERR_FULL; + } + recv_data = recv_data<<8; + recv_data |= isr_state & 0xFF; + isr_state = 0x8000; // clear to next data +NEXT: return; } /* send LED state to keyboard */ void ibmpc_host_set_led(uint8_t led) { - ibmpc_host_send(0xED); - ibmpc_host_send(led); + if (0xFA == ibmpc_host_send(0xED)) { + ibmpc_host_send(led); + } }