Merge from trunk
This commit is contained in:
commit
50e7de5214
282 changed files with 51494 additions and 22451 deletions
|
|
@ -34,6 +34,8 @@ struct
|
|||
|
||||
uint8_t pa;
|
||||
uint8_t pb;
|
||||
|
||||
pc_timer_t send_delay_timer;
|
||||
} keyboard_pcjr;
|
||||
|
||||
static uint8_t key_queue[16];
|
||||
|
|
@ -41,8 +43,7 @@ static int key_queue_start = 0, key_queue_end = 0;
|
|||
|
||||
void keyboard_pcjr_poll()
|
||||
{
|
||||
keybsenddelay += (220 * TIMER_USEC);
|
||||
|
||||
timer_advance_u64(&keyboard_pcjr.send_delay_timer, (220 * TIMER_USEC));
|
||||
|
||||
if (key_queue_start != key_queue_end && !keyboard_pcjr.serial_pos && !keyboard_pcjr.latched)
|
||||
{
|
||||
|
|
@ -129,7 +130,6 @@ void keyboard_pcjr_write(uint16_t port, uint8_t val, void *priv)
|
|||
keyboard_pcjr.pb = val;
|
||||
|
||||
timer_process();
|
||||
timer_update_outstanding();
|
||||
|
||||
cassette_set_motor((val & 8) ? 0 : 1);
|
||||
|
||||
|
|
@ -214,5 +214,5 @@ void keyboard_pcjr_init()
|
|||
keyboard_send = keyboard_pcjr_adddata;
|
||||
keyboard_poll = keyboard_pcjr_poll;
|
||||
|
||||
timer_add(keyboard_pcjr_poll, &keybsenddelay, TIMER_ALWAYS_ENABLED, NULL);
|
||||
timer_add(&keyboard_pcjr.send_delay_timer, keyboard_pcjr_poll, NULL, 1);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue