[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/24] fdc: Convert to isa_register_portio_list
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 13/24] fdc: Convert to isa_register_portio_list |
Date: |
Mon, 10 Oct 2011 16:59:42 +0200 |
From: Richard Henderson <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/fdc.c | 34 ++++------------------------------
1 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 0f1cee9..4b06e04 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -424,7 +424,6 @@ struct FDCtrl {
typedef struct FDCtrlISABus {
ISADevice busdev;
- MemoryRegion io_0, io_7;
struct FDCtrl state;
int32_t bootindexA;
int32_t bootindexB;
@@ -1880,32 +1879,10 @@ static int fdctrl_init_common(FDCtrl *fdctrl)
return fdctrl_connect_drives(fdctrl);
}
-static uint32_t fdctrl_read_port_7(void *opaque, uint32_t reg)
-{
- return fdctrl_read(opaque, reg + 7);
-}
-
-static void fdctrl_write_port_7(void *opaque, uint32_t reg, uint32_t value)
-{
- fdctrl_write(opaque, reg + 7, value);
-}
-
-static const MemoryRegionPortio fdc_portio_0[] = {
+static const MemoryRegionPortio fdc_portio_list[] = {
{ 1, 5, 1, .read = fdctrl_read, .write = fdctrl_write },
- PORTIO_END_OF_LIST()
-};
-
-static const MemoryRegionPortio fdc_portio_7[] = {
- { 0, 1, 1, .read = fdctrl_read_port_7, .write = fdctrl_write_port_7 },
- PORTIO_END_OF_LIST()
-};
-
-static const MemoryRegionOps fdc_ioport_0_ops = {
- .old_portio = fdc_portio_0
-};
-
-static const MemoryRegionOps fdc_ioport_7_ops = {
- .old_portio = fdc_portio_7
+ { 7, 1, 1, .read = fdctrl_read, .write = fdctrl_write },
+ PORTIO_END_OF_LIST(),
};
static int isabus_fdc_init1(ISADevice *dev)
@@ -1917,10 +1894,7 @@ static int isabus_fdc_init1(ISADevice *dev)
int dma_chann = 2;
int ret;
- memory_region_init_io(&isa->io_0, &fdc_ioport_0_ops, fdctrl, "fdc", 6);
- memory_region_init_io(&isa->io_7, &fdc_ioport_7_ops, fdctrl, "fdc", 1);
- isa_register_ioport(dev, &isa->io_0, iobase);
- isa_register_ioport(dev, &isa->io_7, iobase + 7);
+ isa_register_portio_list(dev, iobase, fdc_portio_list, fdctrl, "fdc");
isa_init_irq(&isa->busdev, &fdctrl->irq, isairq);
fdctrl->dma_chann = dma_chann;
--
1.7.6.3
- [Qemu-devel] [PULL 00/24] Memory API, batch 11, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 02/24] palm: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 08/24] ppc_newworld: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 22/24] vmport: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 05/24] ppc405_boards: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 13/24] fdc: Convert to isa_register_portio_list,
Avi Kivity <=
- [Qemu-devel] [PATCH 16/24] rtc: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 10/24] Introduce PortioList, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 12/24] isa: Add isa_register_portio_list(), Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 09/24] isa: Tidy support code for isabus_get_fw_dev_path, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 17/24] ne2000: Convert to isa_register_ioport, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 11/24] memory: Fix old portio word accesses, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 04/24] petalogix_s2adsp1800: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 03/24] petalogix_ml605: convert to memory API, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 19/24] sb16: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10
- [Qemu-devel] [PATCH 14/24] gus: Convert to isa_register_portio_list, Avi Kivity, 2011/10/10