80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Add ES1373 to machines that were missing it

Browse Source
This commit is contained in:
RichardG867
2024-06-10 19:36:47 -03:00
parent e9ef0e470d
commit ba4a1daf91
4 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/machine/m_at_slot1.c
View File

@@ -530,8 +530,8 @@ machine_at_s1846_init(const machine_t *model)
spd_register(SPD_TYPE_SDRAM, 0x7, 256);
if (sound_card_current[0] == SOUND_INTERNAL) {
device_add(&es1371_onboard_device);
device_add(&cs4297_device); /* found on other Tyan boards around the same time */
device_add(machine_get_snd_device(machine));
device_add(&ct1297_device); /* no good pictures, but the marking looks like CT1297 from a distance */
}
return ret;
@@ -675,7 +675,7 @@ machine_at_gt694va_init(const machine_t *model)
hwm_values.temperatures[2] = 0; /* unused */
if (sound_card_current[0] == SOUND_INTERNAL) {
device_add(&es1371_onboard_device);
device_add(machine_get_snd_device(machine));
device_add(&cs4297_device); /* assumed */
}
@@ -739,7 +739,7 @@ machine_at_ms6168_common_init(const machine_t *model)
spd_register(SPD_TYPE_SDRAM, 0x3, 256);
if (sound_card_current[0] == SOUND_INTERNAL) {
device_add(&es1371_onboard_device);
device_add(machine_get_snd_device(machine));
device_add(&cs4297_device);
}
}
@@ -823,19 +823,21 @@ machine_at_p6f99_init(const machine_t *model)
pci_init(PCI_CONFIG_TYPE_1 | FLAG_TRC_CONTROLS_CPURST);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x01, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x0C, PCI_CARD_SOUND, 2, 3, 4, 1);
pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 4, 1, 2, 3);
pci_register_slot(0x0D, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x0F, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x0C, PCI_CARD_SOUND, 2, 3, 4, 1);
pci_register_slot(0x02, PCI_CARD_AGPBRIDGE, 0, 0, 0, 0);
device_add(&sis_5600_device);
device_add(&keyboard_ps2_ami_pci_device);
device_add(&it8661f_device);
device_add(&winbond_flash_w29c020_device);
if (sound_card_current[0] == SOUND_INTERNAL)
device_add(&es1371_onboard_device);
if (sound_card_current[0] == SOUND_INTERNAL) {
device_add(machine_get_snd_device(machine));
device_add(&ct1297_device);
}
return ret;
}

4
src/machine/m_at_socket370.c
View File

@@ -105,8 +105,8 @@ machine_at_s1857_init(const machine_t *model)
spd_register(SPD_TYPE_SDRAM, 0x7, 256);
if (sound_card_current[0] == SOUND_INTERNAL) {
device_add(&es1371_onboard_device);
device_add(&cs4297_device); /* found on other Tyan boards around the same time */
device_add(machine_get_snd_device(machine));
device_add(&cs4297_device); /* no good pictures, but the marking looks like CS4297 from a distance */
}
return ret;

5
src/machine/m_at_sockets7.c
View File

@@ -135,6 +135,11 @@ machine_at_gwlucas_init(const machine_t *model)
device_add(&sst_flash_39sf020_device);
spd_register(SPD_TYPE_SDRAM, 0x7, 512);
if (sound_card_current[0] == SOUND_INTERNAL) {
device_add(machine_get_snd_device(machine));
device_add(&cs4297_device);
}
return ret;
}

18
src/machine/machine_table.c
View File

@@ -12886,7 +12886,7 @@ const machine_t machines[] = {
.max_multi = 5.5
},
.bus_flags = MACHINE_PS2_PCIONLY | MACHINE_BUS_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Has internal video: ATI 3D Rage Pro Turbo AGP and sound: Ensoniq ES1373*/
.flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Has internal video: ATI 3D Rage Pro Turbo AGP and sound: Ensoniq ES1373 */
.ram = {
.min = 8192,
.max = 262144,
@@ -12901,7 +12901,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = NULL,
.snd_device = &es1373_onboard_device,
.net_device = NULL
},
/* Has the ALi M1543C southbridge with on-chip KBC. */
@@ -14288,7 +14288,7 @@ const machine_t machines[] = {
.max_multi = 8.0
},
.bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal sound: Ensoniq ES1373 */
.flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal sound: Ensoniq ES1371 */
.ram = {
.min = 8192,
.max = 1048576,
@@ -14387,7 +14387,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &voodoo_3_2000_agp_onboard_8m_device,
.snd_device = NULL,
.snd_device = &es1373_onboard_device,
.net_device = NULL
},
/* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
@@ -14428,7 +14428,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = &voodoo_3_2000_agp_onboard_8m_device,
.snd_device = NULL,
.snd_device = &es1373_onboard_device,
.net_device = NULL
},
@@ -14637,7 +14637,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = &es1371_onboard_device,
.snd_device = &es1373_onboard_device,
.net_device = NULL
},
@@ -14679,7 +14679,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = &es1371_onboard_device, /* ES1373 but we currently don't emulate that. */
.snd_device = &es1373_onboard_device,
.net_device = NULL
},
/* Has the SiS (5)600 chipset with on-chip KBC. */
@@ -14792,7 +14792,7 @@ const machine_t machines[] = {
.max_multi = 8.0
},
.bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
.ram = {
.min = 8192,
.max = 786432,
@@ -14807,7 +14807,7 @@ const machine_t machines[] = {
.fdc_device = NULL,
.sio_device = NULL,
.vid_device = NULL,
.snd_device = &es1371_onboard_device,
.snd_device = &es1373_onboard_device,
.net_device = NULL
},
/* VIA Apollo Pro */