claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed arrow keys on the Tandy machines... this time for real.

Browse Source
This commit is contained in:
OBattler
2021-03-17 02:39:13 +01:00
parent 9ef090fcc6
commit f3dfd74655
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/device/keyboard_xt.c
View File

@@ -456,11 +456,6 @@ kbd_adddata_process(uint16_t val, void (*adddata)(uint16_t val))
if (!adddata) if (!adddata)
return; return;
if (is_tandy) {
adddata(val);
return;
}
keyboard_get_states(NULL, &num_lock, NULL); keyboard_get_states(NULL, &num_lock, NULL);
shift_states = keyboard_get_shift() & STATE_LSHIFT; shift_states = keyboard_get_shift() & STATE_LSHIFT;

8
src/machine/m_tandy.c
View File

@@ -615,7 +615,6 @@ vid_write(uint32_t addr, uint8_t val, void *priv)
if (vid->memctrl == -1) return; if (vid->memctrl == -1) return;
egawrites++;
if (dev->is_sl2) { if (dev->is_sl2) {
if (vid->array[5] & 1) if (vid->array[5] & 1)
vid->b8000[addr & 0xffff] = val; vid->b8000[addr & 0xffff] = val;
@@ -637,7 +636,6 @@ vid_read(uint32_t addr, void *priv)
if (vid->memctrl == -1) return(0xff); if (vid->memctrl == -1) return(0xff);
egareads++;
if (dev->is_sl2) { if (dev->is_sl2) {
if (vid->array[5] & 1) if (vid->array[5] & 1)
return(vid->b8000[addr & 0xffff]); return(vid->b8000[addr & 0xffff]);
@@ -1302,7 +1300,8 @@ eep_init(const device_t *info)
if (fread(eep->store, 1, 128, f) != 128) if (fread(eep->store, 1, 128, f) != 128)
fatal("eep_init(): Error reading Tandy EEPROM\n"); fatal("eep_init(): Error reading Tandy EEPROM\n");
(void)fclose(f); (void)fclose(f);
} } else
memset(eep->store, 0x00, 128);
io_sethandler(0x037c, 1, NULL,NULL,NULL, eep_write,NULL,NULL, eep); io_sethandler(0x037c, 1, NULL,NULL,NULL, eep_write,NULL,NULL, eep);
@@ -1500,13 +1499,13 @@ machine_tandy1k_init(const machine_t *model, int type)
mem_mapping_set_addr(&ram_low_mapping, 0, dev->base); mem_mapping_set_addr(&ram_low_mapping, 0, dev->base);
device_add(&keyboard_tandy_device); device_add(&keyboard_tandy_device);
keyboard_set_table(scancode_tandy);
if (fdc_type == FDC_INTERNAL) if (fdc_type == FDC_INTERNAL)
device_add(&fdc_xt_device); device_add(&fdc_xt_device);
switch(type) { switch(type) {
case TYPE_TANDY: case TYPE_TANDY:
keyboard_set_table(scancode_tandy);
io_sethandler(0x00a0, 1, io_sethandler(0x00a0, 1,
tandy_read,NULL,NULL,tandy_write,NULL,NULL,dev); tandy_read,NULL,NULL,tandy_write,NULL,NULL,dev);
vid_init(dev); vid_init(dev);
@@ -1515,6 +1514,7 @@ machine_tandy1k_init(const machine_t *model, int type)
break; break;
case TYPE_TANDY1000HX: case TYPE_TANDY1000HX:
keyboard_set_table(scancode_tandy);
io_sethandler(0x00a0, 1, io_sethandler(0x00a0, 1,
tandy_read,NULL,NULL,tandy_write,NULL,NULL,dev); tandy_read,NULL,NULL,tandy_write,NULL,NULL,dev);
vid_init(dev); vid_init(dev);