aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2009-11-07 10:36:04 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-11-07 10:36:04 +0000
commitd84bda46de13c7d1536545fb44c8e9341054094a (patch)
treece07f90a8ff96475ba558c3f0bec18746e51a0c6 /hw
parent44a9935465b1cd79547807a431232177362ef43e (diff)
PPC: rename cpu_ppc_reset to cpu_reset for consistency
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/ppc.c4
-rw-r--r--hw/ppc405_uc.c4
-rw-r--r--hw/ppc4xx_devs.c2
-rw-r--r--hw/ppc_newworld.c2
-rw-r--r--hw/ppc_oldworld.c2
-rw-r--r--hw/ppc_prep.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/hw/ppc.c b/hw/ppc.c
index 2502e2187b..52080394fe 100644
--- a/hw/ppc.c
+++ b/hw/ppc.c
@@ -123,7 +123,7 @@ static void ppc6xx_set_irq (void *opaque, int pin, int level)
env->interrupt_request |= CPU_INTERRUPT_EXITTB;
/* XXX: TOFIX */
#if 0
- cpu_ppc_reset(env);
+ cpu_reset(env);
#else
qemu_system_reset_request();
#endif
@@ -1088,7 +1088,7 @@ int ppc_dcr_init (CPUState *env, int (*read_error)(int dcrn),
#if 0
/*****************************************************************************/
/* Handle system reset (for now, just stop emulation) */
-void cpu_ppc_reset (CPUState *env)
+void cpu_reset(CPUState *env)
{
printf("Reset asked... Stop emulation\n");
abort();
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c
index 983eef30f3..052f9022f2 100644
--- a/hw/ppc405_uc.c
+++ b/hw/ppc405_uc.c
@@ -1805,7 +1805,7 @@ void ppc40x_core_reset (CPUState *env)
env->interrupt_request |= CPU_INTERRUPT_EXITTB;
/* XXX: TOFIX */
#if 0
- cpu_ppc_reset(env);
+ cpu_reset(env);
#else
qemu_system_reset_request();
#endif
@@ -1823,7 +1823,7 @@ void ppc40x_chip_reset (CPUState *env)
env->interrupt_request |= CPU_INTERRUPT_EXITTB;
/* XXX: TOFIX */
#if 0
- cpu_ppc_reset(env);
+ cpu_reset(env);
#else
qemu_system_reset_request();
#endif
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index 98d40d0096..7921ebfb4a 100644
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -60,7 +60,7 @@ CPUState *ppc4xx_init (const char *cpu_model,
tb_clk->opaque = env;
ppc_dcr_init(env, NULL, NULL);
/* Register qemu callbacks */
- qemu_register_reset(&cpu_ppc_reset, env);
+ qemu_register_reset((QEMUResetHandler*)&cpu_reset, env);
return env;
}
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index d9f45b5b45..da868d302b 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -130,7 +130,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
#if 0
env->osi_call = vga_osi_call;
#endif
- qemu_register_reset(&cpu_ppc_reset, env);
+ qemu_register_reset((QEMUResetHandler*)&cpu_reset, env);
envs[i] = env;
}
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 3f237136ad..9b49a3dbdd 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -158,7 +158,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
/* Set time-base frequency to 16.6 Mhz */
cpu_ppc_tb_init(env, 16600000UL);
env->osi_call = vga_osi_call;
- qemu_register_reset(&cpu_ppc_reset, env);
+ qemu_register_reset((QEMUResetHandler*)&cpu_reset, env);
envs[i] = env;
}
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index e674e454bd..cd561e10c6 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -586,7 +586,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
/* Set time-base frequency to 100 Mhz */
cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL);
}
- qemu_register_reset(&cpu_ppc_reset, env);
+ qemu_register_reset((QEMUResetHandler*)&cpu_reset, env);
envs[i] = env;
}