aboutsummaryrefslogtreecommitdiff
path: root/hw/mips_jazz.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-08-14 11:36:14 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 20:30:11 -0500
commit2091ba23e838c3a8773c246238d7381333789852 (patch)
treef0fe63782f1532c1d193a92a701d11e1544e1fde /hw/mips_jazz.c
parent3f9cb1c14dc368f41447db5f78d6248c4f100ad4 (diff)
downloadqemu-2091ba23e838c3a8773c246238d7381333789852.zip
qemu-2091ba23e838c3a8773c246238d7381333789852.tar.gz
qemu-2091ba23e838c3a8773c246238d7381333789852.tar.bz2
isa bus irq changes and fixes.
Changes: (1) make isa-bus maintain isa irqs, complain when allocating already taken irqs. (2) note that (1) works only for isa devices converted to qdev already (floppy and ps2/kbd/mouse right now), so more work is needed to make this really useful. (3) split floppy init into isa and sysbus versions. (4) add sysbus->isa bridge & fix -M isapc breakage. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mips_jazz.c')
-rw-r--r--hw/mips_jazz.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 9740d72..1cbd947 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -238,7 +238,7 @@ void mips_jazz_init (ram_addr_t ram_size,
DriveInfo *dinfo = drive_get(IF_FLOPPY, 0, n);
fds[n] = dinfo ? dinfo->bdrv : NULL;
}
- fdctrl_init(rc4030[1], 0, 1, 0x80003000, fds);
+ fdctrl_init_sysbus(rc4030[1], 0, 0x80003000, fds);
/* Real time clock */
rtc_init(0x70, i8259[8], 1980);