mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-03-03 19:28:22 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into ich2-up

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-07-25 19:16:21 -04:00
parent d52a86dae9 f2e00a5a30
commit c7172b49aa
95 changed files with 17929 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/machine/machine_table.c
View File

@@ -4723,7 +4723,7 @@ const machine_t machines[] = {
.max_multi = 0
},
.bus_flags = MACHINE_PS2,
.flags = MACHINE_IDE_DUAL | MACHINE_VIDEO,
.flags = MACHINE_IDE_DUAL, /* No MACHINE_VIDEO yet, because on-board video is not yet implemented. */
.ram = {
.min = 1024,
.max = 32768,
@@ -4758,7 +4758,7 @@ const machine_t machines[] = {
.max_multi = 0
},
.bus_flags = MACHINE_PS2,
.flags = MACHINE_IDE_DUAL | MACHINE_VIDEO,
.flags = MACHINE_IDE_DUAL,
.ram = {
.min = 1024,
.max = 32768,