claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix errors with P6-based machines in the machine table

Browse Source
This commit is contained in:
rushieda
2024-10-20 14:26:07 +03:00
parent b6581dab8b
commit e2676641c3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/machine/machine_table.c
View File

@@ -13545,7 +13545,7 @@ const machine_t machines[] = {
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
.ram = { .ram = {
.min = 8192, .min = 8192,
.max = 524288, .max = 786432,
.step = 8192 .step = 8192
}, },
.nvrmask = 511, .nvrmask = 511,
@@ -13625,7 +13625,7 @@ const machine_t machines[] = {
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB, .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_USB,
.ram = { .ram = {
.min = 8192, .min = 8192,
.max = 1048576, .max = 524288,
.step = 8192 .step = 8192
}, },
.nvrmask = 127, .nvrmask = 127,
@@ -13747,7 +13747,7 @@ const machine_t machines[] = {
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_SOUND | MACHINE_VIDEO | MACHINE_USB, /* Machine has internal video: S3 ViRGE/DX and sound: Crystal CS4236B */ .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_SOUND | MACHINE_VIDEO | MACHINE_USB, /* Machine has internal video: S3 ViRGE/DX and sound: Crystal CS4236B */
.ram = { .ram = {
.min = 8192, .min = 8192,
.max = 131072, .max = 524288,
.step = 8192 .step = 8192
}, },
.nvrmask = 127, .nvrmask = 127,
@@ -14069,7 +14069,7 @@ const machine_t machines[] = {
.package = CPU_PKG_SLOT1, .package = CPU_PKG_SLOT1,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK_NONE,
.min_bus = 60000000, .min_bus = 60000000,
.max_bus = 100000000, .max_bus = 83333333,
.min_voltage = 1500, .min_voltage = 1500,
.max_voltage = 3500, .max_voltage = 3500,
.min_multi = 2.0, .min_multi = 2.0,
@@ -14448,11 +14448,11 @@ const machine_t machines[] = {
.min_multi = 1.5, .min_multi = 1.5,
.max_multi = 8.0 .max_multi = 8.0
}, },
.bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB, .bus_flags = MACHINE_PS2_PCI | MACHINE_BUS_USB,
.flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal video: Matrox MGA-G200 and sound: Crystal CS4820 */ .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_ACPI | MACHINE_GAMEPORT | MACHINE_USB, /* Machine has internal video: Matrox MGA-G200 and sound: Crystal CS4820 */
.ram = { .ram = {
.min = 8192, .min = 8192,
.max = 1048576, .max = 524288,
.step = 8192 .step = 8192
}, },
.nvrmask = 255, .nvrmask = 255,
@@ -14533,7 +14533,7 @@ const machine_t machines[] = {
.flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal sound: Ensoniq ES1371 */ .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, /* Machine has internal sound: Ensoniq ES1371 */
.ram = { .ram = {
.min = 8192, .min = 8192,
.max = 1048576, .max = 786432,
.step = 8192 .step = 8192
}, },
.nvrmask = 255, .nvrmask = 255,
@@ -14648,7 +14648,7 @@ const machine_t machines[] = {
.package = CPU_PKG_SLOT1, .package = CPU_PKG_SLOT1,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK_NONE,
.min_bus = 66666667, .min_bus = 66666667,
.max_bus = 66666667, .max_bus = 100000000,
.min_voltage = 1800, .min_voltage = 1800,
.max_voltage = 3500, .max_voltage = 3500,
.min_multi = 1.5, .min_multi = 1.5,
@@ -15079,7 +15079,7 @@ const machine_t machines[] = {
.flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB, .flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
.ram = { .ram = {
.min = 8192, .min = 8192,
.max = 786432, .max = 1572864,
.step = 8192 .step = 8192
}, },
.nvrmask = 255, .nvrmask = 255,
@@ -15113,7 +15113,7 @@ const machine_t machines[] = {
.package = CPU_PKG_SLOT2, .package = CPU_PKG_SLOT2,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK_NONE,
.min_bus = 100000000, .min_bus = 100000000,
.max_bus = 133333333, .max_bus = 100000000,
.min_voltage = 1800, .min_voltage = 1800,
.max_voltage = 3500, .max_voltage = 3500,
.min_multi = 1.5, .min_multi = 1.5,