lasi: update lasi_initfn() to return LASIState
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Acked-by: Helge Deller <deller@gmx.de> Message-Id: <20220504092600.10048-33-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>
This commit is contained in:
parent
fe744ca3ee
commit
954f6f7564
|
@ -7,10 +7,11 @@
|
||||||
#include "hw/pci/pci_host.h"
|
#include "hw/pci/pci_host.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
#include "hw/intc/i8259.h"
|
#include "hw/intc/i8259.h"
|
||||||
|
#include "lasi.h"
|
||||||
|
|
||||||
#include "hppa_hardware.h"
|
#include "hppa_hardware.h"
|
||||||
|
|
||||||
DeviceState *lasi_initfn(MemoryRegion *);
|
LasiState *lasi_initfn(MemoryRegion *);
|
||||||
#define enable_lasi_lan() 0
|
#define enable_lasi_lan() 0
|
||||||
|
|
||||||
/* hppa_pci.c. */
|
/* hppa_pci.c. */
|
||||||
|
|
|
@ -231,7 +231,7 @@ static void lasi_set_irq(void *opaque, int irq, int level)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DeviceState *lasi_initfn(MemoryRegion *address_space)
|
LasiState *lasi_initfn(MemoryRegion *address_space)
|
||||||
{
|
{
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
|
|
||||||
|
@ -260,7 +260,7 @@ DeviceState *lasi_initfn(MemoryRegion *address_space)
|
||||||
lasips2_init(address_space, LASI_PS2KBD_HPA,
|
lasips2_init(address_space, LASI_PS2KBD_HPA,
|
||||||
qdev_get_gpio_in(dev, LASI_IRQ_PS2KBD_HPA));
|
qdev_get_gpio_in(dev, LASI_IRQ_PS2KBD_HPA));
|
||||||
|
|
||||||
return dev;
|
return LASI_CHIP(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void lasi_reset(DeviceState *dev)
|
static void lasi_reset(DeviceState *dev)
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include "hw/net/lasi_82596.h"
|
#include "hw/net/lasi_82596.h"
|
||||||
#include "hw/nmi.h"
|
#include "hw/nmi.h"
|
||||||
#include "hw/pci-host/dino.h"
|
#include "hw/pci-host/dino.h"
|
||||||
|
#include "lasi.h"
|
||||||
#include "hppa_sys.h"
|
#include "hppa_sys.h"
|
||||||
#include "qemu/units.h"
|
#include "qemu/units.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
|
@ -175,7 +176,7 @@ static void machine_hppa_init(MachineState *machine)
|
||||||
|
|
||||||
|
|
||||||
/* Init Lasi chip */
|
/* Init Lasi chip */
|
||||||
lasi_dev = lasi_initfn(addr_space);
|
lasi_dev = DEVICE(lasi_initfn(addr_space));
|
||||||
memory_region_add_subregion(addr_space, LASI_HPA,
|
memory_region_add_subregion(addr_space, LASI_HPA,
|
||||||
sysbus_mmio_get_region(
|
sysbus_mmio_get_region(
|
||||||
SYS_BUS_DEVICE(lasi_dev), 0));
|
SYS_BUS_DEVICE(lasi_dev), 0));
|
||||||
|
|
Loading…
Reference in New Issue