@@ -1,7 +1,6 @@
#ifndef HW_FDC_H
#define HW_FDC_H
-#include "exec/hwaddr.h"
#include "qapi/qapi-types-block.h"
#include "hw/sysbus.h"
@@ -12,8 +11,6 @@
void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds);
void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds);
-void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
- hwaddr mmio_base, DriveInfo **fds);
FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i);
int cmos_get_fd_drive_type(FloppyDriveType fd0);
@@ -103,22 +103,6 @@ void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds)
fdctrl_init_drives(&fdc->state.bus, fds);
}
-void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
- hwaddr mmio_base, DriveInfo **fds)
-{
- DeviceState *dev;
- SysBusDevice *sbd;
-
- dev = qdev_new("sysbus-fdc");
- qdev_prop_set_int32(dev, "dma-channel", dma_chann);
- sbd = SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(sbd, &error_fatal);
- sysbus_connect_irq(sbd, 0, irq);
- sysbus_mmio_map(sbd, 0, mmio_base);
-
- sysbus_fdc_init_drives(sbd, fds);
-}
-
static void sysbus_fdc_common_initfn(Object *obj)
{
DeviceState *dev = DEVICE(obj);
@@ -143,6 +143,22 @@ static void mips_jazz_do_transaction_failed(CPUState *cs, hwaddr physaddr,
}
#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */
+static void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
+ hwaddr mmio_base, DriveInfo **fds)
+{
+ DeviceState *dev;
+ SysBusDevice *sbd;
+
+ dev = qdev_new("sysbus-fdc");
+ qdev_prop_set_int32(dev, "dma-channel", dma_chann);
+ sbd = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(sbd, &error_fatal);
+ sysbus_connect_irq(sbd, 0, irq);
+ sysbus_mmio_map(sbd, 0, mmio_base);
+
+ sysbus_fdc_init_drives(sbd, fds);
+}
+
static void mips_jazz_init(MachineState *machine,
enum jazz_model_e jazz_model)
{