summaryrefslogtreecommitdiff
path: root/hw/ppc.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-01-18 15:57:51 +0100
committerAndreas Färber <afaerber@suse.de>2013-02-16 14:50:59 +0100
commitf3273ba643f2d0221492381b24bbc35fb6089a48 (patch)
treeb50f0b68f7071a957da30e609d5b17c37e7dda4f /hw/ppc.c
parent25733eada6c1d4928262e77e2ee1e9ed12de18fb (diff)
downloadqemu-f3273ba643f2d0221492381b24bbc35fb6089a48.tar.gz
ppc405_uc: Pass PowerPCCPU to ppc40x_{core,chip,system}_reset()
Prepares for changing cpu_interrupt() argument to CPUState. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/ppc.c')
-rw-r--r--hw/ppc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/ppc.c b/hw/ppc.c
index 6053bd5652..8cfb84fa13 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -300,20 +300,20 @@ static void ppc40x_set_irq(void *opaque, int pin, int level)
if (level) {
LOG_IRQ("%s: reset the PowerPC system\n",
__func__);
- ppc40x_system_reset(env);
+ ppc40x_system_reset(cpu);
}
break;
case PPC40x_INPUT_RESET_CHIP:
if (level) {
LOG_IRQ("%s: reset the PowerPC chip\n", __func__);
- ppc40x_chip_reset(env);
+ ppc40x_chip_reset(cpu);
}
break;
case PPC40x_INPUT_RESET_CORE:
/* XXX: TODO: update DBSR[MRR] */
if (level) {
LOG_IRQ("%s: reset the PowerPC core\n", __func__);
- ppc40x_core_reset(env);
+ ppc40x_core_reset(cpu);
}
break;
case PPC40x_INPUT_CINT:
@@ -1011,13 +1011,13 @@ static void cpu_4xx_wdt_cb (void *opaque)
/* No reset */
break;
case 0x1: /* Core reset */
- ppc40x_core_reset(env);
+ ppc40x_core_reset(cpu);
break;
case 0x2: /* Chip reset */
- ppc40x_chip_reset(env);
+ ppc40x_chip_reset(cpu);
break;
case 0x3: /* System reset */
- ppc40x_system_reset(env);
+ ppc40x_system_reset(cpu);
break;
}
}