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

Merge pull request #5227 from pankozacorp/slotket8

Browse Source 
Bring back the Slot 1 to Socket 8 adapter, but block it from use on incompatible machines.
This commit is contained in:
Miran Grča
2025-02-14 09:13:12 +01:00
committed by GitHub
parent 549df9af7f f5d65f2e66
commit c8e7f757e1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/cpu.c
View File

@@ -372,7 +372,7 @@ cpu_is_eligible(const cpu_family_t *cpu_family, int cpu, int machine)
if (packages & CPU_PKG_SOCKET3) if (packages & CPU_PKG_SOCKET3)
packages |= CPU_PKG_SOCKET1; packages |= CPU_PKG_SOCKET1;
else if (packages & CPU_PKG_SLOT1) else if (packages & CPU_PKG_SLOT1)
packages |= CPU_PKG_SOCKET370; packages |= CPU_PKG_SOCKET370 | CPU_PKG_SOCKET8;
/* Package type. */ /* Package type. */
if (!(cpu_family->package & packages)) if (!(cpu_family->package & packages))

4
src/machine/machine_table.c
View File

@@ -15278,7 +15278,7 @@ const machine_t machines[] = {
.gpio_acpi_handler = NULL, .gpio_acpi_handler = NULL,
.cpu = { .cpu = {
.package = CPU_PKG_SLOT1, .package = CPU_PKG_SLOT1,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK(CPU_PENTIUMPRO),
.min_bus = 66666667, .min_bus = 66666667,
.max_bus = 150000000, .max_bus = 150000000,
.min_voltage = 1300, .min_voltage = 1300,
@@ -16163,7 +16163,7 @@ const machine_t machines[] = {
.gpio_acpi_handler = NULL, .gpio_acpi_handler = NULL,
.cpu = { .cpu = {
.package = CPU_PKG_SLOT1, .package = CPU_PKG_SLOT1,
.block = CPU_BLOCK(CPU_PENTIUM2, CPU_CYRIX3S), .block = CPU_BLOCK(CPU_PENTIUMPRO, CPU_PENTIUM2, CPU_CYRIX3S),
.min_bus = 0, .min_bus = 0,
.max_bus = 66666667, .max_bus = 66666667,
.min_voltage = 0, .min_voltage = 0,