[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/8] hw/sparc/sun4m: Inline sun4m_fdctrl_init()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 6/8] hw/sparc/sun4m: Inline sun4m_fdctrl_init() |
Date: |
Wed, 28 Apr 2021 14:51:02 +0200 |
There is only one call site for sun4m_fdctrl_init(), and this
function is specific to the sun4m machines, not part of the
SYSBUS_FDC API. Move it locally with the machine code, and
remove its declaration in "hw/block/fdc.h".
Suggested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/block/fdc.h | 2 --
hw/block/fdc-sysbus.c | 16 ----------------
hw/sparc/sun4m.c | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h
index 52e45c53078..06612218630 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc.h
@@ -14,8 +14,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);
-void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
- DriveInfo **fds, qemu_irq *fdc_tc);
FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i);
int cmos_get_fd_drive_type(FloppyDriveType fd0);
diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c
index 1163e53165d..8f94c2efb63 100644
--- a/hw/block/fdc-sysbus.c
+++ b/hw/block/fdc-sysbus.c
@@ -123,22 +123,6 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
sysbus_fdc_init_drives(sbd, fds);
}
-void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
- DriveInfo **fds, qemu_irq *fdc_tc)
-{
- DeviceState *dev;
- SysBusDevice *sbd;
-
- dev = qdev_new("sun-fdtwo");
- sbd = SYS_BUS_DEVICE(dev);
- sysbus_realize_and_unref(sbd, &error_fatal);
- sysbus_connect_irq(sbd, 0, irq);
- sysbus_mmio_map(sbd, 0, io_base);
- *fdc_tc = qdev_get_gpio_in(dev, 0);
-
- sysbus_fdc_init_drives(sbd, fds);
-}
-
static void sysbus_fdc_common_initfn(Object *obj)
{
DeviceState *dev = DEVICE(obj);
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 1a00816d9a8..27bcea07157 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -837,6 +837,22 @@ static void dummy_fdc_tc(void *opaque, int irq, int level)
{
}
+static void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
+ DriveInfo **fds, qemu_irq *fdc_tc)
+{
+ DeviceState *dev;
+ SysBusDevice *sbd;
+
+ dev = qdev_new("sun-fdtwo");
+ sbd = SYS_BUS_DEVICE(dev);
+ sysbus_realize_and_unref(sbd, &error_fatal);
+ sysbus_connect_irq(sbd, 0, irq);
+ sysbus_mmio_map(sbd, 0, io_base);
+ *fdc_tc = qdev_get_gpio_in(dev, 0);
+
+ sysbus_fdc_init_drives(sbd, fds);
+}
+
static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
MachineState *machine)
{
--
2.26.3
- [PATCH v2 0/8] hw/block/fdc: Allow Kconfig-selecting ISA bus/SysBus floppy controllers, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v2 1/8] hw/block/fdc: Replace disabled fprintf() by trace event, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v2 2/8] hw/block/fdc: Declare shared prototypes in fdc-internal.h, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v2 3/8] hw/block/fdc: Extract ISA floppy controllers to fdc-isa.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v2 4/8] hw/block/fdc: Extract SysBus floppy controllers to fdc-sysbus.c, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v2 5/8] hw/block/fdc: Add sysbus_fdc_init_drives() method, Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v2 6/8] hw/sparc/sun4m: Inline sun4m_fdctrl_init(),
Philippe Mathieu-Daudé <=
- [PATCH v2 8/8] hw/mips/jazz: Inline fdctrl_init_sysbus(), Philippe Mathieu-Daudé, 2021/04/28
- [PATCH v2 7/8] hw/block/fdc-sysbus: Add 'dma-channel' property, Philippe Mathieu-Daudé, 2021/04/28