Skip to content

Commit

Permalink
lasi: move parallel port initialisation to machine.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mcayland committed May 8, 2022
1 parent c3c3fe4 commit 9701e56
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 0 additions & 6 deletions hw/hppa/lasi.c
Expand Up @@ -18,7 +18,6 @@
#include "sysemu/sysemu.h"
#include "sysemu/runstate.h"
#include "hppa_sys.h"
#include "hw/char/parallel.h"
#include "hw/char/serial.h"
#include "hw/input/lasips2.h"
#include "migration/vmstate.h"
Expand Down Expand Up @@ -237,11 +236,6 @@ LasiState *lasi_initfn(MemoryRegion *address_space)
dev = qdev_new(TYPE_LASI_CHIP);
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)) {
/* Serial port */
serial_mm_init(address_space, LASI_UART_HPA + 0x800, 0,
Expand Down
6 changes: 6 additions & 0 deletions hw/hppa/machine.c
Expand Up @@ -15,6 +15,7 @@
#include "hw/rtc/mc146818rtc.h"
#include "hw/timer/i8254.h"
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
#include "hw/net/lasi_82596.h"
#include "hw/nmi.h"
#include "hw/pci-host/dino.h"
Expand Down Expand Up @@ -204,6 +205,11 @@ static void machine_hppa_init(MachineState *machine)
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 */
create_fw_cfg(machine);

Expand Down

0 comments on commit 9701e56

Please sign in to comment.