Some PC5086-related fixes - fixes hard disk and mouse initialization, fixes #5882.
This commit is contained in:
@@ -366,7 +366,7 @@ mouse_upc_init(const device_t *info)
|
||||
{
|
||||
void *dev = NULL;
|
||||
|
||||
if (info->local)
|
||||
if (info->local == 1)
|
||||
dev = mouse_upc_init_common(1, device_get_config_int("irq"));
|
||||
else
|
||||
dev = mouse_upc_init_common(0, info->local);
|
||||
|
||||
@@ -1024,7 +1024,6 @@ xta_init_common(const device_t *info, int type)
|
||||
dev->sw = 0xff; /* all switches off */
|
||||
dev->type = type;
|
||||
|
||||
|
||||
/* Do per-controller-type setup. */
|
||||
switch (dev->type) {
|
||||
case 0: /* WDXT-150, with BIOS */
|
||||
@@ -1447,7 +1446,6 @@ const device_t xta_st50x_device = {
|
||||
.config = st50x_config
|
||||
};
|
||||
|
||||
|
||||
const device_t xta_st50x_pc5086_device = {
|
||||
.name = "ST-50X Fixed Disk Controller (PC5086)",
|
||||
.internal_name = "xta_st50x_pc5086",
|
||||
|
||||
@@ -134,7 +134,6 @@ ide_handler(upc_t *dev)
|
||||
|
||||
if (dev->regs[0x0c] & 0x80) {
|
||||
if (dev->regs[0x0c] & 0x40) {
|
||||
/* TODO: See what IDE mode the Amstrad PC5086 uses. */
|
||||
if (dev->xta && (dev->hdc_xta != NULL))
|
||||
xta_handler(dev->hdc_xta, 1);
|
||||
} else {
|
||||
@@ -383,6 +382,8 @@ f82c710_pc5086_init(const device_t *info)
|
||||
|
||||
dev->xta = 1;
|
||||
|
||||
f82c710_reset(dev);
|
||||
|
||||
return dev;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user