mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-03-02 10:48:24 -07:00
Code Issues Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-01-27 16:07:17 -05:00
parent d0463ea3af 57a08c6ef8
commit c859a2c10a
14 changed files with 190 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/machine_table.c
View File

@@ -5820,7 +5820,7 @@ const machine_t machines[] = {
.min_multi = 0,
.max_multi = 0
},
.bus_flags = MACHINE_VLB,
.bus_flags = MACHINE_PS2_VLB,
.flags = MACHINE_IDE,
.ram = {
.min = 1024,
@@ -7718,7 +7718,7 @@ const machine_t machines[] = {
.flags = MACHINE_IDE_DUAL,
.ram = {
.min = 2048,
.max = 131072,
.max = 262144,
.step = 2048
},
.nvrmask = 127,