mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-26 05:53:15 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'upstream/master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-01-22 16:53:31 -05:00
parent 62c5b61082 b875e8518d
commit 596a434c20
30 changed files with 133 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/machine/m_at_socket7.c
View File

@@ -57,7 +57,11 @@ machine_at_acerv35n_init(const machine_t *model)
if (bios_only || !ret)
return ret;
machine_at_common_init(model);
machine_at_common_init_ex(model, 2);
/* Yes, it's called amstrad_mega_pc_nvr_device, but it's basically the
standard AT NVR, just initialized to 0x00's (perhaps that should be the
default behavior?). */
device_add(&amstrad_megapc_nvr_device);
pci_init(PCI_CONFIG_TYPE_1);
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);

2
src/machine/machine_table.c
View File

@@ -10853,7 +10853,7 @@ const machine_t machines[] = {
.min_multi = 3.0,
.max_multi = 8.0
},
.bus_flags = MACHINE_PS2_PCI,
.bus_flags = MACHINE_PS2_AGP,
.flags = MACHINE_IDE_DUAL,
.ram = {
.min = 8192,