claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1581 from 86Box/master

Browse Source 
Bring the branch up to par with master.
This commit is contained in:
Miran Grča
2021-08-04 09:15:08 +02:00
committed by GitHub
parent 66da8a9905 ded75f30d9
commit 77a5cf6891
30 changed files with 2075 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/machine/m_at_slot1.c
View File

@@ -38,6 +38,7 @@
#include <86box/machine.h>
#include <86box/sound.h>
#include <86box/clock.h>
#include <86box/snd_ac97.h>
int
machine_at_p65up5_cpknd_init(const machine_t *model)
@@ -468,8 +469,10 @@ machine_at_tsunamiatx_init(const machine_t *model)
device_add(&i440bx_device);
device_add(&piix4e_device);
if (sound_card_current == SOUND_INTERNAL)
device_add(&es1371_onboard_device);
if (sound_card_current == SOUND_INTERNAL) {
device_add(&es1371_onboard_device);
device_add(&cs4297_device); /* found on other Tyan boards around the same time */
}
device_add(&pc87309_device);
device_add(&keyboard_ps2_ami_pci_device);
@@ -649,8 +652,10 @@ machine_at_ms6168_common_init(const machine_t *model)
if (gfxcard == VID_INTERNAL)
device_add(&voodoo_3_2000_agp_onboard_8m_device);
if (sound_card_current == SOUND_INTERNAL)
device_add(&es1371_onboard_device);
if (sound_card_current == SOUND_INTERNAL) {
device_add(&es1371_onboard_device);
device_add(&cs4297_device);
}
}

5
src/machine/m_at_socket370.c
View File

@@ -37,6 +37,7 @@
#include "cpu.h"
#include <86box/machine.h>
#include <86box/clock.h>
#include <86box/snd_ac97.h>
int
@@ -432,7 +433,7 @@ machine_at_6via90ap_init(const machine_t *model)
pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 0, 0);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 1, 2, 3, 4);
pci_register_slot(0x09, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x0A, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x0B, PCI_CARD_NORMAL, 3, 4, 1, 2);
@@ -451,5 +452,7 @@ machine_at_6via90ap_init(const machine_t *model)
hwm_values.temperatures[1] += 2; /* System offset */
hwm_values.temperatures[2] = 0; /* unused */
device_add(&alc100_device); /* ALC100P identified on similar Acorp boards (694TA, 6VIA90A1) */
return ret;
}

4
src/machine/m_at_sockets7.c
View File

@@ -113,7 +113,7 @@ machine_at_ficva503a_init(const machine_t *model)
{
int ret;
ret = bios_load_linear("roms/machines/ficva503a/jo4116.bin",
ret = bios_load_linear("roms/machines/ficva503a/jn4116.bin",
0x000c0000, 262144, 0);
if (bios_only || !ret)
@@ -141,5 +141,7 @@ machine_at_ficva503a_init(const machine_t *model)
hwm_values.temperatures[1] += 2; /* System offset */
hwm_values.temperatures[2] = 0; /* unused */
device_add(&wm9701a_device); /* on daughtercard */
return ret;
}