mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 18:08: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-12-20 22:10:04 -05:00
parent 602360603d 6a2cfbe929
commit 96014fb8fd
28 changed files with 598 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/machine/m_xt.c
View File

@@ -20,6 +20,8 @@
#include <86box/chipset.h>
#include <86box/port_6x.h>
extern const device_t vendex_xt_rtc_onboard_device;
static void
machine_xt_common_init(const machine_t *model)
{
@@ -483,6 +485,7 @@ machine_xt_vendex_init(const machine_t *model)
return ret;
machine_xt_clone_init(model);
device_add(&vendex_xt_rtc_onboard_device);
return ret;
}

10
src/machine/machine_table.c
View File

@@ -832,14 +832,14 @@ const machine_t machines[] = {
.min_voltage = 0,
.max_voltage = 0,
.min_multi = 0,
.max_multi = 0,
.max_multi = 0
},
.bus_flags = MACHINE_PC,
.flags = MACHINE_FLAGS_NONE,
.ram = {
.min = 128,
.max = 640,
.step = 64,
.step = 64
},
.nvrmask = 0,
.kbc = KBC_IBM_PC_XT,
@@ -1231,7 +1231,7 @@ const machine_t machines[] = {
.max_multi = 0
},
.bus_flags = MACHINE_PC,
MACHINE_FLAGS_NONE,
.flags = MACHINE_FLAGS_NONE,
.ram = {
.min = 256,
.max = 640,
@@ -9585,7 +9585,7 @@ const machine_t machines[] = {
.min_voltage = 2800,
.max_voltage = 3520,
.min_multi = 1.5,
.max_multi = 5.5,
.max_multi = 5.5
},
.bus_flags = MACHINE_PS2_PCI,
.flags = MACHINE_IDE_DUAL,
@@ -11903,7 +11903,7 @@ const machine_t machines[] = {
.min_voltage = 1300,
.max_voltage = 3500,
.min_multi = MACHINE_MULTIPLIER_FIXED,
.max_multi = MACHINE_MULTIPLIER_FIXED,
.max_multi = MACHINE_MULTIPLIER_FIXED
},
.bus_flags = MACHINE_PS2_A97,
.flags = MACHINE_IDE_DUAL | MACHINE_AG,