@@ -18,7 +18,6 @@
/* Number of 2k memory pages available. */
#define NUM_PACKETS 4
-#define TYPE_SMC91C111 "smc91c111"
#define SMC91C111(obj) OBJECT_CHECK(smc91c111_state, (obj), TYPE_SMC91C111)
typedef struct {
@@ -809,20 +808,4 @@ static void smc91c111_register_types(void)
type_register_static(&smc91c111_info);
}
-/* Legacy helper function. Should go away when machine config files are
- implemented. */
-void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq)
-{
- DeviceState *dev;
- SysBusDevice *s;
-
- qemu_check_nic_model(nd, "smc91c111");
- dev = qdev_create(NULL, TYPE_SMC91C111);
- qdev_set_nic_properties(dev, nd);
- qdev_init_nofail(dev);
- s = SYS_BUS_DEVICE(dev);
- sysbus_mmio_map(s, 0, base);
- sysbus_connect_irq(s, 0, irq);
-}
-
type_init(smc91c111_register_types)
@@ -10,9 +10,32 @@
#ifndef HW_NET_SMC91C111_H
#define HW_NET_SMC91C111_H
+#include "hw/qdev.h"
#include "hw/irq.h"
+#include "hw/sysbus.h"
#include "net/net.h"
-void smc91c111_init(NICInfo *, uint32_t, qemu_irq);
+#define TYPE_SMC91C111 "smc91c111"
+
+/*
+ * Legacy helper function. Should go away when machine config files are
+ * implemented.
+ */
+static inline DeviceState *smc91c111_init(NICInfo *nd,
+ uint32_t base, qemu_irq irq)
+{
+ DeviceState *dev;
+ SysBusDevice *s;
+
+ qemu_check_nic_model(nd, "smc91c111");
+ dev = qdev_create(NULL, TYPE_SMC91C111);
+ qdev_set_nic_properties(dev, nd);
+ qdev_init_nofail(dev);
+ s = SYS_BUS_DEVICE(dev);
+ sysbus_mmio_map(s, 0, base);
+ sysbus_connect_irq(s, 0, irq);
+
+ return dev;
+}
#endif
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- As init helper in "hw/char/pl011.h" --- hw/net/smc91c111.c | 17 ----------------- include/hw/net/smc91c111.h | 25 ++++++++++++++++++++++++- 2 files changed, 24 insertions(+), 18 deletions(-)