Move the Compaq Deskpro 386 to the Dev branch

CMakeLists.txt

@@ -141,6 +141,7 @@ option(QT           "Qt GUI"
 #                      ------         -----------                                   ----    ---------       ---------
 cmake_dependent_option(AMD_K5         "AMD K5"                                      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)
 cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"                                 ON      "DEV_BRANCH"    OFF)
 cmake_dependent_option(ISAMEM_IAB     "Intel Above Board"                           ON      "DEV_BRANCH"    OFF)

src/include/86box/machine.h

@@ -514,7 +514,9 @@ extern int	machine_at_cmdpc_init(const machine_t *);
 extern int	machine_at_portableii_init(const machine_t *);
 extern int	machine_at_portableiii_init(const machine_t *);
 extern int	machine_at_portableiii386_init(const machine_t *);
+#if defined(DEV_BRANCH) && defined(USE_DESKPRO386)
 extern int	machine_at_deskpro386_init(const machine_t *);
+#endif
 #ifdef EMU_DEVICE_H
 extern const device_t 	*at_cpqiii_get_device(void);
 #endif

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(DESKPRO386)
+    target_compile_definitions(mch PRIVATE USE_DESKPRO386)
+endif()
+
 if(LASERXT)
     target_sources(mch PRIVATE m_xt_laserxt.c)
     target_compile_definitions(mch PRIVATE USE_LASERXT)

src/machine/m_at_compaq.c

@@ -893,6 +893,7 @@ machine_at_portableiii386_init(const machine_t *model)
     return ret;
 }
 
+#if defined(DEV_BRANCH) && defined(USE_DESKPRO386)
 int
 machine_at_deskpro386_init(const machine_t *model)
 {
@@ -908,3 +909,4 @@ machine_at_deskpro386_init(const machine_t *model)
 
     return ret;
 }
+#endif

src/machine/machine_table.c

@@ -384,7 +384,9 @@ const machine_t machines[] = {
     /* Has IBM AT KBC firmware. */
     { "[C&T 386] Samsung SPC-6000A",                   "spc6000a",         MACHINE_TYPE_386DX,      MACHINE_CHIPSET_CT_386,              machine_at_spc6000a_init,         0, 0, MACHINE_AVAILABLE, 0 , CPU_PKG_386DX,                                   CPU_BLOCK_NONE, 0, 0, 0, 0, 0, 0, MACHINE_AT, MACHINE_IDE, 1024, 32768, 1024, 127, NULL, NULL },
     /* Uses Compaq KBC firmware. */
+#if defined(DEV_BRANCH) && defined(USE_DESKPRO386)
     { "[ISA] Compaq Deskpro 386",                      "deskpro386",       MACHINE_TYPE_386DX,      MACHINE_CHIPSET_DISCRETE,            machine_at_deskpro386_init,       0, 0, MACHINE_AVAILABLE, 0 , CPU_PKG_386DX,                                   CPU_BLOCK_NONE, 0, 0, 0, 0, 0, 0, MACHINE_AT, MACHINE_IDE, 1024, 14336, 1024, 127, NULL, NULL },
+#endif
     { "[ISA] Compaq Portable III (386)",               "portableiii386",   MACHINE_TYPE_386DX,      MACHINE_CHIPSET_DISCRETE,            machine_at_portableiii386_init,   0, 0, MACHINE_AVAILABLE, 0 , CPU_PKG_386DX,                                   CPU_BLOCK_NONE, 0, 0, 0, 0, 0, 0, MACHINE_AT, MACHINE_IDE | MACHINE_VIDEO, 1024, 14336, 1024, 127, at_cpqiii_get_device },
     /* Has IBM AT KBC firmware. */
     { "[ISA] Micronics 09-00021",                      "micronics386",     MACHINE_TYPE_386DX,      MACHINE_CHIPSET_DISCRETE,            machine_at_micronics386_init,     0, 0, MACHINE_AVAILABLE, 0 , CPU_PKG_386DX,                                   CPU_BLOCK_NONE, 0, 0, 0, 0, 0, 0, MACHINE_AT, MACHINE_FLAGS_NONE, 512,  8192,  128, 127, NULL, NULL },

src/win/Makefile.mingw

@@ -40,6 +40,9 @@ ifeq ($(DEV_BUILD), y)
  ifndef CYRIX_6X86
   CYRIX_6X86	:= y
  endif
+ ifndef DESKPRO386
+  DESKPRO386	:= y
+ endif
  ifndef GUSMAX
   GUSMAX	:= y
  endif
@@ -101,6 +104,9 @@ else
  ifndef CYRIX_6X86
   CYRIX_6X86	:= n
  endif
+ ifndef DESKPRO386
+  DESKPRO386	:= n
+ endif
  ifndef GUSMAX
   GUSMAX	:= n
  endif
@@ -431,6 +437,10 @@ ifeq ($(CYRIX_6X86), y)
 OPTS		+= -DUSE_CYRIX_6X86
 endif
 
+ifeq ($(DESKPRO386), y)
+OPTS		+= -DUSE_DESKPRO386
+endif
+
 ifeq ($(GUSMAX), y)
 OPTS		+= -DUSE_GUSMAX
 endif