[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/11] hw/mips/jazz: Rename ISA input IRQs as 'isa_irqs_in'
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 05/11] hw/mips/jazz: Rename ISA input IRQs as 'isa_irqs_in' |
Date: |
Fri, 10 Feb 2023 17:37:38 +0100 |
The following code:
/* ISA devices */
i8259 = i8259_init(isa_bus, ...);
gives the false idea that the function is creating a i8259
device. Instead this function returns an array of input IRQs.
Rename the variable to clarify:
/* ISA devices */
isa_irqs_in = i8259_init(isa_bus, ...);
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/mips/jazz.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 6aefe9a61b..fc7898006c 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -130,7 +130,7 @@ static void mips_jazz_init(MachineState *machine,
MIPSCPU *cpu;
MIPSCPUClass *mcc;
CPUMIPSState *env;
- qemu_irq *i8259;
+ qemu_irq *isa_irqs_in;
rc4030_dma *dmas;
IOMMUMemoryRegion *rc4030_dma_mr;
MemoryRegion *isa_mem = g_new(MemoryRegion, 1);
@@ -248,8 +248,8 @@ static void mips_jazz_init(MachineState *machine,
isa_bus = isa_bus_new(NULL, isa_mem, isa_io, &error_abort);
/* ISA devices */
- i8259 = i8259_init(isa_bus, env->irq[4]);
- isa_bus_irqs(isa_bus, i8259);
+ isa_irqs_in = i8259_init(isa_bus, env->irq[4]);
+ isa_bus_irqs(isa_bus, isa_irqs_in);
i8257_dma_init(isa_bus, 0);
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
pcspk_init(isa_new(TYPE_PC_SPEAKER), isa_bus, pit);
--
2.38.1
- [PATCH 00/11] hw/isa: More housekeeping, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 01/11] hw/intc/i8259: Document i8259_init(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 02/11] hw/isa/i82378: Rename output IRQ as 'cpu_intr', Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 03/11] hw/isa/i82378: Remove intermediate IRQ forwarder, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 04/11] hw/isa/vt82c686: Remove intermediate IRQ forwarder, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 05/11] hw/mips/jazz: Rename ISA input IRQs as 'isa_irqs_in',
Philippe Mathieu-Daudé <=
- [PATCH 06/11] hw/sparc64/sun4u: Keep reference to ISA input IRQs in EbusState, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 07/11] hw/isa: Reorder to separate ISABus* vs ISADevice* functions, Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 08/11] hw/isa: Un-inline isa_bus_from_device(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 09/11] hw/isa: Rename isa_bus_irqs() -> isa_bus_register_input_irqs(), Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 10/11] hw/isa: Use isa_address_space_io() to reduce access on global 'isabus', Philippe Mathieu-Daudé, 2023/02/10
- [PATCH 11/11] hw/isa: Factor isa_bus_get_irq() out of isa_get_irq(), Philippe Mathieu-Daudé, 2023/02/10