[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 21/50] dino: move DINO HPA constants from hppa_hardware.h to d
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 21/50] dino: move DINO HPA constants from hppa_hardware.h to dino.h |
Date: |
Wed, 4 May 2022 10:25:31 +0100 |
This is to allow us to decouple the DINO device from the board logic.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
---
hw/hppa/dino.h | 5 +++++
hw/hppa/hppa_hardware.h | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/hppa/dino.h b/hw/hppa/dino.h
index ca380515f2..a1b0184940 100644
--- a/hw/hppa/dino.h
+++ b/hw/hppa/dino.h
@@ -101,6 +101,11 @@ static const uint32_t reg800_keep_bits[DINO800_REGS] = {
MAKE_64BIT_MASK(0, 9), /* TLTIM */
};
+/* offsets to DINO HPA: */
+#define DINO_PCI_ADDR 0x064
+#define DINO_CONFIG_DATA 0x068
+#define DINO_IO_DATA 0x06c
+
struct DinoState {
PCIHostState parent_obj;
diff --git a/hw/hppa/hppa_hardware.h b/hw/hppa/hppa_hardware.h
index 5edf577563..8b6b9222cb 100644
--- a/hw/hppa/hppa_hardware.h
+++ b/hw/hppa/hppa_hardware.h
@@ -30,11 +30,6 @@
#define PCI_HPA DINO_HPA /* PCI bus */
#define IDE_HPA 0xf9000000 /* Boot disc controller */
-/* offsets to DINO HPA: */
-#define DINO_PCI_ADDR 0x064
-#define DINO_CONFIG_DATA 0x068
-#define DINO_IO_DATA 0x06c
-
#define PORT_PCI_CMD (PCI_HPA + DINO_PCI_ADDR)
#define PORT_PCI_DATA (PCI_HPA + DINO_CONFIG_DATA)
--
2.20.1
- [PATCH v2 18/50] dino: remove unused dino_set_timer_irq() IRQ handler, (continued)
- [PATCH v2 18/50] dino: remove unused dino_set_timer_irq() IRQ handler, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 12/50] hppa: use new CONFIG_HPPA_B160L option instead of CONFIG_DINO to build hppa machine, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 16/50] dino: define IRQ inputs as qdev GPIOs, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 20/50] dino: use numerical constant for iar0 and iar1 reset values, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 19/50] hppa: move dino_init() from dino.c to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 21/50] dino: move DINO HPA constants from hppa_hardware.h to dino.h,
Mark Cave-Ayland <=
- [PATCH v2 23/50] lasi: checkpatch fixes, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 22/50] dino: move from hw/hppa to hw/pci-host, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 24/50] lasi: move memory region initialisation to new lasi_init() function, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 25/50] lasi: move register memory mapping from lasi.c to machine.c, Mark Cave-Ayland, 2022/05/04
- [PATCH v2 26/50] lasi: move initialisation of iar and rtc to new lasi_reset() function, Mark Cave-Ayland, 2022/05/04