RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
* 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.
This commit is contained in:
Ralf Corsepius
2004-03-31 02:04:00 +00:00
parent 35f9701021
commit 66c373bf01
32 changed files with 1183 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
c/src/lib/libcpu/powerpc/ChangeLog
View File

@@ -1,3 +1,19 @@
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.
2004-03-26 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Add 2nd argument (rtems_updir) to RTEMS_TOP.

2
c/src/lib/libcpu/powerpc/mpc505/timer/timer.c
View File

@@ -42,7 +42,7 @@ void Timer_initialize( void )
int Read_timer( void )
{
rtems_unsigned32 value;
uint32_t value;
asm volatile ( " mftb %0": "=r" (value) );
return value - lastInitValue;
}

2
c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c
View File

@@ -47,7 +47,7 @@ void Timer_initialize( void )
int Read_timer( void )
{
rtems_unsigned32 value;
uint32_t value;
asm volatile ( " mftb %0": "=r" (value) );
return value - lastInitValue;
}

6
c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c
View File

@@ -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;

18
c/src/lib/libcpu/powerpc/mpc6xx/timer/timer.c
View File

@@ -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);

6
c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c
View File

@@ -43,14 +43,14 @@
#include <mpc8260.h>
#include <bsp/irq.h>
volatile rtems_unsigned32 Clock_driver_ticks;
volatile uint32_t Clock_driver_ticks;
extern int BSP_get_clock_irq_level();
extern int BSP_connect_clock_handler(rtems_isr_entry);
extern int BSP_disconnect_clock_handler();
void Clock_exit( void );
rtems_unsigned32 decrementer_value;
uint32_t decrementer_value;
volatile int ClockInitialised = 0;
@@ -102,7 +102,7 @@ void clockOn(void* unused)
#if 0
unsigned desiredLevel;
rtems_unsigned32 pit_value;
uint32_t pit_value;
pit_value = (rtems_configuration_get_microseconds_per_tick() *
rtems_cpu_configuration_get_clicks_per_usec()) - 1 ;

4
c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c
View File

