From 834bcd09c15293693b6e418aed3de2f85d84ebe6 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 6 Aug 2024 16:18:56 -0400
Subject: [PATCH] Tidy up tandy 1000 SX

---
 src/include/86box/machine.h | 2 +-
 src/machine/m_tandy.c       | 6 ++++--
 src/machine/machine_table.c | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 42fb9a6d7..8afd5e28f 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -890,7 +890,7 @@ extern int machine_ps2_model_70_type4_init(const machine_t *);
 
 /* m_tandy.c */
 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_tandy1000sl2_init(const machine_t *);
 
diff --git a/src/machine/m_tandy.c b/src/machine/m_tandy.c
index 660710526..c5de74824 100644
--- a/src/machine/m_tandy.c
+++ b/src/machine/m_tandy.c
@@ -52,6 +52,7 @@ enum {
 
 enum {
     TYPE_TANDY = 0,
+    TYPE_TANDY1000SX,
     TYPE_TANDY1000HX,
     TYPE_TANDY1000SL2
 };
@@ -1756,6 +1757,7 @@ machine_tandy1k_init(const machine_t *model, int type)
 
     switch (type) {
         case TYPE_TANDY:
+        case TYPE_TANDY1000SX:
             keyboard_set_table(scancode_tandy);
             io_sethandler(0x00a0, 1,
                           tandy_read, NULL, NULL, tandy_write, NULL, NULL, dev);
@@ -1802,7 +1804,7 @@ tandy1k_eeprom_read(void)
 }
 
 int
-machine_tandy_init(const machine_t *model)
+machine_tandy1000sx_init(const machine_t *model)
 {
     int ret;
 
@@ -1812,7 +1814,7 @@ machine_tandy_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_tandy1k_init(model, TYPE_TANDY);
+    machine_tandy1k_init(model, TYPE_TANDY1000SX);
 
     return ret;
 }
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 460765d70..a9d83f241 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -1503,7 +1503,7 @@ const machine_t machines[] = {
         .internal_name = "tandy",
         .type = MACHINE_TYPE_8088,
         .chipset = MACHINE_CHIPSET_PROPRIETARY,
-        .init = machine_tandy_init,
+        .init = machine_tandy1000sx_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,