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

ipoctal232: QOM parent field cleanup 

Clean up accesses to IPOctalState::dev field and rename it.

Acked-by: Alberto Garcia <agarcia@igalia.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-08-01 18:51:35 +02:00
parent 227d327252
commit 08c9cacf0e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/char/ipoctal232.c
View File

@ -108,7 +108,8 @@ struct SCC2698Block {
}; };
struct IPOctalState { struct IPOctalState {
IPackDevice dev; IPackDevice parent_obj;
SCC2698Channel ch[N_CHANNELS]; SCC2698Channel ch[N_CHANNELS];
SCC2698Block blk[N_BLOCKS]; SCC2698Block blk[N_BLOCKS];
uint8_t irq_vector; uint8_t irq_vector;
@ -154,7 +155,7 @@ static const VMStateDescription vmstate_ipoctal = {
.minimum_version_id = 1, .minimum_version_id = 1,
.minimum_version_id_old = 1, .minimum_version_id_old = 1,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_IPACK_DEVICE(dev, IPOctalState), VMSTATE_IPACK_DEVICE(parent_obj, IPOctalState),
VMSTATE_STRUCT_ARRAY(ch, IPOctalState, N_CHANNELS, 1, VMSTATE_STRUCT_ARRAY(ch, IPOctalState, N_CHANNELS, 1,
vmstate_scc2698_channel, SCC2698Channel), vmstate_scc2698_channel, SCC2698Channel),
VMSTATE_STRUCT_ARRAY(blk, IPOctalState, N_BLOCKS, 1, VMSTATE_STRUCT_ARRAY(blk, IPOctalState, N_BLOCKS, 1,
@ -172,6 +173,7 @@ static const uint8_t id_prom_data[] = {
static void update_irq(IPOctalState *dev, unsigned block) static void update_irq(IPOctalState *dev, unsigned block)
{ {
IPackDevice *idev = IPACK_DEVICE(dev);
/* Blocks A and B interrupt on INT0#, C and D on INT1#. /* Blocks A and B interrupt on INT0#, C and D on INT1#.
Thus, to get the status we have to check two blocks. */ Thus, to get the status we have to check two blocks. */
SCC2698Block *blk0 = &dev->blk[block]; SCC2698Block *blk0 = &dev->blk[block];
@ -179,9 +181,9 @@ static void update_irq(IPOctalState *dev, unsigned block)
unsigned intno = block / 2; unsigned intno = block / 2;
if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) { if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) {
qemu_irq_raise(dev->dev.irq[intno]); qemu_irq_raise(idev->irq[intno]);
} else { } else {
qemu_irq_lower(dev->dev.irq[intno]); qemu_irq_lower(idev->irq[intno]);
} }
} }