Now that dino_init() is completely decoupled from dino.c it can be moved to
machine.c with the rest of the board configuration.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <
20220504092600.10048-20-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
return slot & 0x03;
}
-DinoState *dino_init(MemoryRegion *addr_space)
-{
- DeviceState *dev;
- DinoState *s;
-
- dev = qdev_new(TYPE_DINO_PCI_HOST_BRIDGE);
- object_property_set_link(OBJECT(dev), "memory-as", OBJECT(addr_space),
- &error_fatal);
- s = DINO_PCI_HOST_BRIDGE(dev);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
-
- return s;
-}
-
static void dino_pcihost_reset(DeviceState *dev)
{
DinoState *s = DINO_PCI_HOST_BRIDGE(dev);
#include "hw/intc/i8259.h"
#include "hppa_hardware.h"
-#include "dino.h"
-DinoState *dino_init(MemoryRegion *);
DeviceState *lasi_init(MemoryRegion *);
#define enable_lasi_lan() 0
return fw_cfg;
}
+static DinoState *dino_init(MemoryRegion *addr_space)
+{
+ DeviceState *dev;
+
+ dev = qdev_new(TYPE_DINO_PCI_HOST_BRIDGE);
+ object_property_set_link(OBJECT(dev), "memory-as", OBJECT(addr_space),
+ &error_fatal);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+
+ return DINO_PCI_HOST_BRIDGE(dev);
+}
+
static void machine_hppa_init(MachineState *machine)
{
const char *kernel_filename = machine->kernel_filename;