[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/18] hw/intc/sh_intc: Rename iomem region
From: |
BALATON Zoltan |
Subject: |
[PATCH v3 10/18] hw/intc/sh_intc: Rename iomem region |
Date: |
Wed, 27 Oct 2021 23:54:31 +0200 |
Rename the iomem region to "intc" from "interrupt-controller" which
makes the info mtree output less wide as it is already too wide
because of all the aliases. Also drop the format macro which was only
used twice in close proximity so we can just use the literal string
instead without a macro definition.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/intc/sh_intc.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c
index 18461ff554..e386372b6f 100644
--- a/hw/intc/sh_intc.c
+++ b/hw/intc/sh_intc.c
@@ -288,15 +288,13 @@ static unsigned int sh_intc_register(MemoryRegion *sysmem,
iomem_p4 = desc->iomem_aliases + index;
iomem_a7 = iomem_p4 + 1;
-#define SH_INTC_IOMEM_FORMAT "interrupt-controller-%s-%s-%s"
- snprintf(name, sizeof(name), SH_INTC_IOMEM_FORMAT, type, action, "p4");
+ snprintf(name, sizeof(name), "intc-%s-%s-%s", type, action, "p4");
memory_region_init_alias(iomem_p4, NULL, name, iomem, A7ADDR(address), 4);
memory_region_add_subregion(sysmem, P4ADDR(address), iomem_p4);
- snprintf(name, sizeof(name), SH_INTC_IOMEM_FORMAT, type, action, "a7");
+ snprintf(name, sizeof(name), "intc-%s-%s-%s", type, action, "a7");
memory_region_init_alias(iomem_a7, NULL, name, iomem, A7ADDR(address), 4);
memory_region_add_subregion(sysmem, A7ADDR(address), iomem_a7);
-#undef SH_INTC_IOMEM_FORMAT
/* used to increment aliases index */
return 2;
@@ -432,9 +430,8 @@ int sh_intc_init(MemoryRegion *sysmem,
}
desc->irqs = qemu_allocate_irqs(sh_intc_set_irq, desc, nr_sources);
-
- memory_region_init_io(&desc->iomem, NULL, &sh_intc_ops, desc,
- "interrupt-controller", 0x100000000ULL);
+ memory_region_init_io(&desc->iomem, NULL, &sh_intc_ops, desc, "intc",
+ 0x100000000ULL);
#define INT_REG_PARAMS(reg_struct, type, action, j) \
reg_struct->action##_reg, #type, #action, j
--
2.21.4
- [PATCH v3 06/18] hw/char/sh_serial: QOM-ify, (continued)
- [PATCH v3 06/18] hw/char/sh_serial: QOM-ify, BALATON Zoltan, 2021/10/27
- [PATCH v3 14/18] hw/intc/sh_intc: Use array index instead of pointer arithmetics, BALATON Zoltan, 2021/10/27
- [PATCH v3 07/18] hw/char/sh_serial: Add device id to trace output, BALATON Zoltan, 2021/10/27
- [PATCH v3 13/18] hw/intc/sh_intc: Remove excessive parenthesis, BALATON Zoltan, 2021/10/27
- [PATCH v3 01/18] hw/sh4: Fix typos in a comment, BALATON Zoltan, 2021/10/27
- [PATCH v3 09/18] hw/intc/sh_intc: Turn some defines into an enum, BALATON Zoltan, 2021/10/27
- [PATCH v3 15/18] hw/sh4/sh_intc: Inline and drop sh_intc_source() function, BALATON Zoltan, 2021/10/27
- [PATCH v3 10/18] hw/intc/sh_intc: Rename iomem region,
BALATON Zoltan <=
- [PATCH v3 11/18] hw/intc/sh_intc: Drop another useless macro, BALATON Zoltan, 2021/10/27
- [PATCH v3 03/18] hw/sh4: Change debug printfs to traces, BALATON Zoltan, 2021/10/27
- [PATCH v3 08/18] hw/intc/sh_intc: Use existing macro instead of local one, BALATON Zoltan, 2021/10/27
- [PATCH v3 04/18] hw/sh4/r2d: Use error_report instead of fprintf to stderr, BALATON Zoltan, 2021/10/27
- [PATCH v3 12/18] hw/intc/sh_intc: Move sh_intc_register() closer to its only user, BALATON Zoltan, 2021/10/27