[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] hw/pci-host/versatile: Add WINDOW_COUNT definition to replac
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 3/4] hw/pci-host/versatile: Add WINDOW_COUNT definition to replace magic '3' |
Date: |
Sun, 11 Oct 2020 21:49:17 +0200 |
Use self-explicit WINDOW_COUNT definition instead of a magic value.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/pci-host/versatile.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index b4951023f4e..4d9565de4b1 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -72,6 +72,8 @@ enum {
PCI_VPB_IRQMAP_FORCE_OK,
};
+#define WINDOW_COUNT 3
+
struct PCIVPBState {
PCIHostState parent_obj;
@@ -86,18 +88,18 @@ struct PCIVPBState {
* The offsets into pci_mem_space are controlled by the imap registers.
*/
MemoryRegion pci_io_window;
- MemoryRegion pci_mem_window[3];
+ MemoryRegion pci_mem_window[WINDOW_COUNT];
PCIBus pci_bus;
PCIDevice pci_dev;
/* Constant for life of device: */
int realview;
- uint32_t mem_win_size[3];
+ uint32_t mem_win_size[WINDOW_COUNT];
uint8_t irq_mapping_prop;
/* Variable state: */
- uint32_t imap[3];
- uint32_t smap[3];
+ uint32_t imap[WINDOW_COUNT];
+ uint32_t smap[WINDOW_COUNT];
uint32_t selfid;
uint32_t flags;
uint8_t irq_mapping;
@@ -130,7 +132,7 @@ static void pci_vpb_update_all_windows(PCIVPBState *s)
/* Update all alias windows based on the current register state */
int i;
- for (i = 0; i < 3; i++) {
+ for (i = 0; i < WINDOW_COUNT; i++) {
pci_vpb_update_window(s, i);
}
}
@@ -148,8 +150,8 @@ static const VMStateDescription pci_vpb_vmstate = {
.minimum_version_id = 1,
.post_load = pci_vpb_post_load,
.fields = (VMStateField[]) {
- VMSTATE_UINT32_ARRAY(imap, PCIVPBState, 3),
- VMSTATE_UINT32_ARRAY(smap, PCIVPBState, 3),
+ VMSTATE_UINT32_ARRAY(imap, PCIVPBState, WINDOW_COUNT),
+ VMSTATE_UINT32_ARRAY(smap, PCIVPBState, WINDOW_COUNT),
VMSTATE_UINT32(selfid, PCIVPBState),
VMSTATE_UINT32(flags, PCIVPBState),
VMSTATE_UINT8(irq_mapping, PCIVPBState),
@@ -371,12 +373,10 @@ static void pci_vpb_reset(DeviceState *d)
{
PCIVPBState *s = PCI_VPB(d);
- s->imap[0] = 0;
- s->imap[1] = 0;
- s->imap[2] = 0;
- s->smap[0] = 0;
- s->smap[1] = 0;
- s->smap[2] = 0;
+ for (int i = 0; i < WINDOW_COUNT; i++) {
+ s->imap[i] = 0;
+ s->smap[i] = 0;
+ }
s->selfid = 0;
s->flags = 0;
s->irq_mapping = s->irq_mapping_prop;
@@ -453,7 +453,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp)
* PCI memory space. The sizes vary from board to board; the base
* offsets are guest controllable via the IMAP registers.
*/
- for (i = 0; i < 3; i++) {
+ for (i = 0; i < WINDOW_COUNT; i++) {
memory_region_init_alias(&s->pci_mem_window[i], OBJECT(s),
"pci-vbp-window",
&s->pci_mem_space, 0, s->mem_win_size[i]);
sysbus_init_mmio(sbd, &s->pci_mem_window[i]);
--
2.26.2