[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 24/32] hw/isa/piix4: Rename reset control operations to match PII
From: |
Bernhard Beschow |
Subject: |
[PATCH 24/32] hw/isa/piix4: Rename reset control operations to match PIIX3 |
Date: |
Sun, 4 Dec 2022 20:05:45 +0100 |
Both implementations are the same and will be shared upon merging.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221022150508.26830-35-shentey@gmail.com>
---
hw/isa/piix4.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index c12388ddac..13ec2503d0 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -152,7 +152,7 @@ static const VMStateDescription vmstate_piix4 = {
}
};
-static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val,
+static void rcr_write(void *opaque, hwaddr addr, uint64_t val,
unsigned int len)
{
PIIXState *s = opaque;
@@ -165,16 +165,16 @@ static void piix4_rcr_write(void *opaque, hwaddr addr,
uint64_t val,
s->rcr = val & 2; /* keep System Reset type only */
}
-static uint64_t piix4_rcr_read(void *opaque, hwaddr addr, unsigned int len)
+static uint64_t rcr_read(void *opaque, hwaddr addr, unsigned int len)
{
PIIXState *s = opaque;
return s->rcr;
}
-static const MemoryRegionOps piix4_rcr_ops = {
- .read = piix4_rcr_read,
- .write = piix4_rcr_write,
+static const MemoryRegionOps rcr_ops = {
+ .read = rcr_read,
+ .write = rcr_write,
.endianness = DEVICE_LITTLE_ENDIAN,
.impl = {
.min_access_size = 1,
@@ -194,7 +194,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
return;
}
- memory_region_init_io(&s->rcr_mem, OBJECT(dev), &piix4_rcr_ops, s,
+ memory_region_init_io(&s->rcr_mem, OBJECT(dev), &rcr_ops, s,
"reset-control", 1);
memory_region_add_subregion_overlap(pci_address_space_io(dev),
PIIX_RCR_IOPORT, &s->rcr_mem, 1);
--
2.38.1
- [PATCH 15/32] hw/isa/piix3: Resolve redundant PIIX_NUM_PIC_IRQS, (continued)
- [PATCH 15/32] hw/isa/piix3: Resolve redundant PIIX_NUM_PIC_IRQS, Bernhard Beschow, 2022/12/04
- [PATCH 16/32] hw/isa/piix3: Rename pci_piix3_props for sharing with PIIX4, Bernhard Beschow, 2022/12/04
- [PATCH 17/32] hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4, Bernhard Beschow, 2022/12/04
- [PATCH 18/32] hw/isa/piix3: Prefix pci_slot_get_pirq() with "piix3_", Bernhard Beschow, 2022/12/04
- [PATCH 12/32] hw/isa/piix3: Create Proxy PIC in host device, Bernhard Beschow, 2022/12/04
- [PATCH 20/32] hw/isa/piix4: Make PIIX4's ACPI and USB functions optional, Bernhard Beschow, 2022/12/04
- [PATCH 21/32] hw/isa/piix4: Remove unused code, Bernhard Beschow, 2022/12/04
- [PATCH 22/32] hw/isa/piix4: Use Proxy PIC device, Bernhard Beschow, 2022/12/04
- [PATCH 19/32] hw/isa/piix3: Rename typedef PIIX3State to PIIXState, Bernhard Beschow, 2022/12/04
- [PATCH 23/32] hw/isa/piix4: Reuse struct PIIXState from PIIX3, Bernhard Beschow, 2022/12/04
- [PATCH 24/32] hw/isa/piix4: Rename reset control operations to match PIIX3,
Bernhard Beschow <=
- [PATCH 25/32] hw/isa/piix4: Prefix pci_slot_get_pirq() with "piix4_", Bernhard Beschow, 2022/12/04
- [PATCH 27/32] hw/isa/piix: Harmonize names of reset control memory regions, Bernhard Beschow, 2022/12/04
- [PATCH 28/32] hw/isa/piix: Reuse PIIX3 base class' realize method in PIIX4, Bernhard Beschow, 2022/12/04
- [PATCH 26/32] hw/isa/piix3: Merge hw/isa/piix4.c, Bernhard Beschow, 2022/12/04
- [PATCH 30/32] hw/isa/piix: Consolidate IRQ triggering, Bernhard Beschow, 2022/12/04
- [PATCH 29/32] hw/isa/piix: Rename functions to be shared for interrupt triggering, Bernhard Beschow, 2022/12/04
- [PATCH 31/32] hw/isa/piix: Share PIIX3 base class with PIIX4, Bernhard Beschow, 2022/12/04
- [PATCH 32/32] hw/isa/piix: Drop the "3" from the PIIX base class, Bernhard Beschow, 2022/12/04
- Re: [PATCH 00/32] Consolidate PIIX south bridges, Bernhard Beschow, 2022/12/04