[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 41/50] hppa: move device headers from hppa_sys.h into individu
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 41/50] hppa: move device headers from hppa_sys.h into individual .c files |
Date: |
Wed, 4 May 2022 10:25:51 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
hw/hppa/hppa_sys.h | 3 ---
hw/hppa/lasi.h | 4 ++++
hw/hppa/machine.c | 2 ++
hw/hppa/pci.c | 3 +++
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/hppa/hppa_sys.h b/hw/hppa/hppa_sys.h
index f7a127be19..9964d4a7a7 100644
--- a/hw/hppa/hppa_sys.h
+++ b/hw/hppa/hppa_sys.h
@@ -3,10 +3,7 @@
#ifndef HW_HPPA_SYS_H
#define HW_HPPA_SYS_H
-#include "hw/pci/pci.h"
-#include "hw/pci/pci_host.h"
#include "hw/boards.h"
-#include "hw/intc/i8259.h"
#include "hppa_hardware.h"
diff --git a/hw/hppa/lasi.h b/hw/hppa/lasi.h
index 11cf7d6b0b..ecc7065ce8 100644
--- a/hw/hppa/lasi.h
+++ b/hw/hppa/lasi.h
@@ -12,6 +12,10 @@
#ifndef LASI_H
#define LASI_H
+#include "exec/address-spaces.h"
+#include "hw/pci/pci_host.h"
+#include "hw/boards.h"
+
#define TYPE_LASI_CHIP "lasi-chip"
OBJECT_DECLARE_SIMPLE_TYPE(LasiState, LASI_CHIP)
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 58b25ca5bc..9d904b7a60 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -16,9 +16,11 @@
#include "hw/timer/i8254.h"
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
+#include "hw/intc/i8259.h"
#include "hw/input/lasips2.h"
#include "hw/net/lasi_82596.h"
#include "hw/nmi.h"
+#include "hw/pci/pci.h"
#include "hw/pci-host/dino.h"
#include "lasi.h"
#include "hppa_sys.h"
diff --git a/hw/hppa/pci.c b/hw/hppa/pci.c
index 32609aba63..a92dcb6b9e 100644
--- a/hw/hppa/pci.c
+++ b/hw/hppa/pci.c
@@ -6,6 +6,9 @@
#include "qemu/osdep.h"
#include "hppa_sys.h"
#include "qemu/log.h"
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/intc/i8259.h"
#include "trace.h"
--
2.20.1
- Re: [PATCH v2 34/50] lasi: move parallel port initialisation to machine.c, (continued)
- [PATCH v2 37/50] lasi: remove address space parameter from lasi_initfn(), Mark Cave-Ayland, 2022/05/04
- [PATCH v2 38/50] lasi: move lasi_initfn() to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 39/50] lasi: use constants for device register offsets, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 40/50] lasi: use numerical constant for iar reset value, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 41/50] hppa: move device headers from hppa_sys.h into individual .c files,
Mark Cave-Ayland <=
- [PATCH v2 42/50] lasi: move from hw/hppa to hw/misc, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 43/50] hppa: move hppa_pci_ignore_ops from pci.c to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 44/50] hppa: remove hw/hppa/pci.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 46/50] hppa: move enable_lan() define from hppa_sys.h to machine.c, Mark Cave-Ayland, 2022/05/04