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

Tidy up tandy 1000 SX

Browse Source
This commit is contained in:
Jasmine Iwanek
2024-08-06 16:18:56 -04:00
parent 50c79e1594
commit 834bcd09c1
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/machine.h
View File

@@ -890,7 +890,7 @@ extern int machine_ps2_model_70_type4_init(const machine_t *);
/* m_tandy.c */ /* m_tandy.c */
extern int tandy1k_eeprom_read(void); extern int tandy1k_eeprom_read(void);
extern int machine_tandy_init(const machine_t *); extern int machine_tandy1000sx_init(const machine_t *);
extern int machine_tandy1000hx_init(const machine_t *); extern int machine_tandy1000hx_init(const machine_t *);
extern int machine_tandy1000sl2_init(const machine_t *); extern int machine_tandy1000sl2_init(const machine_t *);

6
src/machine/m_tandy.c
View File

@@ -52,6 +52,7 @@ enum {
enum { enum {
TYPE_TANDY = 0, TYPE_TANDY = 0,
TYPE_TANDY1000SX,
TYPE_TANDY1000HX, TYPE_TANDY1000HX,
TYPE_TANDY1000SL2 TYPE_TANDY1000SL2
}; };
@@ -1756,6 +1757,7 @@ machine_tandy1k_init(const machine_t *model, int type)
switch (type) { switch (type) {
case TYPE_TANDY: case TYPE_TANDY:
case TYPE_TANDY1000SX:
keyboard_set_table(scancode_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);
@@ -1802,7 +1804,7 @@ tandy1k_eeprom_read(void)
} }
int int
machine_tandy_init(const machine_t *model) machine_tandy1000sx_init(const machine_t *model)
{ {
int ret; int ret;
@@ -1812,7 +1814,7 @@ machine_tandy_init(const machine_t *model)
if (bios_only || !ret) if (bios_only || !ret)
return ret; return ret;
machine_tandy1k_init(model, TYPE_TANDY); machine_tandy1k_init(model, TYPE_TANDY1000SX);
return ret; return ret;
} }

2
src/machine/machine_table.c
View File

@@ -1503,7 +1503,7 @@ const machine_t machines[] = {
.internal_name = "tandy", .internal_name = "tandy",
.type = MACHINE_TYPE_8088, .type = MACHINE_TYPE_8088,
.chipset = MACHINE_CHIPSET_PROPRIETARY, .chipset = MACHINE_CHIPSET_PROPRIETARY,
.init = machine_tandy_init, .init = machine_tandy1000sx_init,
.p1_handler = NULL, .p1_handler = NULL,
.gpio_handler = NULL, .gpio_handler = NULL,
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,