79 |
|
TwentyFourBitAddressing = true; |
80 |
|
break; |
81 |
|
case ROM_VERSION_II: |
82 |
< |
CPUType = 2; |
82 |
> |
CPUType = PrefsFindInt32("cpu"); |
83 |
> |
if (CPUType < 2) CPUType = 2; |
84 |
> |
if (CPUType > 4) CPUType = 4; |
85 |
|
FPUType = PrefsFindBool("fpu") ? 1 : 0; |
86 |
+ |
if (CPUType == 4) FPUType = 1; // 68040 always with FPU |
87 |
|
TwentyFourBitAddressing = true; |
88 |
|
break; |
89 |
|
case ROM_VERSION_32: |
90 |
< |
CPUType = 3; |
90 |
> |
CPUType = PrefsFindInt32("cpu"); |
91 |
> |
if (CPUType < 2) CPUType = 2; |
92 |
> |
if (CPUType > 4) CPUType = 4; |
93 |
|
FPUType = PrefsFindBool("fpu") ? 1 : 0; |
94 |
+ |
if (CPUType == 4) FPUType = 1; // 68040 always with FPU |
95 |
|
TwentyFourBitAddressing = false; |
96 |
|
break; |
97 |
|
} |