diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-08-14 11:36:14 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 20:30:11 -0500 |
commit | 2091ba23e838c3a8773c246238d7381333789852 (patch) | |
tree | f0fe63782f1532c1d193a92a701d11e1544e1fde /hw/fdc.h | |
parent | 3f9cb1c14dc368f41447db5f78d6248c4f100ad4 (diff) | |
download | qemu-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/fdc.h')
-rw-r--r-- | hw/fdc.h | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -3,9 +3,12 @@ typedef struct fdctrl_t fdctrl_t; -fdctrl_t *fdctrl_init (qemu_irq irq, int dma_chann, int mem_mapped, - target_phys_addr_t io_base, - BlockDriverState **fds); +fdctrl_t *fdctrl_init_isa(int isairq, int dma_chann, + uint32_t io_base, + BlockDriverState **fds); +fdctrl_t *fdctrl_init_sysbus(qemu_irq irq, int dma_chann, + target_phys_addr_t mmio_base, + BlockDriverState **fds); fdctrl_t *sun4m_fdctrl_init (qemu_irq irq, target_phys_addr_t io_base, BlockDriverState **fds, qemu_irq *fdc_tc); int fdctrl_get_drive_type(fdctrl_t *fdctrl, int drive_num); |