dino: use QOM cast instead of directly referencing parent_obj
Use a QOM cast in both dino_chip_read_with_attrs() and dino_chip_write_with_attrs() instead of directly referencing parent_obj. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Acked-by: Helge Deller <deller@gmx.de> Message-Id: <20220504092600.10048-10-mark.cave-ayland@ilande.co.uk> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
parent
98d168f359
commit
ee313d5abb
|
@ -205,6 +205,7 @@ static MemTxResult dino_chip_read_with_attrs(void *opaque, hwaddr addr,
|
||||||
MemTxAttrs attrs)
|
MemTxAttrs attrs)
|
||||||
{
|
{
|
||||||
DinoState *s = opaque;
|
DinoState *s = opaque;
|
||||||
|
PCIHostState *phb = PCI_HOST_BRIDGE(s);
|
||||||
MemTxResult ret = MEMTX_OK;
|
MemTxResult ret = MEMTX_OK;
|
||||||
AddressSpace *io;
|
AddressSpace *io;
|
||||||
uint16_t ioaddr;
|
uint16_t ioaddr;
|
||||||
|
@ -214,7 +215,7 @@ static MemTxResult dino_chip_read_with_attrs(void *opaque, hwaddr addr,
|
||||||
case DINO_PCI_IO_DATA ... DINO_PCI_IO_DATA + 3:
|
case DINO_PCI_IO_DATA ... DINO_PCI_IO_DATA + 3:
|
||||||
/* Read from PCI IO space. */
|
/* Read from PCI IO space. */
|
||||||
io = &address_space_io;
|
io = &address_space_io;
|
||||||
ioaddr = s->parent_obj.config_reg + (addr & 3);
|
ioaddr = phb->config_reg + (addr & 3);
|
||||||
switch (size) {
|
switch (size) {
|
||||||
case 1:
|
case 1:
|
||||||
val = address_space_ldub(io, ioaddr, attrs, &ret);
|
val = address_space_ldub(io, ioaddr, attrs, &ret);
|
||||||
|
@ -297,6 +298,7 @@ static MemTxResult dino_chip_write_with_attrs(void *opaque, hwaddr addr,
|
||||||
MemTxAttrs attrs)
|
MemTxAttrs attrs)
|
||||||
{
|
{
|
||||||
DinoState *s = opaque;
|
DinoState *s = opaque;
|
||||||
|
PCIHostState *phb = PCI_HOST_BRIDGE(s);
|
||||||
AddressSpace *io;
|
AddressSpace *io;
|
||||||
MemTxResult ret;
|
MemTxResult ret;
|
||||||
uint16_t ioaddr;
|
uint16_t ioaddr;
|
||||||
|
@ -308,7 +310,7 @@ static MemTxResult dino_chip_write_with_attrs(void *opaque, hwaddr addr,
|
||||||
case DINO_IO_DATA ... DINO_PCI_IO_DATA + 3:
|
case DINO_IO_DATA ... DINO_PCI_IO_DATA + 3:
|
||||||
/* Write into PCI IO space. */
|
/* Write into PCI IO space. */
|
||||||
io = &address_space_io;
|
io = &address_space_io;
|
||||||
ioaddr = s->parent_obj.config_reg + (addr & 3);
|
ioaddr = phb->config_reg + (addr & 3);
|
||||||
switch (size) {
|
switch (size) {
|
||||||
case 1:
|
case 1:
|
||||||
address_space_stb(io, ioaddr, val, attrs, &ret);
|
address_space_stb(io, ioaddr, val, attrs, &ret);
|
||||||
|
|
Loading…
Reference in New Issue