SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/isa/piix4: Rename reset control operations to match PIIX3

Browse Source 
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>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20231007123843.127151-18-shentey@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bernhard Beschow 2023-10-07 14:38:25 +02:00 committed by Michael S. Tsirkin
parent de710ac408
commit 80ec6f5b57
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/isa/piix4.c
View File

@ -148,7 +148,7 @@ static void piix4_request_i8259_irq(void *opaque, int irq, int level)
qemu_set_irq(s->cpu_intr, level); qemu_set_irq(s->cpu_intr, level);
} }
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) unsigned int len)
{ {
PIIX4State *s = opaque; PIIX4State *s = opaque;
@ -161,16 +161,16 @@ static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val,
s->rcr = val & 2; /* keep System Reset type only */ 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)
{ {
PIIX4State *s = opaque; PIIX4State *s = opaque;
return s->rcr; return s->rcr;
} }
static const MemoryRegionOps piix4_rcr_ops = { static const MemoryRegionOps rcr_ops = {
.read = piix4_rcr_read, .read = rcr_read,
.write = piix4_rcr_write, .write = rcr_write,
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
.impl = { .impl = {
.min_access_size = 1, .min_access_size = 1,
@ -194,7 +194,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
qdev_init_gpio_out_named(DEVICE(dev), &s->cpu_intr, qdev_init_gpio_out_named(DEVICE(dev), &s->cpu_intr,
"intr", 1); "intr", 1);
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); "reset-control", 1);
memory_region_add_subregion_overlap(pci_address_space_io(dev), memory_region_add_subregion_overlap(pci_address_space_io(dev),
PIIX_RCR_IOPORT, &s->rcr_mem, 1); PIIX_RCR_IOPORT, &s->rcr_mem, 1);