diff options
| -rw-r--r-- | hw/ide/cmd646.c | 29 | ||||
| -rw-r--r-- | include/hw/ide/pci.h | 1 |
2 files changed, 14 insertions, 16 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 41c1831f9a..c24f71e219 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -53,23 +53,23 @@ static void cmd646_update_irq(PCIDevice *pd); static uint64_t cmd646_cmd_read(void *opaque, hwaddr addr, unsigned size) { - CMD646BAR *cmd646bar = opaque; + IDEBus *bus = opaque; if (addr != 2 || size != 1) { return ((uint64_t)1 << (size * 8)) - 1; } - return ide_status_read(cmd646bar->bus, addr + 2); + return ide_status_read(bus, addr + 2); } static void cmd646_cmd_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { - CMD646BAR *cmd646bar = opaque; + IDEBus *bus = opaque; if (addr != 2 || size != 1) { return; } - ide_cmd_write(cmd646bar->bus, addr + 2, data); + ide_cmd_write(bus, addr + 2, data); } static const MemoryRegionOps cmd646_cmd_ops = { @@ -81,15 +81,15 @@ static const MemoryRegionOps cmd646_cmd_ops = { static uint64_t cmd646_data_read(void *opaque, hwaddr addr, unsigned size) { - CMD646BAR *cmd646bar = opaque; + IDEBus *bus = opaque; if (size == 1) { - return ide_ioport_read(cmd646bar->bus, addr); + return ide_ioport_read(bus, addr); } else if (addr == 0) { if (size == 2) { - return ide_data_readw(cmd646bar->bus, addr); + return ide_data_readw(bus, addr); } else { - return ide_data_readl(cmd646bar->bus, addr); + return ide_data_readl(bus, addr); } } return ((uint64_t)1 << (size * 8)) - 1; @@ -98,15 +98,15 @@ static uint64_t cmd646_data_read(void *opaque, hwaddr addr, static void cmd646_data_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) { - CMD646BAR *cmd646bar = opaque; + IDEBus *bus = opaque; if (size == 1) { - ide_ioport_write(cmd646bar->bus, addr, data); + ide_ioport_write(bus, addr, data); } else if (addr == 0) { if (size == 2) { - ide_data_writew(cmd646bar->bus, addr, data); + ide_data_writew(bus, addr, data); } else { - ide_data_writel(cmd646bar->bus, addr, data); + ide_data_writel(bus, addr, data); } } } @@ -122,10 +122,9 @@ static void setup_cmd646_bar(PCIIDEState *d, int bus_num) IDEBus *bus = &d->bus[bus_num]; CMD646BAR *bar = &d->cmd646_bar[bus_num]; - bar->bus = bus; - memory_region_init_io(&bar->cmd, OBJECT(d), &cmd646_cmd_ops, bar, + memory_region_init_io(&bar->cmd, OBJECT(d), &cmd646_cmd_ops, bus, "cmd646-cmd", 4); - memory_region_init_io(&bar->data, OBJECT(d), &cmd646_data_ops, bar, + memory_region_init_io(&bar->data, OBJECT(d), &cmd646_data_ops, bus, "cmd646-data", 8); } diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index ed723acfb4..013d7937d2 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -40,7 +40,6 @@ typedef struct BMDMAState { typedef struct CMD646BAR { MemoryRegion cmd; MemoryRegion data; - IDEBus *bus; } CMD646BAR; #define TYPE_PCI_IDE "pci-ide" |