motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 09:32:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

lasi: move parallel port initialisation to machine.c

Browse source 
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-35-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:
Mark Cave-Ayland 2022-05-04 10:25:44 +01:00
parent c3c3fe4708
commit 9701e56943
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/hppa/lasi.c
View file

@ -18,7 +18,6 @@
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "hppa_sys.h" #include "hppa_sys.h"
#include "hw/char/parallel.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/input/lasips2.h" #include "hw/input/lasips2.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
@ -237,11 +236,6 @@ LasiState *lasi_initfn(MemoryRegion *address_space)
dev = qdev_new(TYPE_LASI_CHIP); dev = qdev_new(TYPE_LASI_CHIP);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
/* Parallel port */
parallel_mm_init(address_space, LASI_LPT_HPA + 0x800, 0,
qdev_get_gpio_in(dev, LASI_IRQ_LAN_HPA),
parallel_hds[0]);
if (serial_hd(1)) { if (serial_hd(1)) {
/* Serial port */ /* Serial port */
serial_mm_init(address_space, LASI_UART_HPA + 0x800, 0, serial_mm_init(address_space, LASI_UART_HPA + 0x800, 0,

6
hw/hppa/machine.c
View file

@ -15,6 +15,7 @@
#include "hw/rtc/mc146818rtc.h" #include "hw/rtc/mc146818rtc.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/char/parallel.h"
#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"
@ -204,6 +205,11 @@ static void machine_hppa_init(MachineState *machine)
115200, serial_hd(0), DEVICE_BIG_ENDIAN); 115200, serial_hd(0), DEVICE_BIG_ENDIAN);
} }
/* Parallel port */
parallel_mm_init(addr_space, LASI_LPT_HPA + 0x800, 0,
qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),
parallel_hds[0]);
/* fw_cfg configuration interface */ /* fw_cfg configuration interface */
create_fw_cfg(machine); create_fw_cfg(machine);