From d0d73b7ef549a965f417875ed8abf940d1717350 Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Sat, 17 Apr 2021 16:46:04 -0300
Subject: [PATCH] Revert "The IBM PCjr is now limited to 8088 4.77 MHz, closes
 #1379."

This reverts commit d060a38d912aa520dc6da3f33059c9cd99f7b3b1.

# Conflicts:
#	src/machine/machine_table.c
---
 src/cpu/cpu.h               | 45 ++++++++++++++++++-------------------
 src/cpu/cpu_table.c         |  9 --------
 src/machine/machine_table.c |  2 +-
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 96942e9e5..177712fa7 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -84,29 +84,28 @@ enum {
 
 enum {
     CPU_PKG_8088 = (1 << 0),
-    CPU_PKG_8088_PCJR = (1 << 1),
-    CPU_PKG_8088_EUROPC = (1 << 2),
-    CPU_PKG_8086 = (1 << 3),
-    CPU_PKG_286 = (1 << 4),
-    CPU_PKG_386SX = (1 << 5),
-    CPU_PKG_386DX = (1 << 6),
-    CPU_PKG_M6117 = (1 << 7),
-    CPU_PKG_386SLC_IBM = (1 << 8),
-    CPU_PKG_486SLC = (1 << 9),
-    CPU_PKG_486SLC_IBM = (1 << 10),
-    CPU_PKG_486BL = (1 << 11),
-    CPU_PKG_486DLC = (1 << 12),
-    CPU_PKG_SOCKET1 = (1 << 13),
-    CPU_PKG_SOCKET3 = (1 << 14),
-    CPU_PKG_SOCKET3_PC330 = (1 << 15),
-    CPU_PKG_STPC = (1 << 16),
-    CPU_PKG_SOCKET4 = (1 << 17),
-    CPU_PKG_SOCKET5_7 = (1 << 18),
-    CPU_PKG_SOCKET8 = (1 << 19),
-    CPU_PKG_SLOT1 = (1 << 20),
-    CPU_PKG_SLOT2 = (1 << 21),
-    CPU_PKG_SOCKET370 = (1 << 22),
-    CPU_PKG_EBGA368 = (1 << 23)
+    CPU_PKG_8088_EUROPC = (1 << 1),
+    CPU_PKG_8086 = (1 << 2),
+    CPU_PKG_286 = (1 << 3),
+    CPU_PKG_386SX = (1 << 4),
+    CPU_PKG_386DX = (1 << 5),
+    CPU_PKG_M6117 = (1 << 6),
+    CPU_PKG_386SLC_IBM = (1 << 7),
+    CPU_PKG_486SLC = (1 << 8),
+    CPU_PKG_486SLC_IBM = (1 << 9),
+    CPU_PKG_486BL = (1 << 10),
+    CPU_PKG_486DLC = (1 << 11),
+    CPU_PKG_SOCKET1 = (1 << 12),
+    CPU_PKG_SOCKET3 = (1 << 13),
+    CPU_PKG_SOCKET3_PC330 = (1 << 14),
+    CPU_PKG_STPC = (1 << 15),
+    CPU_PKG_SOCKET4 = (1 << 16),
+    CPU_PKG_SOCKET5_7 = (1 << 17),
+    CPU_PKG_SOCKET8 = (1 << 18),
+    CPU_PKG_SLOT1 = (1 << 19),
+    CPU_PKG_SLOT2 = (1 << 20),
+    CPU_PKG_SOCKET370 = (1 << 21),
+    CPU_PKG_EBGA368 = (1 << 22)
 };
 
 
diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c
index 7b14140b5..9f8d94ca4 100644
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -82,15 +82,6 @@ const cpu_family_t cpu_families[] = {
 		{"16",      CPU_8088, fpus_8088, 16000000,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
 		{"", 0}
 	}
-    }, {
-	.package = CPU_PKG_8088_PCJR,
-	.manufacturer = "Intel",
-	.name = "8088",
-	.internal_name = "8088",
-	.cpus = (const CPU[]) {
-		{"4.77",    CPU_8088, fpus_8088,  4772728,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-		{"", 0}
-	}
     }, {
 	.package = CPU_PKG_8088_EUROPC,
 	.manufacturer = "Intel",
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 083d68b7b..c50eade4b 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -59,7 +59,7 @@ const machine_t machines[] = {
     /* 8088 Machines */
     { "[8088] IBM PC (1981)",			"ibmpc",		MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									   16,    64,  16,    0,		      machine_pc_init, NULL			},
     { "[8088] IBM PC (1982)",			"ibmpc82",		MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									  256,   256, 256,    0,		    machine_pc82_init, NULL			},
-    { "[8088] IBM PCjr",			"ibmpcjr",		MACHINE_TYPE_8088,		CPU_PKG_8088_PCJR, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO_FIXED,						  128,   640, 128,    0,		    machine_pcjr_init, pcjr_get_device		},
+    { "[8088] IBM PCjr",			"ibmpcjr",		MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC | MACHINE_VIDEO_FIXED,						  128,   640, 128,    0,		    machine_pcjr_init, pcjr_get_device		},
     { "[8088] IBM XT (1982)",			"ibmxt",		MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									   64,   256,  64,    0,		      machine_xt_init, NULL			},
     { "[8088] IBM XT (1986)",			"ibmxt86",		MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									  256,   640,  64,    0,		    machine_xt86_init, NULL			},
     { "[8088] American XT Computer",		"americxt",		MACHINE_TYPE_8088,		CPU_PKG_8088, 0, 0, 0, 0, 0, 0, 0,										MACHINE_PC,									   64,   640,  64,    0,	     machine_xt_americxt_init, NULL			},