ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lasi: move second serial port initialisation to machine.c 

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-36-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:45 +01:00
parent 9701e56943
commit 2da547b819
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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/serial.h"
#include "hw/input/lasips2.h" #include "hw/input/lasips2.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "qom/object.h" #include "qom/object.h"
@ -236,13 +235,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);
if (serial_hd(1)) {
/* Serial port */
serial_mm_init(address_space, LASI_UART_HPA + 0x800, 0,
qdev_get_gpio_in(dev, LASI_IRQ_UART_HPA), 8000000 / 16,
serial_hd(1), DEVICE_BIG_ENDIAN);
}
/* PS/2 Keyboard/Mouse */ /* PS/2 Keyboard/Mouse */
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));

7
hw/hppa/machine.c
View File

@ -205,6 +205,13 @@ static void machine_hppa_init(MachineState *machine)
115200, serial_hd(0), DEVICE_BIG_ENDIAN); 115200, serial_hd(0), DEVICE_BIG_ENDIAN);
} }
if (serial_hd(1)) {
/* Serial port */
serial_mm_init(addr_space, LASI_UART_HPA + 0x800, 0,
qdev_get_gpio_in(lasi_dev, LASI_IRQ_UART_HPA), 8000000 / 16,
serial_hd(1), DEVICE_BIG_ENDIAN);
}
/* Parallel port */ /* Parallel port */
parallel_mm_init(addr_space, LASI_LPT_HPA + 0x800, 0, parallel_mm_init(addr_space, LASI_LPT_HPA + 0x800, 0,
qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA), qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA),