summary refs log tree commit diff stats
path: root/hw/fdc.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-08-14 11:36:16 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 20:30:20 -0500
commite8935eefe56070a37ece62e2d7f8e45c6c9356da (patch)
treedf331b365544ba4d0d35b4772babe3bfcf4ee934 /hw/fdc.c
parent3a38d437ca60ce19ee92dbabbe6e672e9ba3c529 (diff)
downloadfocaccia-qemu-e8935eefe56070a37ece62e2d7f8e45c6c9356da.tar.gz
focaccia-qemu-e8935eefe56070a37ece62e2d7f8e45c6c9356da.zip
Move isa_connect_irq calls into isa_create_simple
Now with isa-bus maintaining the isa irqs we can move the
isa_connect_irq() calls into isa_create_simple().

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/fdc.c')
-rw-r--r--hw/fdc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/fdc.c b/hw/fdc.c
index 0ece6db231..e5a650a2a9 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -1878,9 +1878,8 @@ fdctrl_t *fdctrl_init_isa(int isairq, int dma_chann,
     fdctrl_t *fdctrl;
     ISADevice *dev;
 
-    dev = isa_create_simple("isa-fdc", io_base, 0);
+    dev = isa_create_simple("isa-fdc", io_base, 0, isairq, -1);
     fdctrl = &(DO_UPCAST(fdctrl_isabus_t, busdev, dev)->state);
-    isa_connect_irq(dev, 0, isairq);
 
     fdctrl->dma_chann = dma_chann;
     DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl);