Repalce the NO_SIO Dev branch option with AN430TX

The only machine under that option, the Intel AN430TX, was actually put there for problems unrelated to Super I/O

CMakeLists.txt

@@ -140,6 +140,7 @@ option(QT           "Qt GUI"
 #                      Option         Description                                   Def.    Condition       Otherwise
 #                      ------         -----------                                   ----    ---------       ---------
 cmake_dependent_option(AMD_K5         "AMD K5"                                      ON      "DEV_BRANCH"    OFF)
+cmake_dependent_option(AN430TX        "Intel AN430TX"                               ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(CYRIX_6X86     "Cyrix 6x86"                                  ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(DESKPRO386     "Compaq Deskpro 386"                          ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(GUSMAX         "Gravis UltraSound MAX"                       ON      "DEV_BRANCH"    OFF)
@@ -148,7 +149,6 @@ cmake_dependent_option(ISAMEM_IAB     "Intel Above Board"
 cmake_dependent_option(ISAMEM_BRAT    "BocaRAM/AT"                                  ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(LASERXT        "VTech Laser XT"                              ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(MGA            "Matrox Mystique graphics adapters"           ON      "DEV_BRANCH"    OFF)
-cmake_dependent_option(NO_SIO         "Machines without emulated Super I/O chips"   ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(OLIVETTI       "Olivetti M290"                               ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(OPEN_AT        "OpenAT"                                      ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(PAS16          "Pro Audio Spectrum 16"                       ON      "DEV_BRANCH"    OFF)

src/include/86box/machine.h

@@ -622,7 +622,7 @@ extern int	machine_at_i430vx_init(const machine_t *);
 
 extern int	machine_at_nupro592_init(const machine_t *);
 extern int	machine_at_tx97_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(NO_SIO)
+#if defined(DEV_BRANCH) && defined(USE_AN430TX)
 extern int	machine_at_an430tx_init(const machine_t *);
 #endif
 extern int	machine_at_ym430tx_init(const machine_t *);

src/machine/CMakeLists.txt

@@ -24,6 +24,10 @@ add_library(mch OBJECT machine.c machine_table.c m_xt.c m_xt_compaq.c
     m_at_sockets7.c m_at_socket8.c m_at_slot1.c m_at_slot2.c m_at_socket370.c
     m_at_misc.c)
 
+if(AN430TX)
+    target_compile_definitions(mch PRIVATE USE_AN430TX)
+endif()
+
 if(DESKPRO386)
     target_compile_definitions(mch PRIVATE USE_DESKPRO386)
 endif()
@@ -33,10 +37,6 @@ if(LASERXT)
     target_compile_definitions(mch PRIVATE USE_LASERXT)
 endif()
 
-if(NO_SIO)
-    target_compile_definitions(mch PRIVATE NO_SIO)
-endif()
-
 if(OPEN_AT)
     target_compile_definitions(mch PRIVATE USE_OPEN_AT)
 endif()

src/machine/m_at_socket7.c

@@ -689,7 +689,7 @@ machine_at_tx97_init(const machine_t *model)
 }
 
 
-#if defined(DEV_BRANCH) && defined(NO_SIO)
+#if defined(DEV_BRANCH) && defined(USE_AN430TX)
 int
 machine_at_an430tx_init(const machine_t *model)
 {

src/machine/machine_table.c

@@ -775,7 +775,7 @@ const machine_t machines[] = {
     { "[i430TX] ADLink NuPRO-592",                     "nupro592",         MACHINE_TYPE_SOCKET7,    MACHINE_CHIPSET_INTEL_430TX,         machine_at_nupro592_init,         0, 0, MACHINE_AVAILABLE, 0 , CPU_PKG_SOCKET5_7,                 CPU_BLOCK_NONE, 66666667, 66666667, 1900, 2800, 1.5, 5.5, MACHINE_PS2_PCI, MACHINE_IDE_DUAL, 8192, 262144, 8192, 255, NULL, NULL },
     /* This has the AMIKey KBC firmware, which is an updated 'F' type (YM430TX is based on the TX97). */
     { "[i430TX] ASUS TX97",                            "tx97",             MACHINE_TYPE_SOCKET7,    MACHINE_CHIPSET_INTEL_430TX,         machine_at_tx97_init,             0, 0, MACHINE_AVAILABLE, 0 , CPU_PKG_SOCKET5_7,                 CPU_BLOCK_NONE, 50000000, 75000000, 2500, 3520, 1.5, 3.0, MACHINE_PS2_PCI, MACHINE_IDE_DUAL, 8192, 262144, 8192, 255, NULL, NULL },
-#if defined(DEV_BRANCH) && defined(NO_SIO)
+#if defined(DEV_BRANCH) && defined(USE_AN430TX)
     /* This has the Phoenix MultiKey KBC firmware. */
     { "[i430TX] Intel AN430TX",                        "an430tx",          MACHINE_TYPE_SOCKET7,    MACHINE_CHIPSET_INTEL_430TX,         machine_at_an430tx_init,          0, 0, MACHINE_AVAILABLE, 0 , CPU_PKG_SOCKET5_7,                 CPU_BLOCK_NONE, 60000000, 66666667, 2800, 3520, 1.5, 3.0, MACHINE_PS2_PCI, MACHINE_IDE_DUAL, 8192, 262144, 8192, 255, NULL, NULL },
 #endif

src/win/Makefile.mingw

@@ -37,6 +37,9 @@ ifeq ($(DEV_BUILD), y)
  ifndef AMD_K5
   AMD_K5	:= y
  endif
+ ifndef AN430TX
+  AN430TX	:= y
+ endif
  ifndef CYRIX_6X86
   CYRIX_6X86	:= y
  endif
@@ -61,9 +64,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef MGA
   MGA		:= y
  endif
- ifndef NO_SIO
-  NO_SIO	:= y
- endif
  ifndef OPEN_AT
   OPEN_AT	:= y
  endif
@@ -101,6 +101,9 @@ else
  ifndef AMD_K5
   AMD_K5	:= n
  endif
+ ifndef AN430TX
+  AN430TX	:= n
+ endif
  ifndef CYRIX_6X86
   CYRIX_6X86	:= n
  endif
@@ -125,9 +128,6 @@ else
  ifndef MGA
   MGA		:= n
  endif
- ifndef NO_SIO
-  NO_SIO	:= n
- endif
  ifndef OPEN_AT
   OPEN_AT	:= n
  endif
@@ -433,6 +433,10 @@ ifeq ($(AMD_K5), y)
 OPTS		+= -DUSE_AMD_K5
 endif
 
+ifeq ($(AN430TX), y)
+OPTS		+= -DUSE_AN430TX
+endif
+
 ifeq ($(CYRIX_6X86), y)
 OPTS		+= -DUSE_CYRIX_6X86
 endif
@@ -467,10 +471,6 @@ OPTS		+= -DUSE_MGA
 DEVBROBJ	+= vid_mga.o
 endif
 
-ifeq ($(NO_SIO), y)
-OPTS		+= -DNO_SIO
-endif
-
 ifeq ($(OPEN_AT), y)
 OPTS		+= -DUSE_OPEN_AT
 endif