diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-31 02:04:00 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-31 02:04:00 +0000 |
| commit | 66c373bf01bd055ad89eca5d4b403513fbcf65cf (patch) | |
| tree | e2d0a4f7068567e184a9caf32e8b45281937c0b3 /c/src/lib/libcpu/powerpc/mpc6xx | |
| parent | 2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-66c373bf01bd055ad89eca5d4b403513fbcf65cf.tar.bz2 | |
2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>
* mpc505/timer/timer.c, mpc5xx/timer/timer.c,
mpc6xx/clock/c_clock.c, mpc6xx/timer/timer.c, mpc8260/clock/clock.c,
mpc8260/console-generic/console-generic.c, mpc8260/cpm/cp.c,
mpc8260/cpm/dpram.c, mpc8260/include/cpm.h, mpc8260/include/mmu.h,
mpc8260/include/mpc8260.h, mpc8260/mmu/mmu.c, mpc8260/timer/timer.c,
mpc8xx/clock/clock.c, mpc8xx/console-generic/console-generic.c,
mpc8xx/cpm/cp.c, mpc8xx/cpm/dpram.c, mpc8xx/include/cpm.h,
mpc8xx/include/mmu.h, mpc8xx/include/mpc8xx.h, mpc8xx/mmu/mmu.c,
mpc8xx/timer/timer.c, ppc403/clock/clock.c,
ppc403/console/console.c, ppc403/console/console405.c,
ppc403/ictrl/ictrl.c, ppc403/ictrl/ictrl.h, ppc403/timer/timer.c,
ppc403/tty_drv/tty_drv.c, rtems/powerpc/cache.h, shared/src/cache.c:
Convert to using c99 fixed size types.
Diffstat (limited to 'c/src/lib/libcpu/powerpc/mpc6xx')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c index 719b17bd85..b8cae5d011 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c +++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c @@ -33,13 +33,13 @@ extern int BSP_connect_clock_handler (void); * Clock ticks since initialization */ -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; /* * This is the value programmed into the count down timer. */ -rtems_unsigned32 Clock_Decrementer_value; +uint32_t Clock_Decrementer_value; /* * These are set by clock driver during its init @@ -92,7 +92,7 @@ void clockIsr() int clockIsOn(void* unused) { - unsigned32 msr_value; + uint32_t msr_value; _CPU_MSR_GET( msr_value ); if (msr_value & MSR_EE) return 1; diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c index 273f4cdee5..b502a90db1 100644 --- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c @@ -19,7 +19,7 @@ #include <rtems.h> #include <bsp.h> -rtems_unsigned64 Timer_driver_Start_time; +uint64_t Timer_driver_Start_time; rtems_boolean Timer_driver_Find_average_overhead = 0; unsigned clicks_overhead = 0; @@ -30,9 +30,9 @@ unsigned clicks_overhead = 0; int Timer_get_clicks_overhead() { - rtems_unsigned64 clicks; + uint64_t clicks; - PPC_Set_timebase_register((unsigned64) 0); + PPC_Set_timebase_register((uint64_t ) 0); clicks = PPC_Get_timebase_register(); assert(clicks <= 0xffffffff); clicks_overhead = (unsigned) clicks; @@ -50,7 +50,7 @@ void Timer_initialize() */ if (clicks_overhead == 0) clicks_overhead = Timer_get_clicks_overhead(); - PPC_Set_timebase_register((unsigned64) 0); + PPC_Set_timebase_register((uint64_t ) 0); } @@ -60,16 +60,16 @@ void Timer_initialize() int Read_timer() { - rtems_unsigned64 total64; - rtems_unsigned32 total; + uint64_t total64; + uint32_t total; /* approximately CLOCK_SPEED clicks per microsecond */ total64 = PPC_Get_timebase_register(); - assert( total64 <= 0xffffffff ); /* fits into a unsigned32 */ + assert( total64 <= 0xffffffff ); /* fits into a uint32_t */ - total = (rtems_unsigned32) total64; + total = (uint32_t ) total64; if ( Timer_driver_Find_average_overhead == 1 ) return total; /* in "clicks" of the decrementer units */ @@ -79,7 +79,7 @@ int Read_timer() unsigned long long Read_long_timer() { - rtems_unsigned64 total64; + uint64_t total64; total64 = PPC_Get_timebase_register(); return BSP_Convert_decrementer(total64 - clicks_overhead); |