@@ -118,7 +118,7 @@ static int
m8xx_smc_set_attributes (int minor, const struct termios *t)
{
int baud, brg=0, csize=0, ssize, psize;
rtems_unsigned16 clen=0, cstopb, parenb, parodd, cread;
uint16_t clen=0, cstopb, parenb, parodd, cread;
/* Baud rate */
switch (t->c_cflag & CBAUD) {
@@ -232,7 +232,7 @@ static int
m8xx_scc_set_attributes (int minor, const struct termios *t)
{
int baud, brg=0;
rtems_unsigned16 csize=0, cstopb, parenb, parodd;
uint16_t csize=0, cstopb, parenb, parodd;
/* Baud rate */
switch (t->c_cflag & CBAUD) {

4
c/src/lib/libcpu/powerpc/mpc8260/cpm/cp.c
View File

@@ -20,9 +20,9 @@
* Send a command to the CPM RISC processer
*/
void m8xx_cp_execute_cmd( unsigned32 command )
void m8xx_cp_execute_cmd( uint32_t command )
{
rtems_unsigned16 lvl;
uint16_t lvl;
rtems_interrupt_disable(lvl);
while (m8260.cpcr & M8260_CR_FLG) {

2
c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c
View File

@@ -31,7 +31,7 @@ void rtems_panic(char *, int);
* - Dual-Port RAM section 3
*/
static struct {
unsigned8 *base;
uint8_t *base;
unsigned int size;
unsigned int used;
} dpram_regions[] = {

2
c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h
View File

@@ -96,7 +96,7 @@ extern "C" {
/* Functions */
void m8xx_cp_execute_cmd( unsigned32 command );
void m8xx_cp_execute_cmd( uint32_t command );
void *m8xx_dpram_allocate( unsigned int byte_count );
#define m8xx_bd_allocate(count) \

6
c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h
View File

@@ -23,9 +23,9 @@ extern "C" {
* Buffers in the MMU of an MPC8260.
*/
typedef struct {
unsigned32 mmu_epn; /* Effective Page Number */
unsigned32 mmu_twc; /* Tablewalk Control Register */
unsigned32 mmu_rpn; /* Real Page Number */
uint32_t mmu_epn; /* Effective Page Number */
uint32_t mmu_twc; /* Tablewalk Control Register */
uint32_t mmu_rpn; /* Real Page Number */
} MMU_TLB_table_t;
/*

1162
c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h
View File

File diff suppressed because it is too large Load Diff

2
c/src/lib/libcpu/powerpc/mpc8260/mmu/mmu.c
View File

@@ -40,7 +40,7 @@ void mmu_init( void )
#if 0
/* so far we leave mmu uninitialised */
register unsigned32 reg1, i;
register uint32_t reg1, i;
/*
* Initialize the TLBs

10
c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c
View File

@@ -50,7 +50,7 @@
#include <rtems.h>
#include <mpc8260.h>
static volatile rtems_unsigned32 Timer_starting;
static volatile uint32_t Timer_starting;
static rtems_boolean Timer_driver_Find_average_overhead;
extern rtems_cpu_table Cpu_table;
@@ -63,9 +63,9 @@ extern rtems_cpu_table Cpu_table;
/*
* This is so small that this code will be reproduced where needed.
*/
static inline rtems_unsigned32 get_itimer(void)
static inline uint32_t get_itimer(void)
{
rtems_unsigned32 ret;
uint32_t ret;
asm volatile ("mftb %0" : "=r" ((ret))); /* TBLO */
@@ -87,8 +87,8 @@ void Timer_initialize(void)
int Read_timer(void)
{
rtems_unsigned32 clicks;
rtems_unsigned32 total;
uint32_t clicks;
uint32_t total;
clicks = get_itimer();

4
c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c
View File

@@ -42,7 +42,7 @@
#include <stdlib.h> /* for atexit() */
#include <mpc8xx.h>
volatile rtems_unsigned32 Clock_driver_ticks;
volatile uint32_t Clock_driver_ticks;
extern volatile m8xx_t m8xx;
extern int BSP_get_clock_irq_level();
extern int BSP_connect_clock_handler(rtems_isr_entry);
@@ -70,7 +70,7 @@ rtems_isr Clock_isr(rtems_vector_number vector)
void clockOn(void* unused)
{
unsigned desiredLevel;
rtems_unsigned32 pit_value;
uint32_t pit_value;
pit_value = (rtems_configuration_get_microseconds_per_tick() *
rtems_cpu_configuration_get_clicks_per_usec()) - 1 ;

4
c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c
View File

@@ -181,7 +181,7 @@ static int
m8xx_smc_set_attributes (int minor, const struct termios *t)
{
int baud, brg=0, csize=0, ssize, psize;
rtems_unsigned16 clen=0, cstopb, parenb, parodd, cread;
uint16_t clen=0, cstopb, parenb, parodd, cread;
/* Baud rate */
switch (t->c_cflag & CBAUD) {
@@ -277,7 +277,7 @@ static int
m8xx_scc_set_attributes (int minor, const struct termios *t)
{
int baud, brg=0;
rtems_unsigned16 csize=0, cstopb, parenb, parodd;
uint16_t csize=0, cstopb, parenb, parodd;
/* Baud rate */
switch (t->c_cflag & CBAUD) {

4
c/src/lib/libcpu/powerpc/mpc8xx/cpm/cp.c
View File

@@ -20,9 +20,9 @@
* Send a command to the CPM RISC processer
*/
void m8xx_cp_execute_cmd( unsigned16 command )
void m8xx_cp_execute_cmd( uint16_t command )
{
rtems_unsigned16 lvl;
uint16_t lvl;
rtems_interrupt_disable(lvl);
while (m8xx.cpcr & M8xx_CR_FLG) {

2
c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c
View File

@@ -28,7 +28,7 @@ extern void rtems_panic(char *, int);
* - Dual-Port RAM section 4
*/
static struct {
unsigned8 *base;
uint8_t *base;
unsigned int size;
unsigned int used;
} dpram_regions[] = {

2
c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h
View File

@@ -20,7 +20,7 @@ extern "C" {
/* Functions */
void m8xx_cp_execute_cmd( unsigned16 command );
void m8xx_cp_execute_cmd( uint16_t command );
void *m8xx_dpram_allocate( unsigned int byte_count );
#define m8xx_bd_allocate(count) \

6
c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h
View File

@@ -23,9 +23,9 @@ extern "C" {
* Buffers in the MMU of an MPC8xx.
*/
typedef struct {
unsigned32 mmu_epn; /* Effective Page Number */
unsigned32 mmu_twc; /* Tablewalk Control Register */
unsigned32 mmu_rpn; /* Real Page Number */
uint32_t mmu_epn; /* Effective Page Number */
uint32_t mmu_twc; /* Tablewalk Control Register */
uint32_t mmu_rpn; /* Real Page Number */
} MMU_TLB_table_t;
/*

968
c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h
View File

File diff suppressed because it is too large Load Diff

2
c/src/lib/libcpu/powerpc/mpc8xx/mmu/mmu.c
View File

@@ -34,7 +34,7 @@
*/
void mmu_init( void )
{
register unsigned32 reg1, i;
register uint32_t reg1, i;
/*
* Initialize the TLBs

10
c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c
View File

@@ -45,15 +45,15 @@
#include <rtems.h>
#include <mpc8xx.h>
static volatile rtems_unsigned32 Timer_starting;
static volatile uint32_t Timer_starting;
static rtems_boolean Timer_driver_Find_average_overhead;
/*
* This is so small that this code will be reproduced where needed.
*/
static inline rtems_unsigned32 get_itimer(void)
static inline uint32_t get_itimer(void)
{
rtems_unsigned32 ret;
uint32_t ret;
asm volatile ("mftb %0" : "=r" ((ret))); /* TBLO */
@@ -79,8 +79,8 @@ void Timer_initialize(void)
int Read_timer(void)
{
rtems_unsigned32 clicks;
rtems_unsigned32 total;
uint32_t clicks;
uint32_t total;
clicks = get_itimer();

22
c/src/lib/libcpu/powerpc/ppc403/clock/clock.c
View File

@@ -43,8 +43,8 @@
#include <stdlib.h> /* for atexit() */
volatile rtems_unsigned32 Clock_driver_ticks;
static rtems_unsigned32 pit_value, tick_time;
volatile uint32_t Clock_driver_ticks;
static uint32_t pit_value, tick_time;
static rtems_boolean auto_restart;
void Clock_exit( void );
@@ -62,9 +62,9 @@ rtems_isr_entry set_vector( /* returns old vector */
rtems_device_major_number rtems_clock_major = ~0;
rtems_device_minor_number rtems_clock_minor;
static inline rtems_unsigned32 get_itimer(void)
static inline uint32_t get_itimer(void)
{
register rtems_unsigned32 rc;
register uint32_t rc;
#ifndef ppc405 /* this is a ppc403 */
asm volatile ("mfspr %0, 0x3dd" : "=r" ((rc))); /* TBLO */
@@ -82,10 +82,10 @@ static inline rtems_unsigned32 get_itimer(void)
rtems_isr
Clock_isr(rtems_vector_number vector)
{
rtems_unsigned32 clicks_til_next_interrupt;
uint32_t clicks_til_next_interrupt;
if (!auto_restart)
{
rtems_unsigned32 itimer_value;
uint32_t itimer_value;
/*
* setup for next interrupt; making sure the new value is reasonably
* in the future.... in case we lost out on an interrupt somehow
@@ -141,10 +141,10 @@ Clock_isr(rtems_vector_number vector)
void Install_clock(rtems_isr_entry clock_isr)
{
rtems_isr_entry previous_isr;
rtems_unsigned32 iocr;
register rtems_unsigned32 tcr;
uint32_t iocr;
register uint32_t tcr;
#ifdef ppc403
rtems_unsigned32 pvr;
uint32_t pvr;
#endif /* ppc403 */
Clock_driver_ticks = 0;
@@ -225,7 +225,7 @@ void
ReInstall_clock(rtems_isr_entry new_clock_isr)
{
rtems_isr_entry previous_isr;
rtems_unsigned32 isrlevel = 0;
uint32_t isrlevel = 0;
rtems_interrupt_disable(isrlevel);
@@ -246,7 +246,7 @@ ReInstall_clock(rtems_isr_entry new_clock_isr)
void
Clock_exit(void)
{
register rtems_unsigned32 tcr;
register uint32_t tcr;
asm volatile ("mfspr %0, 0x3da" : "=r" ((tcr))); /* TCR */

4
c/src/lib/libcpu/powerpc/ppc403/console/console.c
View File

@@ -206,9 +206,9 @@ spiStopRemoteTx (int minor)
}
void
spiBaudSet(unsigned32 baudrate)
spiBaudSet(uint32_t baudrate)
{
unsigned32 tmp;
uint32_t tmp;
tmp = rtems_cpu_configuration_get_serial_per_sec() / baudrate;
tmp = ((tmp) >> 4) - 1;
port->BRDL = tmp & 0xff;

4
c/src/lib/libcpu/powerpc/ppc403/console/console405.c
View File

@@ -191,9 +191,9 @@ int round(double x)
}
void
spiBaudSet(unsigned32 baudrate)
spiBaudSet(uint32_t baudrate)
{
unsigned32 tmp;
uint32_t tmp;
tmp = round( (double)rtems_cpu_configuration_get_serial_per_sec() / (baudrate * 16) );

38
c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c
View File

@@ -45,7 +45,7 @@ rtems_isr_entry ictrl_vector_table[PPC_IRQ_EXT_MAX];
*/
#if defined(ppc405)
RTEMS_INLINE_ROUTINE void
clr_exisr(unsigned32 mask)
clr_exisr(uint32_t mask)
{
asm volatile ("mtdcr 0xC0,%0"::"r" (mask));/*EXISR*/
}
@@ -53,10 +53,10 @@ clr_exisr(unsigned32 mask)
/*
* get value of EXISR
*/
RTEMS_INLINE_ROUTINE unsigned32
RTEMS_INLINE_ROUTINE uint32_t
get_exisr(void)
{
unsigned32 val;
uint32_t val;
asm volatile ("mfdcr %0,0xC0":"=r" (val));/*EXISR*/
return val;
@@ -65,10 +65,10 @@ get_exisr(void)
/*
* get value of EXIER
*/
RTEMS_INLINE_ROUTINE unsigned32
RTEMS_INLINE_ROUTINE uint32_t
get_exier(void)
{
unsigned32 val;
uint32_t val;
asm volatile ("mfdcr %0,0xC2":"=r" (val));/*EXIER*/
return val;
}
@@ -77,7 +77,7 @@ get_exier(void)
* set value of EXIER
*/
RTEMS_INLINE_ROUTINE void
set_exier(unsigned32 val)
set_exier(uint32_t val)
{
asm volatile ("mtdcr 0xC2,%0"::"r" (val));/*EXIER*/
}
@@ -85,7 +85,7 @@ set_exier(unsigned32 val)
#else /* not ppc405 */
RTEMS_INLINE_ROUTINE void
clr_exisr(unsigned32 mask)
clr_exisr(uint32_t mask)
{
asm volatile ("mtdcr 0x40,%0"::"r" (mask));/*EXISR*/
}
@@ -93,10 +93,10 @@ clr_exisr(unsigned32 mask)
/*
* get value of EXISR
*/
RTEMS_INLINE_ROUTINE unsigned32
RTEMS_INLINE_ROUTINE uint32_t
get_exisr(void)
{
unsigned32 val;
uint32_t val;
asm volatile ("mfdcr %0,0x40":"=r" (val));/*EXISR*/
return val;
@@ -105,10 +105,10 @@ get_exisr(void)
/*
* get value of EXIER
*/
RTEMS_INLINE_ROUTINE unsigned32
RTEMS_INLINE_ROUTINE uint32_t
get_exier(void)
{
unsigned32 val;
uint32_t val;
asm volatile ("mfdcr %0,0x42":"=r" (val));/*EXIER*/
return val;
}
@@ -117,7 +117,7 @@ get_exier(void)
* set value of EXIER
*/
RTEMS_INLINE_ROUTINE void
set_exier(unsigned32 val)
set_exier(uint32_t val)
{
asm volatile ("mtdcr 0x42,%0"::"r" (val));/*EXIER*/
}
@@ -126,9 +126,9 @@ set_exier(unsigned32 val)
* enable an external interrupt, make this interrupt consistent
*/
RTEMS_INLINE_ROUTINE void
enable_ext_irq( unsigned32 mask)
enable_ext_irq( uint32_t mask)
{
unsigned32 isrlvl;
uint32_t isrlvl;
_CPU_ISR_Disable(isrlvl);
set_exier(get_exier() | ((mask)&PPC_EXI_MASK));
_CPU_ISR_Enable(isrlvl);
@@ -138,9 +138,9 @@ enable_ext_irq( unsigned32 mask)
* disable an external interrupt, make this interrupt consistent
*/
RTEMS_INLINE_ROUTINE void
disable_ext_irq( unsigned32 mask)
disable_ext_irq( uint32_t mask)
{
unsigned32 isrlvl;
uint32_t isrlvl;
_CPU_ISR_Disable(isrlvl);
set_exier(get_exier() & ~(mask) & PPC_EXI_MASK);
_CPU_ISR_Enable(isrlvl);
@@ -155,7 +155,7 @@ disable_ext_irq( unsigned32 mask)
*
*/
void
ictrl_spurious_handler(unsigned32 spurious_mask,
ictrl_spurious_handler(uint32_t spurious_mask,
CPU_Interrupt_frame *cpu_frame)
{
int v;
@@ -183,7 +183,7 @@ ictrl_spurious_handler(unsigned32 spurious_mask,
void
ictrl_isr(rtems_vector_number vector,CPU_Interrupt_frame *cpu_frame)
{
unsigned32 istat,
uint32_t istat,
mask,
global_vec;
int exvec;
@@ -223,7 +223,7 @@ ictrl_isr(rtems_vector_number vector,CPU_Interrupt_frame *cpu_frame)
*/
rtems_status_code
ictrl_set_vector(rtems_isr_entry new_handler,
unsigned32 vector,
uint32_t vector,
rtems_isr_entry *old_handler
)
{

2
c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h
View File

@@ -78,7 +78,7 @@ extern "C" {
*/
rtems_status_code
ictrl_set_vector(rtems_isr_entry new_handler,
unsigned32 vector,
uint32_t vector,
rtems_isr_entry *old_handler
);
/*

12
c/src/lib/libcpu/powerpc/ppc403/timer/timer.c
View File

@@ -38,15 +38,15 @@
#include <rtems.h>
static volatile rtems_unsigned32 Timer_starting;
static volatile uint32_t Timer_starting;
static rtems_boolean Timer_driver_Find_average_overhead;
/*
* This is so small that this code will be reproduced where needed.
*/
static inline rtems_unsigned32 get_itimer(void)
static inline uint32_t get_itimer(void)
{
rtems_unsigned32 ret;
uint32_t ret;
#ifndef ppc405
asm volatile ("mfspr %0, 0x3dd" : "=r" ((ret))); /* TBLO */
@@ -61,7 +61,7 @@ static inline rtems_unsigned32 get_itimer(void)
void Timer_initialize()
{
rtems_unsigned32 iocr;
uint32_t iocr;
#ifndef ppc405
asm volatile ("mfdcr %0, 0xa0" : "=r" (iocr)); /* IOCR */
@@ -84,8 +84,8 @@ void Timer_initialize()
int Read_timer()
{
rtems_unsigned32 clicks;
rtems_unsigned32 total;
uint32_t clicks;
uint32_t total;
clicks = get_itimer();

4
c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c
View File

@@ -150,9 +150,9 @@ int tty0_round(double x)
}
void
tty0BaudSet(unsigned32 baudrate)
tty0BaudSet(uint32_t baudrate)
{
unsigned32 tmp;
uint32_t tmp;
tmp = tty0_round( (double)rtems_cpu_configuration_get_serial_per_sec() / (baudrate * 16) );

4
c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h
View File

@@ -12,7 +12,7 @@
#if (PPC_D_CACHE != 0)
#define _CPU_Data_Cache_Block_Flush( _address ) \
do { register void *__address = (_address); \
register unsigned32 _zero = 0; \
register uint32_t _zero = 0; \
asm volatile ( "dcbf %0,%1" : \
"=r" (_zero), "=r" (__address) : \
"0" (_zero), "1" (__address) \
@@ -28,7 +28,7 @@
#if (PPC_D_CACHE != 0)
#define _CPU_Data_Cache_Block_Invalidate( _address ) \
do { register void *__address = (_address); \
register unsigned32 _zero = 0; \
register uint32_t _zero = 0; \
asm volatile ( "dcbi %0,%1" : \
"=r" (_zero), "=r" (__address) : \
"0" (_zero), "1" (__address) \

16
c/src/lib/libcpu/powerpc/shared/src/cache.c
View File

@@ -47,7 +47,7 @@
void _CPU_cache_enable_data (
void )
{
unsigned32 value;
uint32_t value;
PPC_Get_HID0( value );
value |= 0x00004000; /* set DCE bit */
PPC_Set_HID0( value );
@@ -56,7 +56,7 @@ void _CPU_cache_enable_data (
void _CPU_cache_disable_data (
void )
{
unsigned32 value;
uint32_t value;
PPC_Get_HID0( value );
value &= 0xFFFFBFFF; /* clear DCE bit */
PPC_Set_HID0( value );
@@ -65,7 +65,7 @@ void _CPU_cache_disable_data (
void _CPU_cache_enable_instruction (
void )
{
unsigned32 value;
uint32_t value;
PPC_Get_HID0( value );
value |= 0x00008000; /* Set ICE bit */
PPC_Set_HID0( value );
@@ -74,7 +74,7 @@ void _CPU_cache_enable_instruction (
void _CPU_cache_disable_instruction (
void )
{
unsigned32 value;
uint32_t value;
PPC_Get_HID0( value );
value &= 0xFFFF7FFF; /* Clear ICE bit */
PPC_Set_HID0( value );
@@ -108,7 +108,7 @@ void _CPU_cache_unfreeze_data ( void ) {}
void _CPU_cache_enable_data ( void )
{
unsigned32 r1;
uint32_t r1;
r1 = (0x2<<24);
mtspr( 568, r1 );
isync;
@@ -116,7 +116,7 @@ void _CPU_cache_enable_data ( void )
void _CPU_cache_disable_data ( void )
{
unsigned32 r1;
uint32_t r1;
r1 = (0x4<<24);
mtspr( 568, r1 );
isync;
@@ -135,7 +135,7 @@ void _CPU_cache_unfreeze_instruction ( void ) {}
void _CPU_cache_enable_instruction ( void )
{
unsigned32 r1;
uint32_t r1;
r1 = (0x2<<24);
mtspr( 560, r1 );
isync;
@@ -143,7 +143,7 @@ void _CPU_cache_enable_instruction ( void )
void _CPU_cache_disable_instruction ( void )
{
unsigned32 r1;
uint32_t r1;
r1 = (0x4<<24);
mtspr( 560, r1 );
isync;