[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 21/50] dino: move DINO HPA constants from hppa_hardware.h to dino
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 21/50] dino: move DINO HPA constants from hppa_hardware.h to dino.h |
Date: |
Thu, 21 Apr 2022 20:30: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>
---
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 11/50] dino: split declarations from dino.c into dino.h, (continued)
- [PATCH 11/50] dino: split declarations from dino.c into dino.h, Mark Cave-Ayland, 2022/04/21
- [PATCH 18/50] dino: remove unused dino_set_timer_irq() IRQ handler, Mark Cave-Ayland, 2022/04/21
- [PATCH 13/50] dino: change dino_init() to return the DINO device instead of PCIBus, Mark Cave-Ayland, 2022/04/21
- [PATCH 12/50] hppa: use new CONFIG_HPPA_GENERIC option instead of CONFIG_DINO to build hppa machine, Mark Cave-Ayland, 2022/04/21
- [PATCH 15/50] dino.h: add defines for DINO IRQ numbers, Mark Cave-Ayland, 2022/04/21
- [PATCH 17/50] dino: wire up serial IRQ using a qdev GPIO in machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 20/50] dino: use numerical constant for iar0 and iar1 reset values, Mark Cave-Ayland, 2022/04/21
- [PATCH 16/50] dino: define IRQ inputs as qdev GPIOs, Mark Cave-Ayland, 2022/04/21
- [PATCH 19/50] hppa: move dino_init() from dino.c to machine.c, Mark Cave-Ayland, 2022/04/21
- [PATCH 14/50] machine.c: map DINO device during board configuration, Mark Cave-Ayland, 2022/04/21
- [PATCH 21/50] dino: move DINO HPA constants from hppa_hardware.h to dino.h,
Mark Cave-Ayland <=
- [PATCH 24/50] lasi: move memory region initialisation to new lasi_init() function, Mark Cave-Ayland, 2022/04/21
- [PATCH 26/50] lasi: move initialisation of iar and rtc to new lasi_reset() function, Mark Cave-Ayland, 2022/04/21
- [PATCH 27/50] lasi: move LASIState and associated QOM structures to lasi.h, Mark Cave-Ayland, 2022/04/21
- [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