Merge remote-tracking branch 'origin/master' into ls120

src/include/86box/machine.h

@@ -705,6 +705,7 @@ extern int             machine_at_d824_init(const machine_t *);
 
 /* VLSI 82C486 */
 extern int             machine_at_pcs44c_init(const machine_t *);
+extern int             machine_at_sensation1_init(const machine_t *);
 extern int             machine_at_tuliptc38_init(const machine_t *);
 
 /* ZyMOS Poach */
@@ -739,6 +740,9 @@ extern int             machine_at_valuepoint433_init(const machine_t *);
 extern int             machine_at_monsoon_init(const machine_t *);
 extern int             machine_at_martin_init(const machine_t *);
 
+/* VLSI 82C486 */
+extern int             machine_at_sensation2_init(const machine_t *);
+
 /* m_at_socket3.c */
 /* ALi M1429G */
 extern int             machine_at_atc1762_init(const machine_t *);

src/include/86box/sound.h

@@ -250,6 +250,9 @@ extern const device_t pssj_1e0_device;
 /* Tandy PSG */
 extern const device_t tndy_device;
 
+/* Tandy Sensation */
+extern const device_t sensationaud_device;
+
 /* Windows Sound System */
 extern const device_t wss_device;
 extern const device_t ncr_business_audio_device;

src/machine/m_at_socket1.c

@@ -375,6 +375,35 @@ machine_at_pcs44c_init(const machine_t *model)
     return ret;
 }
 
+int
+machine_at_sensation1_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/sensation1/P1033PCD_01.10.01_11-11-92_E687_Sensation_1_BIOS.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+
+    device_add(&vl82c486_device);
+    device_add(&vl82c113_device);
+
+    device_add(&pssj_1e0_device);
+
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_nsc_dp8473_device);
+
+    /* TODO: Add onboard WD90C31 once it's implemented */
+
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        machine_snd = device_add(machine_get_snd_device(machine));
+
+    return ret;
+}
+
 int
 machine_at_tuliptc38_init(const machine_t *model)
 {

src/machine/m_at_socket2.c

@@ -419,3 +419,28 @@ machine_at_martin_init(const machine_t *model)
 
     return ret;
 }
+
+/* VLSI 82C486 */
+int
+machine_at_sensation2_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/sensation2/TANDY_SENSATION_2_011004_10051993.BIN",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_ide_init(model);
+
+    device_add(&vl82c486_device);
+    device_add(&vl82c113_device);
+
+    device_add_params(&fdc37c6xx_device, (void *) (FDC37C651 | FDC37C6XX_IDE_PRI));
+
+    if (gfxcard[0] == VID_INTERNAL)
+        device_add(machine_get_vid_device(machine));
+
+    return ret;
+}

src/machine/machine_table.c

@@ -7872,6 +7872,50 @@ const machine_t machines[] = {
         .net_device               = NULL
     },
     /* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
+    {
+        .name              = "[VLSI 82C486] Tandy Sensation! (25-1650)",
+        .internal_name     = "sensation1",
+        .type              = MACHINE_TYPE_486,
+        .chipset           = MACHINE_CHIPSET_VLSI_VL82C486,
+        .init              = machine_at_sensation1_init,
+        .p1_handler        = machine_generic_p1_handler,
+        .gpio_handler      = NULL,
+        .available_flag    = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu               = {
+            .package     = CPU_PKG_SOCKET1,
+            .block       = CPU_BLOCK_NONE,
+            .min_bus     = 0,
+            .max_bus     = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi   = 0,
+            .max_multi   = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags     = MACHINE_IDE | MACHINE_SOUND | MACHINE_GAMEPORT | MACHINE_APM,
+        .ram       = {
+            .min  = 2048,
+            .max  = 32768,
+            .step = 2048
+        },
+        .nvrmask                  = 127,
+        .jumpered_ecp_dma         = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device               = NULL,
+        .kbc_params               = 0x00000000,
+        .kbc_p1                   = 0x000004f0,
+        .gpio                     = 0xffffffff,
+        .gpio_acpi                = 0xffffffff,
+        .device                   = NULL,
+        .kbd_device               = NULL,
+        .fdc_device               = NULL,
+        .sio_device               = NULL,
+        .vid_device               = NULL,
+        .snd_device               = &sensationaud_device,
+        .net_device               = NULL
+    },
+    /* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
     {
         .name              = "[VLSI 82C486] Tulip 486 DC/DT",
         .internal_name     = "tuliptc38",
@@ -8624,6 +8668,50 @@ const machine_t machines[] = {
         .snd_device               = NULL,
         .net_device               = NULL
     },
+    /* Has a VLSI VL82C113A SCAMP Combination I/O which holds the KBC. */
+    {
+        .name              = "[VLSI 82C486] Tandy Sensation! II (25-1651)/3100/MMPC",
+        .internal_name     = "sensation2",
+        .type              = MACHINE_TYPE_486_S2,
+        .chipset           = MACHINE_CHIPSET_VLSI_VL82C486,
+        .init              = machine_at_sensation2_init,
+        .p1_handler        = machine_generic_p1_handler,
+        .gpio_handler      = NULL,
+        .available_flag    = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu               = {
+            .package     = CPU_PKG_SOCKET3,
+            .block       = CPU_BLOCK_NONE,
+            .min_bus     = 0,
+            .max_bus     = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi   = 0,
+            .max_multi   = 0
+        },
+        .bus_flags = MACHINE_PS2,
+        .flags     = MACHINE_IDE | MACHINE_VIDEO | MACHINE_APM,
+        .ram       = {
+            .min  = 2048,
+            .max  = 65536,
+            .step = 2048
+        },
+        .nvrmask                  = 127,
+        .jumpered_ecp_dma         = 0,
+        .default_jumpered_ecp_dma = -1,
+        .kbc_device               = NULL,
+        .kbc_params               = 0x00000000,
+        .kbc_p1                   = 0x000004f0,
+        .gpio                     = 0xffffffff,
+        .gpio_acpi                = 0xffffffff,
+        .device                   = NULL,
+        .kbd_device               = NULL,
+        .fdc_device               = NULL,
+        .sio_device               = NULL,
+        .vid_device               = &gd5428_vlb_onboard_device,
+        .snd_device               = NULL,
+        .net_device               = NULL
+    },
 
     /* 486 machines - Socket 3 */
     /* 486 machines with just the ISA slot */

src/sio/sio_vl82c113.c

@@ -136,6 +136,8 @@ vl82c113_init(UNUSED(const device_t *info))
 
     if (machines[machine].init == machine_at_martin_init)
         dev->nvr         = device_add(&martin_nvr_device);
+    else if (machines[machine].init == machine_at_sensation1_init || machines[machine].init == machine_at_sensation2_init)
+        dev->nvr         = device_add(&at_nvr_device);
     else
         dev->nvr         = device_add(&amstrad_megapc_nvr_device);
 

src/sound/CMakeLists.txt

@@ -52,6 +52,7 @@ add_library(snd OBJECT
     snd_ym7128.c
     snd_optimc.c
     snd_opl_esfm.c
+    snd_sensation.c
     snd_ymf701.c
     snd_ymf71x.c
     sound_util.c