openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ide: Convert to isa_register_portio_list 

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Richard Henderson 2011-08-16 08:59:00 -07:00 committed by Avi Kivity
parent f75317b420
commit 4a91d3b337
5 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/ide/core.c
View File

@ -25,6 +25,7 @@
#include <hw/hw.h> #include <hw/hw.h>
#include <hw/pc.h> #include <hw/pc.h>
#include <hw/pci.h> #include <hw/pci.h>
#include <hw/isa.h>
#include "qemu-error.h" #include "qemu-error.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "sysemu.h" #include "sysemu.h"
@ -1969,20 +1970,27 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,
bus->dma = &ide_dma_nop; bus->dma = &ide_dma_nop;
} }
void ide_init_ioport(IDEBus *bus, int iobase, int iobase2) static const MemoryRegionPortio ide_portio_list[] = {
{ { 0, 8, 1, .read = ide_ioport_read, .write = ide_ioport_write },
register_ioport_write(iobase, 8, 1, ide_ioport_write, bus); { 0, 2, 2, .read = ide_data_readw, .write = ide_data_writew },
register_ioport_read(iobase, 8, 1, ide_ioport_read, bus); { 0, 4, 4, .read = ide_data_readl, .write = ide_data_writel },
if (iobase2) { PORTIO_END_OF_LIST(),
register_ioport_read(iobase2, 1, 1, ide_status_read, bus); };
register_ioport_write(iobase2, 1, 1, ide_cmd_write, bus);
}
/* data ports */ static const MemoryRegionPortio ide_portio2_list[] = {
register_ioport_write(iobase, 2, 2, ide_data_writew, bus); { 0, 1, 1, .read = ide_status_read, .write = ide_cmd_write },
register_ioport_read(iobase, 2, 2, ide_data_readw, bus); PORTIO_END_OF_LIST(),
register_ioport_write(iobase, 4, 4, ide_data_writel, bus); };
register_ioport_read(iobase, 4, 4, ide_data_readl, bus);
void ide_init_ioport(IDEBus *bus, ISADevice *dev, int iobase, int iobase2)
{
/* ??? Assume only ISA and PCI configurations, and that the PCI-ISA
bridge has been setup properly to always register with ISA. */
isa_register_portio_list(dev, iobase, ide_portio_list, bus, "ide");
if (iobase2) {
isa_register_portio_list(dev, iobase2, ide_portio2_list, bus, "ide");
}
} }
static bool is_identify_set(void *opaque, int version_id) static bool is_identify_set(void *opaque, int version_id)

3
hw/ide/internal.h
View File

@ -7,6 +7,7 @@
* non-internal declarations are in hw/ide.h * non-internal declarations are in hw/ide.h
*/ */
#include <hw/ide.h> #include <hw/ide.h>
#include <hw/isa.h>
#include "iorange.h" #include "iorange.h"
#include "dma.h" #include "dma.h"
#include "sysemu.h" #include "sysemu.h"
@ -600,7 +601,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind,
void ide_init2(IDEBus *bus, qemu_irq irq); void ide_init2(IDEBus *bus, qemu_irq irq);
void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,
DriveInfo *hd1, qemu_irq irq); DriveInfo *hd1, qemu_irq irq);
void ide_init_ioport(IDEBus *bus, int iobase, int iobase2); void ide_init_ioport(IDEBus *bus, ISADevice *isa, int iobase, int iobase2);
void ide_exec_cmd(IDEBus *bus, uint32_t val); void ide_exec_cmd(IDEBus *bus, uint32_t val);
void ide_dma_cb(void *opaque, int ret); void ide_dma_cb(void *opaque, int ret);

4
hw/ide/isa.c
View File

@ -66,10 +66,8 @@ static int isa_ide_initfn(ISADevice *dev)
ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev); ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev);
ide_bus_new(&s->bus, &s->dev.qdev, 0); ide_bus_new(&s->bus, &s->dev.qdev, 0);
ide_init_ioport(&s->bus, s->iobase, s->iobase2); ide_init_ioport(&s->bus, dev, s->iobase, s->iobase2);
isa_init_irq(dev, &s->irq, s->isairq); isa_init_irq(dev, &s->irq, s->isairq);
isa_init_ioport_range(dev, s->iobase, 8);
isa_init_ioport(dev, s->iobase2);
ide_init2(&s->bus, s->irq); ide_init2(&s->bus, s->irq);
vmstate_register(&dev->qdev, 0, &vmstate_ide_isa, s); vmstate_register(&dev->qdev, 0, &vmstate_ide_isa, s);
return 0; return 0;

7
hw/ide/piix.c
View File

@ -122,8 +122,7 @@ static void piix3_reset(void *opaque)
} }
static void pci_piix_init_ports(PCIIDEState *d) { static void pci_piix_init_ports(PCIIDEState *d) {
int i; static const struct {
struct {
int iobase; int iobase;
int iobase2; int iobase2;
int isairq; int isairq;
@ -131,10 +130,12 @@ static void pci_piix_init_ports(PCIIDEState *d) {
{0x1f0, 0x3f6, 14}, {0x1f0, 0x3f6, 14},
{0x170, 0x376, 15}, {0x170, 0x376, 15},
}; };
int i;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
ide_bus_new(&d->bus[i], &d->dev.qdev, i); ide_bus_new(&d->bus[i], &d->dev.qdev, i);
ide_init_ioport(&d->bus[i], port_info[i].iobase, port_info[i].iobase2); ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase,
port_info[i].iobase2);
ide_init2(&d->bus[i], isa_get_irq(port_info[i].isairq)); ide_init2(&d->bus[i], isa_get_irq(port_info[i].isairq));
bmdma_init(&d->bus[i], &d->bmdma[i], d); bmdma_init(&d->bus[i], &d->bmdma[i], d);

7
hw/ide/via.c
View File

@ -146,8 +146,7 @@ static void via_reset(void *opaque)
} }
static void vt82c686b_init_ports(PCIIDEState *d) { static void vt82c686b_init_ports(PCIIDEState *d) {
int i; static const struct {
struct {
int iobase; int iobase;
int iobase2; int iobase2;
int isairq; int isairq;
@ -155,10 +154,12 @@ static void vt82c686b_init_ports(PCIIDEState *d) {
{0x1f0, 0x3f6, 14}, {0x1f0, 0x3f6, 14},
{0x170, 0x376, 15}, {0x170, 0x376, 15},
}; };
int i;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
ide_bus_new(&d->bus[i], &d->dev.qdev, i); ide_bus_new(&d->bus[i], &d->dev.qdev, i);
ide_init_ioport(&d->bus[i], port_info[i].iobase, port_info[i].iobase2); ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase,
port_info[i].iobase2);
ide_init2(&d->bus[i], isa_get_irq(port_info[i].isairq)); ide_init2(&d->bus[i], isa_get_irq(port_info[i].isairq));
bmdma_init(&d->bus[i], &d->bmdma[i], d); bmdma_init(&d->bus[i], &d->bmdma[i], d);