hppa: Fix serial port assignments and pass-through
This fixes the serial ports in the emulation to behave as on original hardware. On the real hardware, the LASI UART is serial port #0 and the DINO UART is serial port #1. This is fixed in SeaBIOS-hppa firmware v6, which is why at least this firmware version is required. The serial port addresses in hppa/hppa_hardware.h have to be swapped, and when creating the virtual serial ports the correct port addresses are used. This patch now for example allows to specify on the qemu command line: -serial mon:stdio -serial /dev/ttyS4 to use the emulated ttyS0 in the guest for console output, and pass ttyS4 from the host to ttyS1 in the guest. Signed-off-by: Helge Deller <deller@gmx.de> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
parent
4de4354064
commit
5079892df5
|
@ -41,8 +41,8 @@
|
||||||
|
|
||||||
#define FW_CFG_IO_BASE 0xfffa0000
|
#define FW_CFG_IO_BASE 0xfffa0000
|
||||||
|
|
||||||
#define PORT_SERIAL1 (DINO_UART_HPA + 0x800)
|
#define PORT_SERIAL1 (LASI_UART_HPA + 0x800)
|
||||||
#define PORT_SERIAL2 (LASI_UART_HPA + 0x800)
|
#define PORT_SERIAL2 (DINO_UART_HPA + 0x800)
|
||||||
|
|
||||||
#define HPPA_MAX_CPUS 16 /* max. number of SMP CPUs */
|
#define HPPA_MAX_CPUS 16 /* max. number of SMP CPUs */
|
||||||
#define CPU_CLOCK_MHZ 250 /* emulate a 250 MHz CPU */
|
#define CPU_CLOCK_MHZ 250 /* emulate a 250 MHz CPU */
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#define MAX_IDE_BUS 2
|
#define MAX_IDE_BUS 2
|
||||||
|
|
||||||
#define MIN_SEABIOS_HPPA_VERSION 1 /* require at least this fw version */
|
#define MIN_SEABIOS_HPPA_VERSION 6 /* require at least this fw version */
|
||||||
|
|
||||||
#define HPA_POWER_BUTTON (FIRMWARE_END - 0x10)
|
#define HPA_POWER_BUTTON (FIRMWARE_END - 0x10)
|
||||||
|
|
||||||
|
@ -236,20 +236,14 @@ static void machine_hppa_init(MachineState *machine)
|
||||||
/* Realtime clock, used by firmware for PDC_TOD call. */
|
/* Realtime clock, used by firmware for PDC_TOD call. */
|
||||||
mc146818_rtc_init(isa_bus, 2000, NULL);
|
mc146818_rtc_init(isa_bus, 2000, NULL);
|
||||||
|
|
||||||
/* Serial code setup. */
|
/* Serial ports: Lasi and Dino use a 7.272727 MHz clock. */
|
||||||
if (serial_hd(0)) {
|
serial_mm_init(addr_space, LASI_UART_HPA + 0x800, 0,
|
||||||
uint32_t addr = DINO_UART_HPA + 0x800;
|
qdev_get_gpio_in(lasi_dev, LASI_IRQ_UART_HPA), 7272727 / 16,
|
||||||
serial_mm_init(addr_space, addr, 0,
|
serial_hd(0), DEVICE_BIG_ENDIAN);
|
||||||
qdev_get_gpio_in(dino_dev, DINO_IRQ_RS232INT),
|
|
||||||
115200, serial_hd(0), DEVICE_BIG_ENDIAN);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (serial_hd(1)) {
|
serial_mm_init(addr_space, DINO_UART_HPA + 0x800, 0,
|
||||||
/* Serial port */
|
qdev_get_gpio_in(dino_dev, DINO_IRQ_RS232INT), 7272727 / 16,
|
||||||
serial_mm_init(addr_space, LASI_UART_HPA + 0x800, 0,
|
serial_hd(1), DEVICE_BIG_ENDIAN);
|
||||||
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,
|
||||||
|
|
Loading…
Reference in New Issue