max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ibmpc: Add ibmpc_host_clear_isr

Browse source
This commit is contained in:
tmk 2020-01-22 14:52:01 +09:00
parent b2fb5b715c
commit 15ab461f44
2 changed files with 48 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
tmk_core/protocol/ibmpc.c
View file

@ -88,6 +88,7 @@ void ibmpc_host_enable(void)
void ibmpc_host_disable(void) void ibmpc_host_disable(void)
{ {
// TODO: test order? uneeded interrupt happens by making clock lo
inhibit(); inhibit();
IBMPC_INT_OFF(); IBMPC_INT_OFF();
} }
@ -143,6 +144,10 @@ int16_t ibmpc_host_send(uint8_t data)
WAIT(clock_hi, 50, 8); WAIT(clock_hi, 50, 8);
WAIT(data_hi, 50, 9); WAIT(data_hi, 50, 9);
// clear buffer to get response correctly
ringbuf_reset(&rb);
ibmpc_host_isr_clear();
idle(); idle();
IBMPC_INT_ON(); IBMPC_INT_ON();
return ibmpc_host_recv_response(); return ibmpc_host_recv_response();
@ -173,30 +178,41 @@ int16_t ibmpc_host_recv(void)
return data; return data;
} }
/*
* Receive data from keyboard with ISR
*/
static enum {
START,
BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7,
PARITY,
STOP, } isr_state = START;
static uint8_t isr_data = 0;
static uint8_t isr_parity = 1;
static uint16_t isr_time = 0;
void ibmpc_host_isr_clear(void)
{
isr_state = START;
isr_data = 0;
isr_parity = 1;
isr_time = 0;
}
ISR(IBMPC_INT_VECT) ISR(IBMPC_INT_VECT)
{ {
static uint16_t last_time = 0;
static enum {
START,
BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7,
PARITY,
STOP,
} state = START;
static uint8_t data = 0;
static uint8_t parity = 1;
uint8_t dbit = IBMPC_DATA_PIN&(1<<IBMPC_DATA_BIT); uint8_t dbit = IBMPC_DATA_PIN&(1<<IBMPC_DATA_BIT);
// Reset state when taking more than 1ms // Reset state when taking more than 1ms
if (last_time && timer_elapsed(last_time) > 10) { if (isr_time && timer_elapsed(isr_time) > 1) {
ibmpc_error = IBMPC_ERR_TIMEOUT | IBMPC_ERR_RECV | state; ibmpc_error = IBMPC_ERR_TIMEOUT | IBMPC_ERR_RECV | isr_state;
state = START; isr_state = START;
data = 0; isr_data = 0;
parity = 1; isr_parity = 1;
} }
last_time = timer_read(); isr_time = timer_read();
switch (state) { switch (isr_state) {
case START: case START:
if (ibmpc_protocol == IBMPC_PROTOCOL_XT) { if (ibmpc_protocol == IBMPC_PROTOCOL_XT) {
// ignore start(0) bit // ignore start(0) bit
@ -214,13 +230,13 @@ ISR(IBMPC_INT_VECT)
case BIT5: case BIT5:
case BIT6: case BIT6:
case BIT7: case BIT7:
data >>= 1; isr_data >>= 1;
if (dbit) { if (dbit) {
data |= 0x80; isr_data |= 0x80;
parity++; isr_parity++;
} }
if (state == BIT7 && ibmpc_protocol == IBMPC_PROTOCOL_XT) { if (isr_state == BIT7 && ibmpc_protocol == IBMPC_PROTOCOL_XT) {
if (!ringbuf_put(&rb, data)) { if (!ringbuf_put(&rb, isr_data)) {
ibmpc_error = IBMPC_ERR_FULL; ibmpc_error = IBMPC_ERR_FULL;
goto ERROR; goto ERROR;
} }
@ -230,17 +246,17 @@ ISR(IBMPC_INT_VECT)
break; break;
case PARITY: case PARITY:
if (dbit) { if (dbit) {
if (!(parity & 0x01)) if (!(isr_parity & 0x01))
goto ERROR; goto ERROR;
} else { } else {
if (parity & 0x01) if (isr_parity & 0x01)
goto ERROR; goto ERROR;
} }
break; break;
case STOP: case STOP:
if (!dbit) if (!dbit)
goto ERROR; goto ERROR;
if (!ringbuf_put(&rb, data)) { if (!ringbuf_put(&rb, isr_data)) {
ibmpc_error = IBMPC_ERR_FULL; ibmpc_error = IBMPC_ERR_FULL;
goto ERROR; goto ERROR;
} }
@ -253,17 +269,17 @@ ISR(IBMPC_INT_VECT)
goto NEXT; goto NEXT;
ERROR: ERROR:
ibmpc_error |= state; ibmpc_error |= isr_state;
ibmpc_error |= IBMPC_ERR_RECV; ibmpc_error |= IBMPC_ERR_RECV;
ringbuf_reset(&rb); ringbuf_reset(&rb);
DONE: DONE:
last_time = 0; isr_state = START;
state = START; isr_data = 0;
data = 0; isr_parity = 1;
parity = 1; isr_time = 0;
return; return;
NEXT: NEXT:
state++; isr_state++;
return; return;
} }

1
tmk_core/protocol/ibmpc.h
View file

@ -94,6 +94,7 @@ void ibmpc_host_disable(void);
int16_t ibmpc_host_send(uint8_t data); int16_t ibmpc_host_send(uint8_t data);
int16_t ibmpc_host_recv_response(void); int16_t ibmpc_host_recv_response(void);
int16_t ibmpc_host_recv(void); int16_t ibmpc_host_recv(void);
void ibmpc_host_isr_clear(void);
void ibmpc_host_set_led(uint8_t usb_led); void ibmpc_host_set_led(uint8_t usb_led);