mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-03-04 03:38:22 -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
2022-08-31 21:24:58 -04:00
parent d44343ed61 194b85b601
commit 7fde10c0da
106 changed files with 58824 additions and 56422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/m_at_socket7.c
View File

@@ -332,8 +332,8 @@ machine_at_5ivg_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(0x11, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x12, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x11, PCI_CARD_NORMAL, 1, 2, 3, 4);
pci_register_slot(0x12, PCI_CARD_NORMAL, 2, 3, 4, 1);
pci_register_slot(0x13, PCI_CARD_NORMAL, 3, 4, 1, 2);
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
device_add(&i430vx_device);

2
src/machine/m_xt_t1000.c
View File

@@ -1041,7 +1041,7 @@ t1000_emsboard_load(void)
if (mem_size > 512) {
f = plat_fopen(nvr_path("t1000_ems.nvr"), "rb");
if (f != NULL) {
fread(&ram[512 * 1024], 1024, (mem_size - 512), f);
(void) !fread(&ram[512 * 1024], 1024, (mem_size - 512), f);
fclose(f);
}
}