From 34ed1dc8112dda6af9e430143e5daaf71dc6f979 Mon Sep 17 00:00:00 2001 From: cartifanwlr Date: Tue, 6 Feb 2024 18:30:36 +0300 Subject: [PATCH] WIP Socket 6 implementation, currently Intel only --- src/cpu/cpu.h | 15 ++++++++------- src/cpu/cpu_table.c | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 8e378ebce..dfde094f0 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -104,13 +104,14 @@ enum { CPU_PKG_SOCKET1 = (1 << 15), CPU_PKG_SOCKET3 = (1 << 16), CPU_PKG_SOCKET3_PC330 = (1 << 17), - CPU_PKG_STPC = (1 << 18), - CPU_PKG_SOCKET4 = (1 << 19), - CPU_PKG_SOCKET5_7 = (1 << 20), - CPU_PKG_SOCKET8 = (1 << 21), - CPU_PKG_SLOT1 = (1 << 22), - CPU_PKG_SLOT2 = (1 << 23), - CPU_PKG_SOCKET370 = (1 << 24) + CPU_PKG_SOCKET6 = (1 << 18), + CPU_PKG_STPC = (1 << 19), + CPU_PKG_SOCKET4 = (1 << 20), + CPU_PKG_SOCKET5_7 = (1 << 21), + CPU_PKG_SOCKET8 = (1 << 22), + CPU_PKG_SLOT1 = (1 << 23), + CPU_PKG_SLOT2 = (1 << 24), + CPU_PKG_SOCKET370 = (1 << 25) }; #define CPU_SUPPORTS_DYNAREC 1 diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c index 7a478f6f0..3c158d1a9 100644 --- a/src/cpu/cpu_table.c +++ b/src/cpu/cpu_table.c @@ -1278,7 +1278,7 @@ const cpu_family_t cpu_families[] = { {"", 0} } }, { - .package = CPU_PKG_SOCKET1 | CPU_PKG_SOCKET3_PC330, /*OEM versions are 3.3V, Retail versions are 3.3V with a 5V regulator for installation in older boards. They are functionally identical*/ + .package = CPU_PKG_SOCKET1 | CPU_PKG_SOCKET3_PC330 | CPU_PKG_SOCKET6, /*OEM versions are 3.3V, Retail versions are 3.3V with a 5V regulator for installation in older boards. They are functionally identical*/ .manufacturer = "Intel", .name = "iDX4", .internal_name = "idx4", @@ -1288,7 +1288,7 @@ const cpu_family_t cpu_families[] = { {"", 0} } }, { - .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET3_PC330, + .package = CPU_PKG_SOCKET3 | CPU_PKG_SOCKET3_PC330 | CPU_PKG_SOCKET6, .manufacturer = "Intel", .name = "Pentium OverDrive", .internal_name = "pentium_p24t",