ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mcpx: Rename dev to parent_obj, use QOM casts

This commit is contained in:
Matt Borgerson 2025-01-06 04:08:59 -07:00
parent 739850e6e0
commit f4ef9f6309
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/xbox/mcpx/apu.c
View File

@ -88,7 +88,10 @@ typedef struct MCPXAPUVoiceFilter {
} MCPXAPUVoiceFilter; } MCPXAPUVoiceFilter;
typedef struct MCPXAPUState { typedef struct MCPXAPUState {
PCIDevice dev; /*< private >*/
PCIDevice parent_obj;
/*< public >*/
bool exiting; bool exiting;
bool set_irq; bool set_irq;
@ -365,12 +368,12 @@ static void update_irq(MCPXAPUState *d)
qatomic_or(&d->regs[NV_PAPU_ISTS], NV_PAPU_ISTS_GINTSTS); qatomic_or(&d->regs[NV_PAPU_ISTS], NV_PAPU_ISTS_GINTSTS);
// fprintf(stderr, "mcpx irq raise ien=%08x ists=%08x\n", // fprintf(stderr, "mcpx irq raise ien=%08x ists=%08x\n",
// d->regs[NV_PAPU_IEN], d->regs[NV_PAPU_ISTS]); // d->regs[NV_PAPU_IEN], d->regs[NV_PAPU_ISTS]);
pci_irq_assert(&d->dev); pci_irq_assert(PCI_DEVICE(d));
} else { } else {
qatomic_and(&d->regs[NV_PAPU_ISTS], ~NV_PAPU_ISTS_GINTSTS); qatomic_and(&d->regs[NV_PAPU_ISTS], ~NV_PAPU_ISTS_GINTSTS);
// fprintf(stderr, "mcpx irq lower ien=%08x ists=%08x\n", // fprintf(stderr, "mcpx irq lower ien=%08x ists=%08x\n",
// d->regs[NV_PAPU_IEN], d->regs[NV_PAPU_ISTS]); // d->regs[NV_PAPU_IEN], d->regs[NV_PAPU_ISTS]);
pci_irq_deassert(&d->dev); pci_irq_deassert(PCI_DEVICE(d));
} }
} }
@ -2313,7 +2316,7 @@ static void mcpx_apu_realize(PCIDevice *dev, Error **errp)
"mcpx-apu-ep", 0x10000); "mcpx-apu-ep", 0x10000);
memory_region_add_subregion(&d->mmio, 0x50000, &d->ep.mmio); memory_region_add_subregion(&d->mmio, 0x50000, &d->ep.mmio);
pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio); pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);
} }
static void mcpx_apu_exitfn(PCIDevice *dev) static void mcpx_apu_exitfn(PCIDevice *dev)
@ -2481,7 +2484,7 @@ static const VMStateDescription vmstate_mcpx_apu = {
.pre_load = mcpx_apu_pre_load, .pre_load = mcpx_apu_pre_load,
.post_load = mcpx_apu_post_load, .post_load = mcpx_apu_post_load,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, MCPXAPUState), VMSTATE_PCI_DEVICE(parent_obj, MCPXAPUState),
VMSTATE_STRUCT_POINTER(gp.dsp, MCPXAPUState, vmstate_vp_dsp_state, VMSTATE_STRUCT_POINTER(gp.dsp, MCPXAPUState, vmstate_vp_dsp_state,
DSPState), DSPState),
VMSTATE_UINT32_ARRAY(gp.regs, MCPXAPUState, 0x10000), VMSTATE_UINT32_ARRAY(gp.regs, MCPXAPUState, 0x10000),