Fixed the registers collision between SiS 496/497 and Cyrix registers, which fixes the 4SAW2 on Cyrix CPU's, and removed the block on those CPU's for that machine.
This commit is contained in:
@@ -123,7 +123,7 @@ sis_85c497_isa_read(uint16_t port, void *priv)
|
|||||||
const sis_85c496_t *dev = (sis_85c496_t *) priv;
|
const sis_85c496_t *dev = (sis_85c496_t *) priv;
|
||||||
uint8_t ret = 0xff;
|
uint8_t ret = 0xff;
|
||||||
|
|
||||||
if (port == 0x23)
|
if ((port == 0x23) && (dev->cur_reg < 0xc0))
|
||||||
ret = dev->regs[dev->cur_reg];
|
ret = dev->regs[dev->cur_reg];
|
||||||
else if (port == 0x33)
|
else if (port == 0x33)
|
||||||
ret = 0x3c /*random_generate()*/;
|
ret = 0x3c /*random_generate()*/;
|
||||||
|
|||||||
@@ -7793,7 +7793,7 @@ const machine_t machines[] = {
|
|||||||
.gpio_acpi_handler = NULL,
|
.gpio_acpi_handler = NULL,
|
||||||
.cpu = {
|
.cpu = {
|
||||||
.package = CPU_PKG_SOCKET3,
|
.package = CPU_PKG_SOCKET3,
|
||||||
.block = CPU_BLOCK(CPU_i486SX, CPU_i486DX, CPU_Am486SX, CPU_Am486DX, CPU_Cx486S, CPU_Cx486DX, CPU_Cx5x86),
|
.block = CPU_BLOCK(CPU_i486SX, CPU_i486DX, CPU_Am486SX, CPU_Am486DX),
|
||||||
.min_bus = 0,
|
.min_bus = 0,
|
||||||
.max_bus = 0,
|
.max_bus = 0,
|
||||||
.min_voltage = 0,
|
.min_voltage = 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user