Merge pull request #523 from nerd73/master

CPU table revamp
2020-01-12 18:48:42 +01:00
parent baa20d2ff2 dc7164e146
commit 8e566a1ad7
8 changed files with 716 additions and 477 deletions
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -273,9 +273,6 @@ cpu_set(void)
        cpu_16bitbus = (cpu_s->cpu_type == CPU_286 || cpu_s->cpu_type == CPU_386SX || cpu_s->cpu_type == CPU_486SLC || cpu_s->cpu_type == CPU_IBM386SLC || cpu_s->cpu_type == CPU_IBM486SLC );

        if (cpu_s->multi) {
-		if (cpu_s->pci_speed)
-			cpu_busspeed = cpu_s->pci_speed;
-		else
 			cpu_busspeed = cpu_s->rspeed / cpu_s->multi;
 	}
        cpu_multi = cpu_s->multi;