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

Merge branch 'master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-07-26 18:58:47 -04:00
parent d1dd3997dc d49afa3429
commit edd13a93db
39 changed files with 416 additions and 171 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, /* No MACHINE_VIDEO yet, because on-board video is not yet implemented. */
.flags = MACHINE_IDE_DUAL | MACHINE_VIDEO,
.ram = {
.min = 1024,
.max = 32768,
@@ -4733,7 +4733,7 @@ const machine_t machines[] = {
.kbc = KBC_UNKNOWN,
.kbc_p1 = 0,
.gpio = 0,
.device = NULL,
.device = &s3_86c805_onboard_vlb_device,
.vid_device = NULL
},
/* Uses an NEC 90M002A (UPD82C42C, 8042 clone) with unknown firmware. */