[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 33/50] lasi: move LAN initialisation to machine.c
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 33/50] lasi: move LAN initialisation to machine.c |
Date: |
Thu, 21 Apr 2022 20:30:43 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/hppa/lasi.c | 7 -------
hw/hppa/machine.c | 5 +++++
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/hppa/lasi.c b/hw/hppa/lasi.c
index 65139bb29b..88ff9141e4 100644
--- a/hw/hppa/lasi.c
+++ b/hw/hppa/lasi.c
@@ -18,7 +18,6 @@
#include "sysemu/sysemu.h"
#include "sysemu/runstate.h"
#include "hppa_sys.h"
-#include "hw/net/lasi_82596.h"
#include "hw/char/parallel.h"
#include "hw/char/serial.h"
#include "hw/input/lasips2.h"
@@ -238,12 +237,6 @@ LasiState *lasi_initfn(MemoryRegion *address_space)
dev = qdev_new(TYPE_LASI_CHIP);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
- /* LAN */
- if (enable_lasi_lan()) {
- lasi_82596_init(address_space, LASI_LAN_HPA,
- qdev_get_gpio_in(dev, LASI_IRQ_LAN_HPA));
- }
-
/* Parallel port */
parallel_mm_init(address_space, LASI_LPT_HPA + 0x800, 0,
qdev_get_gpio_in(dev, LASI_IRQ_LAN_HPA),
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index be311294a8..c29528d03b 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -221,6 +221,11 @@ static void machine_hppa_init(MachineState *machine)
}
/* Network setup. */
+ if (enable_lasi_lan()) {
+ lasi_82596_init(addr_space, LASI_LAN_HPA,
+ qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA));
+ }
+
for (i = 0; i < nb_nics; i++) {
if (!enable_lasi_lan()) {
pci_nic_init_nofail(&nd_table[i], pci_bus, "tulip", NULL);
--
2.20.1
- [PATCH 23/50] lasi: checkpatch fixes, (continued)
- [PATCH 23/50] lasi: checkpatch fixes, Mark Cave-Ayland, 2022/04/21
- [PATCH 22/50] dino: move from hw/hppa to hw/pci-host, Mark Cave-Ayland, 2022/04/21
- [PATCH 25/50] lasi: move register memory mapping from lasi.c to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 28/50] lasi: replace lasi_get_irq() with defined constants, Mark Cave-Ayland, 2022/04/21
- [PATCH 29/50] lasi: define IRQ inputs as qdev GPIOs, Mark Cave-Ayland, 2022/04/21
- [PATCH 30/50] lasi: use qdev GPIOs to wire up IRQs in lasi_initfn(), Mark Cave-Ayland, 2022/04/21
- [PATCH 31/50] lasi: fix serial port initialisation, Mark Cave-Ayland, 2022/04/21
- [PATCH 32/50] lasi: update lasi_initfn() to return LASIState, Mark Cave-Ayland, 2022/04/21
- [PATCH 34/50] lasi: move parallel port initialisation to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 36/50] lasi: move PS2 initialisation to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 33/50] lasi: move LAN initialisation to machine.c,
Mark Cave-Ayland <=
- [PATCH 39/50] lasi: use constants for device register offsets, Mark Cave-Ayland, 2022/04/21
- [PATCH 35/50] lasi: move second serial port initialisation to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 41/50] hppa: move device headers from hppa_sys.h into individual .c files, Mark Cave-Ayland, 2022/04/21
- [PATCH 37/50] lasi: remove address space parameter from lasi_initfn(), Mark Cave-Ayland, 2022/04/21
- [PATCH 38/50] lasi: move lasi_initfn() to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 40/50] lasi: use numerical constant for iar reset value, Mark Cave-Ayland, 2022/04/21
- [PATCH 42/50] lasi: move from hw/hppa to hw/misc, Mark Cave-Ayland, 2022/04/21
- [PATCH 44/50] hppa: remove hw/hppa/pci.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 45/50] hppa: remove unused trace-events from from hw/hppa, Mark Cave-Ayland, 2022/04/21
- [PATCH 48/50] hppa: use MACHINE QOM macros for defining the hppa machine, Mark Cave-Ayland, 2022/04/21