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 remote-tracking branch 'upstream/master' into feature/mtrr

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-10 02:02:32 -05:00
parent 27b11c5c0f d9bfafcc07
commit 5bc0ceeff0
52 changed files with 2255 additions and 1985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/machine/m_xt_olivetti.c
View File

@@ -1137,8 +1137,6 @@ machine_xt_m24_init(const machine_t *model)
m24_kbd_init(m24_kbd);
device_add_ex(&m24_kbd_device, m24_kbd);
device_add(&st506_xt_wd1002a_wx1_nobios_device);
return ret;
}
@@ -1191,6 +1189,9 @@ machine_xt_m240_init(const machine_t *model)
mm58274_init(nvr, model->nvrmask + 1);
if (hdc_current == HDC_INTERNAL)
device_add(&st506_xt_wd1002a_wx1_nobios_device);
return ret;
}

4
src/machine/machine_table.c
View File

@@ -2064,7 +2064,7 @@ const machine_t machines[] = {
.max_multi = 0
},
.bus_flags = MACHINE_PC,
.flags = MACHINE_VIDEO | MACHINE_MOUSE | MACHINE_MFM,
.flags = MACHINE_VIDEO | MACHINE_MOUSE,
.ram = {
.min = 128,
.max = 640,
@@ -2101,7 +2101,7 @@ const machine_t machines[] = {
.max_multi = 0
},
.bus_flags = MACHINE_PC,
.flags = MACHINE_FLAGS_NONE,
.flags = MACHINE_MFM,
.ram = {
.min = 128,
.max = 640,