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 | |
| 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 '')
32 files changed, 1186 insertions, 1170 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 570567d428..0a32ec25fd 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -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. diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc505/timer/timer.c index 510cf39e11..df668c57cb 100644 --- a/c/src/lib/libcpu/powerpc/mpc505/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc505/timer/timer.c @@ -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; } diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c index f7741dcfe3..3139e62d6d 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc5xx/timer/timer.c @@ -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; } 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); diff --git a/c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c b/c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c index 31837a16ce..aebe441729 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/clock/clock.c @@ -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 ; diff --git a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c index 517f5070d9..be270c36c5 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/console-generic/console-generic.c @@ -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) { diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/cp.c b/c/src/lib/libcpu/powerpc/mpc8260/cpm/cp.c index cfcae7b325..9840f2629e 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/cpm/cp.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/cpm/cp.c @@ -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) { diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c b/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c index 84030b7528..3136098cd8 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c @@ -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[] = { diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h b/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h index 06b4f8507d..194fa07640 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h +++ b/c/src/lib/libcpu/powerpc/mpc8260/include/cpm.h @@ -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) \ diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h b/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h index 05407265b3..f035da3103 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h +++ b/c/src/lib/libcpu/powerpc/mpc8260/include/mmu.h @@ -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; /* diff --git a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h b/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h index a7c2216a18..729d36c3e5 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h +++ b/c/src/lib/libcpu/powerpc/mpc8260/include/mpc8260.h @@ -66,8 +66,8 @@ * Memory controller registers */ typedef struct m8260MEMCRegisters_ { - rtems_unsigned32 br; - rtems_unsigned32 _or; /* or is a C++ keyword :( */ + uint32_t br; + uint32_t _or; /* or is a C++ keyword :( */ } m8260MEMCRegisters_t; @@ -75,20 +75,20 @@ typedef struct m8260MEMCRegisters_ { * Fast Communication Controller Registers */ typedef struct m8260FCCRegisters_ { - rtems_unsigned32 gfmr; - rtems_unsigned32 fpsmr; - rtems_unsigned16 ftodr; - rtems_unsigned8 fcc_pad0[2]; - rtems_unsigned16 fdsr; - rtems_unsigned8 fcc_pad1[2]; - rtems_unsigned32 fcce; - rtems_unsigned32 fccm; - rtems_unsigned8 fccs; - rtems_unsigned8 fcc_pad2[3]; - rtems_unsigned8 ftirr_phy0; /* n/a on FCC3 */ - rtems_unsigned8 ftirr_phy1; /* n/a on FCC3 */ - rtems_unsigned8 ftirr_phy2; /* n/a on FCC3 */ - rtems_unsigned8 ftirr_phy3; /* n/a on FCC3 */ + uint32_t gfmr; + uint32_t fpsmr; + uint16_t ftodr; + uint8_t fcc_pad0[2]; + uint16_t fdsr; + uint8_t fcc_pad1[2]; + uint32_t fcce; + uint32_t fccm; + uint8_t fccs; + uint8_t fcc_pad2[3]; + uint8_t ftirr_phy0; /* n/a on FCC3 */ + uint8_t ftirr_phy1; /* n/a on FCC3 */ + uint8_t ftirr_phy2; /* n/a on FCC3 */ + uint8_t ftirr_phy3; /* n/a on FCC3 */ } m8260FCCRegisters_t; @@ -96,31 +96,31 @@ typedef struct m8260FCCRegisters_ { * Serial Communications Controller registers */ typedef struct m8260SCCRegisters_ { - rtems_unsigned32 gsmr_l; - rtems_unsigned32 gsmr_h; - rtems_unsigned16 psmr; - rtems_unsigned8 scc_pad0[2]; - rtems_unsigned16 todr; - rtems_unsigned16 dsr; - rtems_unsigned16 scce; - rtems_unsigned8 scc_pad2[2]; - rtems_unsigned16 sccm; - rtems_unsigned8 scc_pad3[1]; - rtems_unsigned8 sccs; - rtems_unsigned8 scc_pad1[8]; + uint32_t gsmr_l; + uint32_t gsmr_h; + uint16_t psmr; + uint8_t scc_pad0[2]; + uint16_t todr; + uint16_t dsr; + uint16_t scce; + uint8_t scc_pad2[2]; + uint16_t sccm; + uint8_t scc_pad3[1]; + uint8_t sccs; + uint8_t scc_pad1[8]; } m8260SCCRegisters_t; /* * Serial Management Controller registers */ typedef struct m8260SMCRegisters_ { - rtems_unsigned8 smc_pad0[2]; - rtems_unsigned16 smcmr; - rtems_unsigned8 smc_pad2[2]; - rtems_unsigned8 smce; - rtems_unsigned8 smc_pad3[3]; - rtems_unsigned8 smcm; - rtems_unsigned8 smc_pad1[5]; + uint8_t smc_pad0[2]; + uint16_t smcmr; + uint8_t smc_pad2[2]; + uint8_t smce; + uint8_t smc_pad3[3]; + uint8_t smcm; + uint8_t smc_pad1[5]; } m8260SMCRegisters_t; @@ -128,17 +128,17 @@ typedef struct m8260SMCRegisters_ { * Serial Interface With Time Slot Assigner Registers */ typedef struct m8260SIRegisters_ { - rtems_unsigned16 siamr; - rtems_unsigned16 sibmr; - rtems_unsigned16 sicmr; - rtems_unsigned16 sidmr; - rtems_unsigned8 sigmr; - rtems_unsigned8 si_pad0[1]; - rtems_unsigned8 sicmdr; - rtems_unsigned8 si_pad1[1]; - rtems_unsigned8 sistr; - rtems_unsigned8 si_pad2[1]; - rtems_unsigned16 sirsr; + uint16_t siamr; + uint16_t sibmr; + uint16_t sicmr; + uint16_t sidmr; + uint8_t sigmr; + uint8_t si_pad0[1]; + uint8_t sicmdr; + uint8_t si_pad1[1]; + uint8_t sistr; + uint8_t si_pad2[1]; + uint16_t sirsr; } m8260SIRegisters_t; @@ -146,12 +146,12 @@ typedef struct m8260SIRegisters_ { * Multi Channel Controller registers */ typedef struct m8260MCCRegisters_ { - rtems_unsigned16 mcce; - rtems_unsigned8 mcc_pad2[2]; - rtems_unsigned16 mccm; - rtems_unsigned16 mcc_pad0; - rtems_unsigned8 mccf; - rtems_unsigned8 mcc_pad1[7]; + uint16_t mcce; + uint8_t mcc_pad2[2]; + uint16_t mccm; + uint16_t mcc_pad0; + uint8_t mccf; + uint8_t mcc_pad1[7]; } m8260MCCRegisters_t; @@ -162,12 +162,12 @@ typedef struct m8260MCCRegisters_ { */ /* typedef struct m8260TimerParms_ { - rtems_unsigned16 tm_base; - rtems_unsigned16 _tm_ptr; - rtems_unsigned16 _r_tmr; - rtems_unsigned16 _r_tmv; - rtems_unsigned32 tm_cmd; - rtems_unsigned32 tm_cnt; + uint16_t tm_base; + uint16_t _tm_ptr; + uint16_t _r_tmr; + uint16_t _r_tmv; + uint32_t tm_cmd; + uint32_t tm_cnt; } m8260TimerParms_t; */ @@ -215,24 +215,24 @@ typedef struct m8260TimerParms_ { ************************************************************************* */ typedef struct m8260IDMAparms_ { - rtems_unsigned16 ibase; - rtems_unsigned16 dcm; - rtems_unsigned16 ibdptr; - rtems_unsigned16 dpr_buf; - rtems_unsigned16 _buf_inv; - rtems_unsigned16 ssmax; - rtems_unsigned16 _dpr_in_ptr; - rtems_unsigned16 sts; - rtems_unsigned16 _dpr_out_ptr; - rtems_unsigned16 seob; - rtems_unsigned16 deob; - rtems_unsigned16 dts; - rtems_unsigned16 _ret_add; - rtems_unsigned16 reserved; - rtems_unsigned32 _bd_cnt; - rtems_unsigned32 _s_ptr; - rtems_unsigned32 _d_ptr; - rtems_unsigned32 istate; + uint16_t ibase; + uint16_t dcm; + uint16_t ibdptr; + uint16_t dpr_buf; + uint16_t _buf_inv; + uint16_t ssmax; + uint16_t _dpr_in_ptr; + uint16_t sts; + uint16_t _dpr_out_ptr; + uint16_t seob; + uint16_t deob; + uint16_t dts; + uint16_t _ret_add; + uint16_t reserved; + uint32_t _bd_cnt; + uint32_t _s_ptr; + uint32_t _d_ptr; + uint32_t istate; } m8260IDMAparms_t; @@ -244,125 +244,125 @@ typedef struct m8260IDMAparms_ { typedef struct m8260SCCparms_ { - rtems_unsigned16 rbase; - rtems_unsigned16 tbase; - rtems_unsigned8 rfcr; - rtems_unsigned8 tfcr; - rtems_unsigned16 mrblr; - rtems_unsigned32 _rstate; - rtems_unsigned32 _pad0; - rtems_unsigned16 _rbptr; - rtems_unsigned16 _pad1; - rtems_unsigned32 _pad2; - rtems_unsigned32 _tstate; - rtems_unsigned32 _pad3; - rtems_unsigned16 _tbptr; - rtems_unsigned16 _pad4; - rtems_unsigned32 _pad5; - rtems_unsigned32 _rcrc; - rtems_unsigned32 _tcrc; + uint16_t rbase; + uint16_t tbase; + uint8_t rfcr; + uint8_t tfcr; + uint16_t mrblr; + uint32_t _rstate; + uint32_t _pad0; + uint16_t _rbptr; + uint16_t _pad1; + uint32_t _pad2; + uint32_t _tstate; + uint32_t _pad3; + uint16_t _tbptr; + uint16_t _pad4; + uint32_t _pad5; + uint32_t _rcrc; + uint32_t _tcrc; union { struct { - rtems_unsigned32 _res0; - rtems_unsigned32 _res1; - rtems_unsigned16 max_idl; - rtems_unsigned16 idlc; - rtems_unsigned16 brkcr; - rtems_unsigned16 parec; - rtems_unsigned16 frmec; - rtems_unsigned16 nosec; - rtems_unsigned16 brkec; - rtems_unsigned16 brklen; - rtems_unsigned16 uaddr[2]; - rtems_unsigned16 rtemp; - rtems_unsigned16 toseq; - rtems_unsigned16 character[8]; - rtems_unsigned16 rccm; - rtems_unsigned16 rccr; - rtems_unsigned16 rlbc; + uint32_t _res0; + uint32_t _res1; + uint16_t max_idl; + uint16_t idlc; + uint16_t brkcr; + uint16_t parec; + uint16_t frmec; + uint16_t nosec; + uint16_t brkec; + uint16_t brklen; + uint16_t uaddr[2]; + uint16_t rtemp; + uint16_t toseq; + uint16_t character[8]; + uint16_t rccm; + uint16_t rccr; + uint16_t rlbc; } uart; struct { - rtems_unsigned32 _pad0; - rtems_unsigned32 c_mask; - rtems_unsigned32 c_pres; - rtems_unsigned16 disfc; - rtems_unsigned16 crcec; - rtems_unsigned16 abtsc; - rtems_unsigned16 nmarc; - rtems_unsigned16 retrc; - rtems_unsigned16 mflr; - rtems_unsigned16 _max_cnt; - rtems_unsigned16 rfthr; - rtems_unsigned16 _rfcnt; - rtems_unsigned16 hmask; - rtems_unsigned16 haddr1; - rtems_unsigned16 haddr2; - rtems_unsigned16 haddr3; - rtems_unsigned16 haddr4; - rtems_unsigned16 _tmp; - rtems_unsigned16 _tmp_mb; + uint32_t _pad0; + uint32_t c_mask; + uint32_t c_pres; + uint16_t disfc; + uint16_t crcec; + uint16_t abtsc; + uint16_t nmarc; + uint16_t retrc; + uint16_t mflr; + uint16_t _max_cnt; + uint16_t rfthr; + uint16_t _rfcnt; + uint16_t hmask; + uint16_t haddr1; + uint16_t haddr2; + uint16_t haddr3; + uint16_t haddr4; + uint16_t _tmp; + uint16_t _tmp_mb; } hdlc; struct { - rtems_unsigned32 _pad0; - rtems_unsigned32 crcc; - rtems_unsigned16 prcrc; - rtems_unsigned16 ptcrc; - rtems_unsigned16 parec; - rtems_unsigned16 bsync; - rtems_unsigned16 bdle; - rtems_unsigned16 character[8]; - rtems_unsigned16 rccm; + uint32_t _pad0; + uint32_t crcc; + uint16_t prcrc; + uint16_t ptcrc; + uint16_t parec; + uint16_t bsync; + uint16_t bdle; + uint16_t character[8]; + uint16_t rccm; } bisync; struct { - rtems_unsigned32 _crc_p; - rtems_unsigned32 _crc_c; + uint32_t _crc_p; + uint32_t _crc_c; } transparent; struct { - rtems_unsigned32 c_pres; - rtems_unsigned32 c_mask; - rtems_unsigned32 crcec; - rtems_unsigned32 alec; - rtems_unsigned32 disfc; - rtems_unsigned16 pads; - rtems_unsigned16 ret_lim; - rtems_unsigned16 _ret_cnt; - rtems_unsigned16 mflr; - rtems_unsigned16 minflr; - rtems_unsigned16 maxd1; - rtems_unsigned16 maxd2; - rtems_unsigned16 _maxd; - rtems_unsigned16 _dma_cnt; - rtems_unsigned16 _max_b; - rtems_unsigned16 gaddr1; - rtems_unsigned16 gaddr2; - rtems_unsigned16 gaddr3; - rtems_unsigned16 gaddr4; - rtems_unsigned32 _tbuf0data0; - rtems_unsigned32 _tbuf0data1; - rtems_unsigned32 _tbuf0rba0; - rtems_unsigned32 _tbuf0crc; - rtems_unsigned16 _tbuf0bcnt; - rtems_unsigned16 paddr_h; - rtems_unsigned16 paddr_m; - rtems_unsigned16 paddr_l; - rtems_unsigned16 p_per; - rtems_unsigned16 _rfbd_ptr; - rtems_unsigned16 _tfbd_ptr; - rtems_unsigned16 _tlbd_ptr; - rtems_unsigned32 _tbuf1data0; - rtems_unsigned32 _tbuf1data1; - rtems_unsigned32 _tbuf1rba0; - rtems_unsigned32 _tbuf1crc; - rtems_unsigned16 _tbuf1bcnt; - rtems_unsigned16 _tx_len; - rtems_unsigned16 iaddr1; - rtems_unsigned16 iaddr2; - rtems_unsigned16 iaddr3; - rtems_unsigned16 iaddr4; - rtems_unsigned16 _boff_cnt; - rtems_unsigned16 taddr_l; - rtems_unsigned16 taddr_m; - rtems_unsigned16 taddr_h; + uint32_t c_pres; + uint32_t c_mask; + uint32_t crcec; + uint32_t alec; + uint32_t disfc; + uint16_t pads; + uint16_t ret_lim; + uint16_t _ret_cnt; + uint16_t mflr; + uint16_t minflr; + uint16_t maxd1; + uint16_t maxd2; + uint16_t _maxd; + uint16_t _dma_cnt; + uint16_t _max_b; + uint16_t gaddr1; + uint16_t gaddr2; + uint16_t gaddr3; + uint16_t gaddr4; + uint32_t _tbuf0data0; + uint32_t _tbuf0data1; + uint32_t _tbuf0rba0; + uint32_t _tbuf0crc; + uint16_t _tbuf0bcnt; + uint16_t paddr_h; + uint16_t paddr_m; + uint16_t paddr_l; + uint16_t p_per; + uint16_t _rfbd_ptr; + uint16_t _tfbd_ptr; + uint16_t _tlbd_ptr; + uint32_t _tbuf1data0; + uint32_t _tbuf1data1; + uint32_t _tbuf1rba0; + uint32_t _tbuf1crc; + uint16_t _tbuf1bcnt; + uint16_t _tx_len; + uint16_t iaddr1; + uint16_t iaddr2; + uint16_t iaddr3; + uint16_t iaddr4; + uint16_t _boff_cnt; + uint16_t taddr_l; + uint16_t taddr_m; + uint16_t taddr_h; } ethernet; } un; } m8260SCCparms_t; @@ -388,125 +388,125 @@ typedef struct m8260SCCparms_ { typedef struct m8260FCCparms_ { - rtems_unsigned16 riptr; - rtems_unsigned16 tiptr; - rtems_unsigned16 _pad0; - rtems_unsigned16 mrblr; - rtems_unsigned32 rstate; - rtems_unsigned32 rbase; - rtems_unsigned16 _rbdstat; - rtems_unsigned16 _rbdlen; - rtems_unsigned32 _rdptr; - rtems_unsigned32 tstate; - rtems_unsigned32 tbase; - rtems_unsigned16 _tbdstat; - rtems_unsigned16 _tbdlen; - rtems_unsigned32 _tdptr; - rtems_unsigned32 _rbptr; - rtems_unsigned32 _tbptr; - rtems_unsigned32 _rcrc; - rtems_unsigned32 _pad1; - rtems_unsigned32 _tcrc; + uint16_t riptr; + uint16_t tiptr; + uint16_t _pad0; + uint16_t mrblr; + uint32_t rstate; + uint32_t rbase; + uint16_t _rbdstat; + uint16_t _rbdlen; + uint32_t _rdptr; + uint32_t tstate; + uint32_t tbase; + uint16_t _tbdstat; + uint16_t _tbdlen; + uint32_t _tdptr; + uint32_t _rbptr; + uint32_t _tbptr; + uint32_t _rcrc; + uint32_t _pad1; + uint32_t _tcrc; union { struct { - rtems_unsigned32 _pad0; - rtems_unsigned32 _pad1; - rtems_unsigned32 c_mask; - rtems_unsigned32 c_pres; - rtems_unsigned16 disfc; - rtems_unsigned16 crcec; - rtems_unsigned16 abtsc; - rtems_unsigned16 nmarc; - rtems_unsigned32 _max_cnt; - rtems_unsigned16 mflr; - rtems_unsigned16 rfthr; - rtems_unsigned16 rfcnt; - rtems_unsigned16 hmask; - rtems_unsigned16 haddr1; - rtems_unsigned16 haddr2; - rtems_unsigned16 haddr3; - rtems_unsigned16 haddr4; - rtems_unsigned16 _ts_tmp; - rtems_unsigned16 _tmp_mb; + uint32_t _pad0; + uint32_t _pad1; + uint32_t c_mask; + uint32_t c_pres; + uint16_t disfc; + uint16_t crcec; + uint16_t abtsc; + uint16_t nmarc; + uint32_t _max_cnt; + uint16_t mflr; + uint16_t rfthr; + uint16_t rfcnt; + uint16_t hmask; + uint16_t haddr1; + uint16_t haddr2; + uint16_t haddr3; + uint16_t haddr4; + uint16_t _ts_tmp; + uint16_t _tmp_mb; } hdlc; struct { - rtems_unsigned32 _pad0; - rtems_unsigned32 _pad1; - rtems_unsigned32 c_mask; - rtems_unsigned32 c_pres; - rtems_unsigned16 disfc; - rtems_unsigned16 crcec; - rtems_unsigned16 abtsc; - rtems_unsigned16 nmarc; - rtems_unsigned32 _max_cnt; - rtems_unsigned16 mflr; - rtems_unsigned16 rfthr; - rtems_unsigned16 rfcnt; - rtems_unsigned16 hmask; - rtems_unsigned16 haddr1; - rtems_unsigned16 haddr2; - rtems_unsigned16 haddr3; - rtems_unsigned16 haddr4; - rtems_unsigned16 _ts_tmp; - rtems_unsigned16 _tmp_mb; + uint32_t _pad0; + uint32_t _pad1; + uint32_t c_mask; + uint32_t c_pres; + uint16_t disfc; + uint16_t crcec; + uint16_t abtsc; + uint16_t nmarc; + uint32_t _max_cnt; + uint16_t mflr; + uint16_t rfthr; + uint16_t rfcnt; + uint16_t hmask; + uint16_t haddr1; + uint16_t haddr2; + uint16_t haddr3; + uint16_t haddr4; + uint16_t _ts_tmp; + uint16_t _tmp_mb; } transparent; struct { - rtems_unsigned32 _stat_buf; - rtems_unsigned32 cam_ptr; - rtems_unsigned32 c_mask; - rtems_unsigned32 c_pres; - rtems_unsigned32 crcec; - rtems_unsigned32 alec; - rtems_unsigned32 disfc; - rtems_unsigned16 ret_lim; - rtems_unsigned16 _ret_cnt; - rtems_unsigned16 p_per; - rtems_unsigned16 _boff_cnt; - rtems_unsigned32 gaddr_h; - rtems_unsigned32 gaddr_l; - rtems_unsigned16 tfcstat; - rtems_unsigned16 tfclen; - rtems_unsigned32 tfcptr; - rtems_unsigned16 mflr; - rtems_unsigned16 paddr1_h; - rtems_unsigned16 paddr1_m; - rtems_unsigned16 paddr1_l; - rtems_unsigned16 _ibd_cnt; - rtems_unsigned16 _ibd_start; - rtems_unsigned16 _ibd_end; - rtems_unsigned16 _tx_len; - rtems_unsigned16 _ibd_base; - rtems_unsigned32 iaddr_h; - rtems_unsigned32 iaddr_l; - rtems_unsigned16 minflr; - rtems_unsigned16 taddr_h; - rtems_unsigned16 taddr_m; - rtems_unsigned16 taddr_l; - rtems_unsigned16 pad_ptr; - rtems_unsigned16 _pad0; - rtems_unsigned16 _cf_range; - rtems_unsigned16 _max_b; - rtems_unsigned16 maxd1; - rtems_unsigned16 maxd2; - rtems_unsigned16 _maxd; - rtems_unsigned16 _dma_cnt; - rtems_unsigned32 octc; - rtems_unsigned32 colc; - rtems_unsigned32 broc; - rtems_unsigned32 mulc; - rtems_unsigned32 uspc; - rtems_unsigned32 frgc; - rtems_unsigned32 ospc; - rtems_unsigned32 jbrc; - rtems_unsigned32 p64c; - rtems_unsigned32 p65c; - rtems_unsigned32 p128c; - rtems_unsigned32 p256c; - rtems_unsigned32 p512c; - rtems_unsigned32 p1024c; - rtems_unsigned32 _cam_buf; - rtems_unsigned32 _pad1; + uint32_t _stat_buf; + uint32_t cam_ptr; + uint32_t c_mask; + uint32_t c_pres; + uint32_t crcec; + uint32_t alec; + uint32_t disfc; + uint16_t ret_lim; + uint16_t _ret_cnt; + uint16_t p_per; + uint16_t _boff_cnt; + uint32_t gaddr_h; + uint32_t gaddr_l; + uint16_t tfcstat; + uint16_t tfclen; + uint32_t tfcptr; + uint16_t mflr; + uint16_t paddr1_h; + uint16_t paddr1_m; + uint16_t paddr1_l; + uint16_t _ibd_cnt; + uint16_t _ibd_start; + uint16_t _ibd_end; + uint16_t _tx_len; + uint16_t _ibd_base; + uint32_t iaddr_h; + uint32_t iaddr_l; + uint16_t minflr; + uint16_t taddr_h; + uint16_t taddr_m; + uint16_t taddr_l; + uint16_t pad_ptr; + uint16_t _pad0; + uint16_t _cf_range; + uint16_t _max_b; + uint16_t maxd1; + uint16_t maxd2; + uint16_t _maxd; + uint16_t _dma_cnt; + uint32_t octc; + uint32_t colc; + uint32_t broc; + uint32_t mulc; + uint32_t uspc; + uint32_t frgc; + uint32_t ospc; + uint32_t jbrc; + uint32_t p64c; + uint32_t p65c; + uint32_t p128c; + uint32_t p256c; + uint32_t p512c; + uint32_t p1024c; + uint32_t _cam_buf; + uint32_t _pad1; } ethernet; } un; } m8260FCCparms_t; @@ -531,35 +531,35 @@ typedef struct m8260FCCparms_ { ************************************************************************* */ typedef struct m8260SMCparms_ { - rtems_unsigned16 rbase; - rtems_unsigned16 tbase; - rtems_unsigned8 rfcr; - rtems_unsigned8 tfcr; - rtems_unsigned16 mrblr; - rtems_unsigned32 _rstate; - rtems_unsigned32 _pad0; - rtems_unsigned16 _rbptr; - rtems_unsigned16 _pad1; - rtems_unsigned32 _pad2; - rtems_unsigned32 _tstate; - rtems_unsigned32 _pad3; - rtems_unsigned16 _tbptr; - rtems_unsigned16 _pad4; - rtems_unsigned32 _pad5; + uint16_t rbase; + uint16_t tbase; + uint8_t rfcr; + uint8_t tfcr; + uint16_t mrblr; + uint32_t _rstate; + uint32_t _pad0; + uint16_t _rbptr; + uint16_t _pad1; + uint32_t _pad2; + uint32_t _tstate; + uint32_t _pad3; + uint16_t _tbptr; + uint16_t _pad4; + uint32_t _pad5; union { struct { - rtems_unsigned16 max_idl; - rtems_unsigned16 _idlc; - rtems_unsigned16 _brkln; - rtems_unsigned16 brkec; - rtems_unsigned16 brkcr; - rtems_unsigned16 _r_mask; + uint16_t max_idl; + uint16_t _idlc; + uint16_t _brkln; + uint16_t brkec; + uint16_t brkcr; + uint16_t _r_mask; } uart; struct { - rtems_unsigned16 _pad0[6]; + uint16_t _pad0[6]; } transparent; } un; - rtems_unsigned32 _pad6; + uint32_t _pad6; } m8260SMCparms_t; /* @@ -591,21 +591,21 @@ typedef struct m8260SMCparms_ { ************************************************************************* */ typedef struct m8260SPIparms_ { - rtems_unsigned16 rbase; - rtems_unsigned16 tbase; - rtems_unsigned8 rfcr; - rtems_unsigned8 tfcr; - rtems_unsigned16 mrblr; - rtems_unsigned32 _rstate; - rtems_unsigned32 _pad0; - rtems_unsigned16 _rbptr; - rtems_unsigned16 _pad1; - rtems_unsigned32 _pad2; - rtems_unsigned32 _tstate; - rtems_unsigned32 _pad3; - rtems_unsigned16 _tbptr; - rtems_unsigned16 _pad4; - rtems_unsigned32 _pad5; + uint16_t rbase; + uint16_t tbase; + uint8_t rfcr; + uint8_t tfcr; + uint16_t mrblr; + uint32_t _rstate; + uint32_t _pad0; + uint16_t _rbptr; + uint16_t _pad1; + uint32_t _pad2; + uint32_t _tstate; + uint32_t _pad3; + uint16_t _tbptr; + uint16_t _pad4; + uint32_t _pad5; } m8260SPIparms_t; /* @@ -641,8 +641,8 @@ typedef struct m8260SPIparms_ { ************************************************************************* */ typedef struct m8260BufferDescriptor_ { - rtems_unsigned16 status; - rtems_unsigned16 length; + uint16_t status; + uint16_t length; volatile void *buffer; } m8260BufferDescriptor_t; @@ -737,10 +737,10 @@ typedef struct m8260BufferDescriptor_ { ************************************************************************* */ typedef struct m8260IDMABufferDescriptor_ { - rtems_unsigned16 status; - rtems_unsigned8 dfcr; - rtems_unsigned8 sfcr; - rtems_unsigned32 length; + uint16_t status; + uint8_t dfcr; + uint8_t sfcr; + uint32_t length; void *source; void *destination; } m8260IDMABufferDescriptor_t; @@ -1130,244 +1130,244 @@ typedef struct m8260_ { /* * CPM Dual-Port RAM */ - rtems_unsigned8 dpram1[16384]; /* 0x0000 - 0x3FFF BD/data/ucode */ - rtems_unsigned8 cpm_pad0[16384]; /* 0x4000 - 0x7FFF Reserved */ + uint8_t dpram1[16384]; /* 0x0000 - 0x3FFF BD/data/ucode */ + uint8_t cpm_pad0[16384]; /* 0x4000 - 0x7FFF Reserved */ m8260SCCparms_t scc1p; - rtems_unsigned8 pad_scc1[256-sizeof(m8260SCCparms_t)]; + uint8_t pad_scc1[256-sizeof(m8260SCCparms_t)]; m8260SCCparms_t scc2p; - rtems_unsigned8 pad_scc2[256-sizeof(m8260SCCparms_t)]; + uint8_t pad_scc2[256-sizeof(m8260SCCparms_t)]; m8260SCCparms_t scc3p; - rtems_unsigned8 pad_scc3[256-sizeof(m8260SCCparms_t)]; + uint8_t pad_scc3[256-sizeof(m8260SCCparms_t)]; m8260SCCparms_t scc4p; - rtems_unsigned8 pad_scc4[256-sizeof(m8260SCCparms_t)]; + uint8_t pad_scc4[256-sizeof(m8260SCCparms_t)]; m8260FCCparms_t fcc1p; - rtems_unsigned8 pad_fcc1[256-sizeof(m8260FCCparms_t)]; + uint8_t pad_fcc1[256-sizeof(m8260FCCparms_t)]; m8260FCCparms_t fcc2p; - rtems_unsigned8 pad_fcc2[256-sizeof(m8260FCCparms_t)]; + uint8_t pad_fcc2[256-sizeof(m8260FCCparms_t)]; m8260FCCparms_t fcc3p; - rtems_unsigned8 pad_fcc3[256-sizeof(m8260FCCparms_t)]; - - rtems_unsigned8 mcc1p[128]; - rtems_unsigned8 pad_mcc1[124]; - rtems_unsigned16 smc1_base; - rtems_unsigned16 idma1_base; - rtems_unsigned8 mcc2p[128]; - rtems_unsigned8 pad_mcc2[124]; - rtems_unsigned16 smc2_base; - rtems_unsigned16 idma2_base; - rtems_unsigned8 pad_spi[252]; - rtems_unsigned16 spi_base; - rtems_unsigned16 idma3_base; - rtems_unsigned8 pad_risc[224]; - rtems_unsigned8 risc_timers[16]; - rtems_unsigned16 rev_num; - rtems_unsigned16 cpm_pad7; - rtems_unsigned32 cpm_pad8; - rtems_unsigned16 rand; - rtems_unsigned16 i2c_base; - rtems_unsigned16 idma4_base; - rtems_unsigned8 cpm_pad9[1282]; - - rtems_unsigned8 cpm_pad1[8192]; /* 0x9000 - 0xAFFF Reserved */ + uint8_t pad_fcc3[256-sizeof(m8260FCCparms_t)]; + + uint8_t mcc1p[128]; + uint8_t pad_mcc1[124]; + uint16_t smc1_base; + uint16_t idma1_base; + uint8_t mcc2p[128]; + uint8_t pad_mcc2[124]; + uint16_t smc2_base; + uint16_t idma2_base; + uint8_t pad_spi[252]; + uint16_t spi_base; + uint16_t idma3_base; + uint8_t pad_risc[224]; + uint8_t risc_timers[16]; + uint16_t rev_num; + uint16_t cpm_pad7; + uint32_t cpm_pad8; + uint16_t rand; + uint16_t i2c_base; + uint16_t idma4_base; + uint8_t cpm_pad9[1282]; + + uint8_t cpm_pad1[8192]; /* 0x9000 - 0xAFFF Reserved */ m8260SMCparms_t smc1p; m8260SMCparms_t smc2p; - rtems_unsigned8 dpram3[4096-2*sizeof(m8260SMCparms_t)]; + uint8_t dpram3[4096-2*sizeof(m8260SMCparms_t)]; - rtems_unsigned8 cpm_pad2[16384]; /* 0xC000 - 0xFFFF Reserved */ + uint8_t cpm_pad2[16384]; /* 0xC000 - 0xFFFF Reserved */ /* * General SIU Block */ - rtems_unsigned32 siumcr; - rtems_unsigned32 sypcr; - rtems_unsigned8 siu_pad0[6]; - rtems_unsigned16 swsr; - rtems_unsigned8 siu_pad1[20]; - rtems_unsigned32 bcr; - rtems_unsigned8 ppc_acr; - rtems_unsigned8 siu_pad4[3]; - rtems_unsigned32 ppc_alrh; - rtems_unsigned32 ppc_alr1; - rtems_unsigned8 lcl_acr; - rtems_unsigned8 siu_pad5[3]; - rtems_unsigned32 lcl_alrh; - rtems_unsigned32 lcl_alr1; - rtems_unsigned32 tescr1; - rtems_unsigned32 tescr2; - rtems_unsigned32 l_tescr1; - rtems_unsigned32 l_tescr2; - rtems_unsigned32 pdtea; - rtems_unsigned8 pdtem; - rtems_unsigned8 siu_pad2[3]; - rtems_unsigned32 ldtea; - rtems_unsigned8 ldtem; - rtems_unsigned8 siu_pad3[163]; + uint32_t siumcr; + uint32_t sypcr; + uint8_t siu_pad0[6]; + uint16_t swsr; + uint8_t siu_pad1[20]; + uint32_t bcr; + uint8_t ppc_acr; + uint8_t siu_pad4[3]; + uint32_t ppc_alrh; + uint32_t ppc_alr1; + uint8_t lcl_acr; + uint8_t siu_pad5[3]; + uint32_t lcl_alrh; + uint32_t lcl_alr1; + uint32_t tescr1; + uint32_t tescr2; + uint32_t l_tescr1; + uint32_t l_tescr2; + uint32_t pdtea; + uint8_t pdtem; + uint8_t siu_pad2[3]; + uint32_t ldtea; + uint8_t ldtem; + uint8_t siu_pad3[163]; /* * Memory Controller Block */ m8260MEMCRegisters_t memc[12]; - rtems_unsigned8 mem_pad0[8]; - rtems_unsigned32 mar; - rtems_unsigned8 mem_pad1[4]; - rtems_unsigned32 mamr; - rtems_unsigned32 mbmr; - rtems_unsigned32 mcmr; - rtems_unsigned32 mdmr; - rtems_unsigned8 mem_pad2[4]; - rtems_unsigned16 mptpr; - rtems_unsigned8 mem_pad5[2]; - rtems_unsigned32 mdr; - rtems_unsigned8 mem_pad3[4]; - rtems_unsigned32 psdmr; - rtems_unsigned32 lsdmr; - rtems_unsigned8 purt; - rtems_unsigned8 mem_pad6[3]; - rtems_unsigned8 psrt; - rtems_unsigned8 mem_pad7[3]; - rtems_unsigned8 lurt; - rtems_unsigned8 mem_pad8[3]; - rtems_unsigned8 lsrt; - rtems_unsigned8 mem_pad9[3]; - rtems_unsigned32 immr; - rtems_unsigned8 mem_pad4[84]; + uint8_t mem_pad0[8]; + uint32_t mar; + uint8_t mem_pad1[4]; + uint32_t mamr; + uint32_t mbmr; + uint32_t mcmr; + uint32_t mdmr; + uint8_t mem_pad2[4]; + uint16_t mptpr; + uint8_t mem_pad5[2]; + uint32_t mdr; + uint8_t mem_pad3[4]; + uint32_t psdmr; + uint32_t lsdmr; + uint8_t purt; + uint8_t mem_pad6[3]; + uint8_t psrt; + uint8_t mem_pad7[3]; + uint8_t lurt; + uint8_t mem_pad8[3]; + uint8_t lsrt; + uint8_t mem_pad9[3]; + uint32_t immr; + uint8_t mem_pad4[84]; /* * System integration timers */ - rtems_unsigned8 sit_pad0[32]; - rtems_unsigned16 tmcntsc; - rtems_unsigned8 sit_pad6[2]; - rtems_unsigned32 tmcnt; - rtems_unsigned32 tmcntsec; - rtems_unsigned32 tmcntal; - rtems_unsigned8 sit_pad2[16]; - rtems_unsigned16 piscr; - rtems_unsigned8 sit_pad5[2]; - rtems_unsigned32 pitc; - rtems_unsigned32 pitr; - rtems_unsigned8 sit_pad3[94]; - rtems_unsigned8 sit_pad4[2390]; + uint8_t sit_pad0[32]; + uint16_t tmcntsc; + uint8_t sit_pad6[2]; + uint32_t tmcnt; + uint32_t tmcntsec; + uint32_t tmcntal; + uint8_t sit_pad2[16]; + uint16_t piscr; + uint8_t sit_pad5[2]; + uint32_t pitc; + uint32_t pitr; + uint8_t sit_pad3[94]; + uint8_t sit_pad4[2390]; /* * Interrupt Controller */ - rtems_unsigned16 sicr; - rtems_unsigned8 ict_pad1[2]; - rtems_unsigned32 sivec; - rtems_unsigned32 sipnr_h; - rtems_unsigned32 sipnr_l; - rtems_unsigned32 siprr; - rtems_unsigned32 scprr_h; - rtems_unsigned32 scprr_l; - rtems_unsigned32 simr_h; - rtems_unsigned32 simr_l; - rtems_unsigned32 siexr; - rtems_unsigned8 ict_pad0[88]; + uint16_t sicr; + uint8_t ict_pad1[2]; + uint32_t sivec; + uint32_t sipnr_h; + uint32_t sipnr_l; + uint32_t siprr; + uint32_t scprr_h; + uint32_t scprr_l; + uint32_t simr_h; + uint32_t simr_l; + uint32_t siexr; + uint8_t ict_pad0[88]; /* * Clocks and Reset */ - rtems_unsigned32 sccr; - rtems_unsigned8 clr_pad1[4]; - rtems_unsigned32 scmr; - rtems_unsigned8 clr_pad2[4]; - rtems_unsigned32 rsr; - rtems_unsigned32 rmr; - rtems_unsigned8 clr_pad0[104]; + uint32_t sccr; + uint8_t clr_pad1[4]; + uint32_t scmr; + uint8_t clr_pad2[4]; + uint32_t rsr; + uint32_t rmr; + uint8_t clr_pad0[104]; /* * Input/ Output Port */ - rtems_unsigned32 pdira; - rtems_unsigned32 ppara; - rtems_unsigned32 psora; - rtems_unsigned32 podra; - rtems_unsigned32 pdata; - rtems_unsigned8 iop_pad0[12]; - rtems_unsigned32 pdirb; - rtems_unsigned32 pparb; - rtems_unsigned32 psorb; - rtems_unsigned32 podrb; - rtems_unsigned32 pdatb; - rtems_unsigned8 iop_pad1[12]; - rtems_unsigned32 pdirc; - rtems_unsigned32 pparc; - rtems_unsigned32 psorc; - rtems_unsigned32 podrc; - rtems_unsigned32 pdatc; - rtems_unsigned8 iop_pad2[12]; - rtems_unsigned32 pdird; - rtems_unsigned32 ppard; - rtems_unsigned32 psord; - rtems_unsigned32 podrd; - rtems_unsigned32 pdatd; - rtems_unsigned8 iop_pad3[12]; + uint32_t pdira; + uint32_t ppara; + uint32_t psora; + uint32_t podra; + uint32_t pdata; + uint8_t iop_pad0[12]; + uint32_t pdirb; + uint32_t pparb; + uint32_t psorb; + uint32_t podrb; + uint32_t pdatb; + uint8_t iop_pad1[12]; + uint32_t pdirc; + uint32_t pparc; + uint32_t psorc; + uint32_t podrc; + uint32_t pdatc; + uint8_t iop_pad2[12]; + uint32_t pdird; + uint32_t ppard; + uint32_t psord; + uint32_t podrd; + uint32_t pdatd; + uint8_t iop_pad3[12]; /* * CPM Timers */ - rtems_unsigned8 tgcr1; - rtems_unsigned8 cpt_pad0[3]; - rtems_unsigned8 tgcr2; - rtems_unsigned8 cpt_pad1[11]; - rtems_unsigned16 tmr1; - rtems_unsigned16 tmr2; - rtems_unsigned16 trr1; - rtems_unsigned16 trr2; - rtems_unsigned16 tcr1; - rtems_unsigned16 tcr2; - rtems_unsigned16 tcn1; - rtems_unsigned16 tcn2; - rtems_unsigned16 tmr3; - rtems_unsigned16 tmr4; - rtems_unsigned16 trr3; - rtems_unsigned16 trr4; - rtems_unsigned16 tcr3; - rtems_unsigned16 tcr4; - rtems_unsigned16 tcn3; - rtems_unsigned16 tcn4; - rtems_unsigned16 ter1; - rtems_unsigned16 ter2; - rtems_unsigned16 ter3; - rtems_unsigned16 ter4; - rtems_unsigned8 cpt_pad2[608]; + uint8_t tgcr1; + uint8_t cpt_pad0[3]; + uint8_t tgcr2; + uint8_t cpt_pad1[11]; + uint16_t tmr1; + uint16_t tmr2; + uint16_t trr1; + uint16_t trr2; + uint16_t tcr1; + uint16_t tcr2; + uint16_t tcn1; + uint16_t tcn2; + uint16_t tmr3; + uint16_t tmr4; + uint16_t trr3; + uint16_t trr4; + uint16_t tcr3; + uint16_t tcr4; + uint16_t tcn3; + uint16_t tcn4; + uint16_t ter1; + uint16_t ter2; + uint16_t ter3; + uint16_t ter4; + uint8_t cpt_pad2[608]; /* * DMA Block */ - rtems_unsigned8 sdsr; - rtems_unsigned8 dma_pad0[3]; - rtems_unsigned8 sdmr; - rtems_unsigned8 dma_pad1[3]; - - rtems_unsigned8 idsr1; - rtems_unsigned8 dma_pad2[3]; - rtems_unsigned8 idmr1; - rtems_unsigned8 dma_pad3[3]; - rtems_unsigned8 idsr2; - rtems_unsigned8 dma_pad4[3]; - rtems_unsigned8 idmr2; - rtems_unsigned8 dma_pad5[3]; - rtems_unsigned8 idsr3; - rtems_unsigned8 dma_pad6[3]; - rtems_unsigned8 idmr3; - rtems_unsigned8 dma_pad7[3]; - rtems_unsigned8 idsr4; - rtems_unsigned8 dma_pad8[3]; - rtems_unsigned8 idmr4; - rtems_unsigned8 dma_pad9[707]; + uint8_t sdsr; + uint8_t dma_pad0[3]; + uint8_t sdmr; + uint8_t dma_pad1[3]; + + uint8_t idsr1; + uint8_t dma_pad2[3]; + uint8_t idmr1; + uint8_t dma_pad3[3]; + uint8_t idsr2; + uint8_t dma_pad4[3]; + uint8_t idmr2; + uint8_t dma_pad5[3]; + uint8_t idsr3; + uint8_t dma_pad6[3]; + uint8_t idmr3; + uint8_t dma_pad7[3]; + uint8_t idsr4; + uint8_t dma_pad8[3]; + uint8_t idmr4; + uint8_t dma_pad9[707]; /* @@ -1377,57 +1377,57 @@ typedef struct m8260_ { m8260FCCRegisters_t fcc2; m8260FCCRegisters_t fcc3; - rtems_unsigned8 fcc_pad0[656]; + uint8_t fcc_pad0[656]; /* * BRG 5-8 Block */ - rtems_unsigned32 brgc5; - rtems_unsigned32 brgc6; - rtems_unsigned32 brgc7; - rtems_unsigned32 brgc8; - rtems_unsigned8 brg_pad0[608]; + uint32_t brgc5; + uint32_t brgc6; + uint32_t brgc7; + uint32_t brgc8; + uint8_t brg_pad0[608]; /* * I2C */ - rtems_unsigned8 i2mod; - rtems_unsigned8 i2m_pad0[3]; - rtems_unsigned8 i2add; - rtems_unsigned8 i2m_pad1[3]; - rtems_unsigned8 i2brg; - rtems_unsigned8 i2m_pad2[3]; - rtems_unsigned8 i2com; - rtems_unsigned8 i2m_pad3[3]; - rtems_unsigned8 i2cer; - rtems_unsigned8 i2m_pad4[3]; - rtems_unsigned8 i2cmr; - rtems_unsigned8 i2m_pad5[331]; + uint8_t i2mod; + uint8_t i2m_pad0[3]; + uint8_t i2add; + uint8_t i2m_pad1[3]; + uint8_t i2brg; + uint8_t i2m_pad2[3]; + uint8_t i2com; + uint8_t i2m_pad3[3]; + uint8_t i2cer; + uint8_t i2m_pad4[3]; + uint8_t i2cmr; + uint8_t i2m_pad5[331]; /* * CPM Block */ - rtems_unsigned32 cpcr; - rtems_unsigned32 rccr; - rtems_unsigned8 cpm_pad3[14]; - rtems_unsigned16 rter; - rtems_unsigned8 cpm_pad[2]; - rtems_unsigned16 rtmr; - rtems_unsigned16 rtscr; - rtems_unsigned8 cpm_pad4[2]; - rtems_unsigned32 rtsr; - rtems_unsigned8 cpm_pad5[12]; + uint32_t cpcr; + uint32_t rccr; + uint8_t cpm_pad3[14]; + uint16_t rter; + uint8_t cpm_pad[2]; + uint16_t rtmr; + uint16_t rtscr; + uint8_t cpm_pad4[2]; + uint32_t rtsr; + uint8_t cpm_pad5[12]; /* * BRG 1-4 Block */ - rtems_unsigned32 brgc1; - rtems_unsigned32 brgc2; - rtems_unsigned32 brgc3; - rtems_unsigned32 brgc4; + uint32_t brgc1; + uint32_t brgc2; + uint32_t brgc3; + uint32_t brgc4; /* @@ -1449,29 +1449,29 @@ typedef struct m8260_ { /* * SPI Block */ - rtems_unsigned16 spmode; - rtems_unsigned8 spi_pad0[4]; - rtems_unsigned8 spie; - rtems_unsigned8 spi_pad1[3]; - rtems_unsigned8 spim; - rtems_unsigned8 spi_pad2[2]; - rtems_unsigned8 spcom; - rtems_unsigned8 spi_pad3[82]; + uint16_t spmode; + uint8_t spi_pad0[4]; + uint8_t spie; + uint8_t spi_pad1[3]; + uint8_t spim; + uint8_t spi_pad2[2]; + uint8_t spcom; + uint8_t spi_pad3[82]; /* * CPM Mux Block */ - rtems_unsigned8 cmxsi1cr; - rtems_unsigned8 cmx_pad0[1]; - rtems_unsigned8 cmxsi2cr; - rtems_unsigned8 cmx_pad1[1]; - rtems_unsigned32 cmxfcr; - rtems_unsigned32 cmxscr; - rtems_unsigned8 cmxsmr; - rtems_unsigned8 cmx_pad2[1]; - rtems_unsigned16 cmxuar; - rtems_unsigned8 cmx_pad3[16]; + uint8_t cmxsi1cr; + uint8_t cmx_pad0[1]; + uint8_t cmxsi2cr; + uint8_t cmx_pad1[1]; + uint32_t cmxfcr; + uint32_t cmxscr; + uint8_t cmxsmr; + uint8_t cmx_pad2[1]; + uint16_t cmxuar; + uint8_t cmx_pad3[16]; /* @@ -1482,24 +1482,24 @@ typedef struct m8260_ { m8260SIRegisters_t si2; m8260MCCRegisters_t mcc2; - rtems_unsigned8 mcc_pad0[1152]; + uint8_t mcc_pad0[1152]; /* * SI1 RAM */ - rtems_unsigned8 si1txram[512]; - rtems_unsigned8 ram_pad0[512]; - rtems_unsigned8 si1rxram[512]; - rtems_unsigned8 ram_pad1[512]; + uint8_t si1txram[512]; + uint8_t ram_pad0[512]; + uint8_t si1rxram[512]; + uint8_t ram_pad1[512]; /* * SI2 RAM */ - rtems_unsigned8 si2txram[512]; - rtems_unsigned8 ram_pad2[512]; - rtems_unsigned8 si2rxram[512]; - rtems_unsigned8 ram_pad3[512]; + uint8_t si2txram[512]; + uint8_t ram_pad2[512]; + uint8_t si2rxram[512]; + uint8_t ram_pad3[512]; } m8260_t; diff --git a/c/src/lib/libcpu/powerpc/mpc8260/mmu/mmu.c b/c/src/lib/libcpu/powerpc/mpc8260/mmu/mmu.c index f15cb6707f..f1f13eb10c 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/mmu/mmu.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/mmu/mmu.c @@ -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 diff --git a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c index e77141a472..5d026cd64c 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c @@ -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(); diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c b/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c index 37dbc80f2c..71592e29cb 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c @@ -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 ; diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c index ca05e7f34b..d98db7da77 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c @@ -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) { diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/cp.c b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/cp.c index b1ca0eed6b..0c7b4bdec0 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/cp.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/cp.c @@ -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) { diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c index 9e3713bcca..e4034af202 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c @@ -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[] = { diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h b/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h index bfb0e14fa9..7f6b4f1167 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h +++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/cpm.h @@ -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) \ diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h b/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h index 88e6ec43b3..960a417b00 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h +++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/mmu.h @@ -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; /* diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h b/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h index a2ae755a96..0b99e04adc 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h +++ b/c/src/lib/libcpu/powerpc/mpc8xx/include/mpc8xx.h @@ -184,77 +184,77 @@ extern "C" { * Memory controller registers */ typedef struct m8xxMEMCRegisters_ { - rtems_unsigned32 _br; - rtems_unsigned32 _or; /* Used to be called 'or'; reserved ANSI C++ keyword */ + uint32_t _br; + uint32_t _or; /* Used to be called 'or'; reserved ANSI C++ keyword */ } m8xxMEMCRegisters_t; /* * Serial Communications Controller registers */ typedef struct m8xxSCCRegisters_ { - rtems_unsigned32 gsmr_l; - rtems_unsigned32 gsmr_h; - rtems_unsigned16 psmr; - rtems_unsigned16 _pad0; - rtems_unsigned16 todr; - rtems_unsigned16 dsr; - rtems_unsigned16 scce; - rtems_unsigned16 _pad1; - rtems_unsigned16 sccm; - rtems_unsigned8 _pad2; - rtems_unsigned8 sccs; - rtems_unsigned32 _pad3[2]; + uint32_t gsmr_l; + uint32_t gsmr_h; + uint16_t psmr; + uint16_t _pad0; + uint16_t todr; + uint16_t dsr; + uint16_t scce; + uint16_t _pad1; + uint16_t sccm; + uint8_t _pad2; + uint8_t sccs; + uint32_t _pad3[2]; } m8xxSCCRegisters_t; /* * Serial Management Controller registers */ typedef struct m8xxSMCRegisters_ { - rtems_unsigned16 _pad0; - rtems_unsigned16 smcmr; - rtems_unsigned16 _pad1; - rtems_unsigned8 smce; - rtems_unsigned8 _pad2; - rtems_unsigned16 _pad3; - rtems_unsigned8 smcm; - rtems_unsigned8 _pad4; - rtems_unsigned32 _pad5; + uint16_t _pad0; + uint16_t smcmr; + uint16_t _pad1; + uint8_t smce; + uint8_t _pad2; + uint16_t _pad3; + uint8_t smcm; + uint8_t _pad4; + uint32_t _pad5; } m8xxSMCRegisters_t; /* * Fast Ethernet Controller registers (Only on MPC8xxT) */ typedef struct m8xxFECRegisters_ { - rtems_unsigned32 addr_low; - rtems_unsigned32 addr_high; - rtems_unsigned32 hash_table_high; - rtems_unsigned32 hash_table_low; - rtems_unsigned32 r_des_start; - rtems_unsigned32 x_des_start; - rtems_unsigned32 r_buf_size; - rtems_unsigned32 _pad0[9]; - rtems_unsigned32 ecntrl; - rtems_unsigned32 ievent; - rtems_unsigned32 imask; - rtems_unsigned32 ivec; - rtems_unsigned32 r_des_active; - rtems_unsigned32 x_des_active; - rtems_unsigned32 _pad1[10]; - rtems_unsigned32 mii_data; - rtems_unsigned32 mii_speed; - rtems_unsigned32 _pad2[17]; - rtems_unsigned32 r_bound; - rtems_unsigned32 r_fstart; - rtems_unsigned32 _pad3[6]; - rtems_unsigned32 x_fstart; - rtems_unsigned32 _pad4[17]; - rtems_unsigned32 fun_code; - rtems_unsigned32 _pad5[3]; - rtems_unsigned32 r_cntrl; - rtems_unsigned32 r_hash; - rtems_unsigned32 _pad6[14]; - rtems_unsigned32 x_cntrl; - rtems_unsigned32 _pad7[30]; + uint32_t addr_low; + uint32_t addr_high; + uint32_t hash_table_high; + uint32_t hash_table_low; + uint32_t r_des_start; + uint32_t x_des_start; + uint32_t r_buf_size; + uint32_t _pad0[9]; + uint32_t ecntrl; + uint32_t ievent; + uint32_t imask; + uint32_t ivec; + uint32_t r_des_active; + uint32_t x_des_active; + uint32_t _pad1[10]; + uint32_t mii_data; + uint32_t mii_speed; + uint32_t _pad2[17]; + uint32_t r_bound; + uint32_t r_fstart; + uint32_t _pad3[6]; + uint32_t x_fstart; + uint32_t _pad4[17]; + uint32_t fun_code; + uint32_t _pad5[3]; + uint32_t r_cntrl; + uint32_t r_hash; + uint32_t _pad6[14]; + uint32_t x_cntrl; + uint32_t _pad7[30]; } m8xxFECRegisters_t; @@ -285,10 +285,10 @@ typedef struct m8xxFECRegisters_ { ************************************************************************* */ typedef struct m8xxMiscParms_ { - rtems_unsigned16 rev_num; - rtems_unsigned16 _res1; - rtems_unsigned32 _res2; - rtems_unsigned32 _res3; + uint16_t rev_num; + uint16_t _res1; + uint32_t _res2; + uint32_t _res3; } m8xxMiscParms_t; /* @@ -297,12 +297,12 @@ typedef struct m8xxMiscParms_ { ************************************************************************* */ typedef struct m8xxTimerParms_ { - rtems_unsigned16 tm_base; - rtems_unsigned16 _tm_ptr; - rtems_unsigned16 _r_tmr; - rtems_unsigned16 _r_tmv; - rtems_unsigned32 tm_cmd; - rtems_unsigned32 tm_cnt; + uint16_t tm_base; + uint16_t _tm_ptr; + uint16_t _r_tmr; + uint16_t _r_tmv; + uint32_t tm_cmd; + uint32_t tm_cnt; } m8xxTimerParms_t; /* @@ -334,22 +334,22 @@ typedef struct m8xxTimerParms_ { ************************************************************************* */ typedef struct m8xxIDMAparms_ { - rtems_unsigned16 ibase; - rtems_unsigned16 dcmr; - rtems_unsigned32 _sapr; - rtems_unsigned32 _dapr; - rtems_unsigned16 ibptr; - rtems_unsigned16 _write_sp; - rtems_unsigned32 _s_byte_c; - rtems_unsigned32 _d_byte_c; - rtems_unsigned32 _s_state; - rtems_unsigned32 _itemp[4]; - rtems_unsigned32 _sr_mem; - rtems_unsigned16 _read_sp; - rtems_unsigned16 _res0; - rtems_unsigned16 _res1; - rtems_unsigned16 _res2; - rtems_unsigned32 _d_state; + uint16_t ibase; + uint16_t dcmr; + uint32_t _sapr; + uint32_t _dapr; + uint16_t ibptr; + uint16_t _write_sp; + uint32_t _s_byte_c; + uint32_t _d_byte_c; + uint32_t _s_state; + uint32_t _itemp[4]; + uint32_t _sr_mem; + uint16_t _read_sp; + uint16_t _res0; + uint16_t _res1; + uint16_t _res2; + uint32_t _d_state; } m8xxIDMAparms_t; @@ -359,24 +359,24 @@ typedef struct m8xxIDMAparms_ { ************************************************************************* */ typedef struct m8xxDSPparms_ { - rtems_unsigned32 fdbase; - rtems_unsigned32 _fd_ptr; - rtems_unsigned32 _dstate; - rtems_unsigned32 _pad0; - rtems_unsigned16 _dstatus; - rtems_unsigned16 _i; - rtems_unsigned16 _tap; - rtems_unsigned16 _cbase; - rtems_unsigned16 _pad1; - rtems_unsigned16 _xptr; - rtems_unsigned16 _pad2; - rtems_unsigned16 _yptr; - rtems_unsigned16 _m; - rtems_unsigned16 _pad3; - rtems_unsigned16 _n; - rtems_unsigned16 _pad4; - rtems_unsigned16 _k; - rtems_unsigned16 _pad5; + uint32_t fdbase; + uint32_t _fd_ptr; + uint32_t _dstate; + uint32_t _pad0; + uint16_t _dstatus; + uint16_t _i; + uint16_t _tap; + uint16_t _cbase; + uint16_t _pad1; + uint16_t _xptr; + uint16_t _pad2; + uint16_t _yptr; + uint16_t _m; + uint16_t _pad3; + uint16_t _n; + uint16_t _pad4; + uint16_t _k; + uint16_t _pad5; } m8xxDSPparms_t; /* @@ -385,130 +385,130 @@ typedef struct m8xxDSPparms_ { ************************************************************************* */ typedef struct m8xxSCCparms_ { - rtems_unsigned16 rbase; - rtems_unsigned16 tbase; - rtems_unsigned8 rfcr; - rtems_unsigned8 tfcr; - rtems_unsigned16 mrblr; - rtems_unsigned32 _rstate; - rtems_unsigned32 _pad0; - rtems_unsigned16 _rbptr; - rtems_unsigned16 _pad1; - rtems_unsigned32 _pad2; - rtems_unsigned32 _tstate; - rtems_unsigned32 _pad3; - rtems_unsigned16 _tbptr; - rtems_unsigned16 _pad4; - rtems_unsigned32 _pad5; - rtems_unsigned32 _rcrc; - rtems_unsigned32 _tcrc; + uint16_t rbase; + uint16_t tbase; + uint8_t rfcr; + uint8_t tfcr; + uint16_t mrblr; + uint32_t _rstate; + uint32_t _pad0; + uint16_t _rbptr; + uint16_t _pad1; + uint32_t _pad2; + uint32_t _tstate; + uint32_t _pad3; + uint16_t _tbptr; + uint16_t _pad4; + uint32_t _pad5; + uint32_t _rcrc; + uint32_t _tcrc; union { struct { - rtems_unsigned32 _res0; - rtems_unsigned32 _res1; - rtems_unsigned16 max_idl; - rtems_unsigned16 _idlc; - rtems_unsigned16 brkcr; - rtems_unsigned16 parec; - rtems_unsigned16 frmec; - rtems_unsigned16 nosec; - rtems_unsigned16 brkec; - rtems_unsigned16 brkln; - rtems_unsigned16 uaddr[2]; - rtems_unsigned16 _rtemp; - rtems_unsigned16 toseq; - rtems_unsigned16 character[8]; - rtems_unsigned16 rccm; - rtems_unsigned16 rccr; - rtems_unsigned16 rlbc; + uint32_t _res0; + uint32_t _res1; + uint16_t max_idl; + uint16_t _idlc; + uint16_t brkcr; + uint16_t parec; + uint16_t frmec; + uint16_t nosec; + uint16_t brkec; + uint16_t brkln; + uint16_t uaddr[2]; + uint16_t _rtemp; + uint16_t toseq; + uint16_t character[8]; + uint16_t rccm; + uint16_t rccr; + uint16_t rlbc; } uart; } un; } m8xxSCCparms_t; typedef struct m8xxSCCENparms_ { - rtems_unsigned16 rbase; - rtems_unsigned16 tbase; - rtems_unsigned8 rfcr; - rtems_unsigned8 tfcr; - rtems_unsigned16 mrblr; - rtems_unsigned32 _rstate; - rtems_unsigned32 _pad0; - rtems_unsigned16 _rbptr; - rtems_unsigned16 _pad1; - rtems_unsigned32 _pad2; - rtems_unsigned32 _tstate; - rtems_unsigned32 _pad3; - rtems_unsigned16 _tbptr; - rtems_unsigned16 _pad4; - rtems_unsigned32 _pad5; - rtems_unsigned32 _rcrc; - rtems_unsigned32 _tcrc; + uint16_t rbase; + uint16_t tbase; + uint8_t rfcr; + uint8_t tfcr; + uint16_t mrblr; + uint32_t _rstate; + uint32_t _pad0; + uint16_t _rbptr; + uint16_t _pad1; + uint32_t _pad2; + uint32_t _tstate; + uint32_t _pad3; + uint16_t _tbptr; + uint16_t _pad4; + uint32_t _pad5; + uint32_t _rcrc; + uint32_t _tcrc; union { struct { - rtems_unsigned32 _res0; - rtems_unsigned32 _res1; - rtems_unsigned16 max_idl; - rtems_unsigned16 _idlc; - rtems_unsigned16 brkcr; - rtems_unsigned16 parec; - rtems_unsigned16 frmec; - rtems_unsigned16 nosec; - rtems_unsigned16 brkec; - rtems_unsigned16 brkln; - rtems_unsigned16 uaddr[2]; - rtems_unsigned16 _rtemp; - rtems_unsigned16 toseq; - rtems_unsigned16 character[8]; - rtems_unsigned16 rccm; - rtems_unsigned16 rccr; - rtems_unsigned16 rlbc; + uint32_t _res0; + uint32_t _res1; + uint16_t max_idl; + uint16_t _idlc; + uint16_t brkcr; + uint16_t parec; + uint16_t frmec; + uint16_t nosec; + uint16_t brkec; + uint16_t brkln; + uint16_t uaddr[2]; + uint16_t _rtemp; + uint16_t toseq; + uint16_t character[8]; + uint16_t rccm; + uint16_t rccr; + uint16_t rlbc; } uart; struct { - rtems_unsigned32 c_pres; - rtems_unsigned32 c_mask; - rtems_unsigned32 crcec; - rtems_unsigned32 alec; - rtems_unsigned32 disfc; - rtems_unsigned16 pads; - rtems_unsigned16 ret_lim; - rtems_unsigned16 _ret_cnt; - rtems_unsigned16 mflr; - rtems_unsigned16 minflr; - rtems_unsigned16 maxd1; - rtems_unsigned16 maxd2; - rtems_unsigned16 _maxd; - rtems_unsigned16 dma_cnt; - rtems_unsigned16 _max_b; - rtems_unsigned16 gaddr1; - rtems_unsigned16 gaddr2; - rtems_unsigned16 gaddr3; - rtems_unsigned16 gaddr4; - rtems_unsigned32 _tbuf0data0; - rtems_unsigned32 _tbuf0data1; - rtems_unsigned32 _tbuf0rba0; - rtems_unsigned32 _tbuf0crc; - rtems_unsigned16 _tbuf0bcnt; - rtems_unsigned16 paddr_h; - rtems_unsigned16 paddr_m; - rtems_unsigned16 paddr_l; - rtems_unsigned16 p_per; - rtems_unsigned16 _rfbd_ptr; - rtems_unsigned16 _tfbd_ptr; - rtems_unsigned16 _tlbd_ptr; - rtems_unsigned32 _tbuf1data0; - rtems_unsigned32 _tbuf1data1; - rtems_unsigned32 _tbuf1rba0; - rtems_unsigned32 _tbuf1crc; - rtems_unsigned16 _tbuf1bcnt; - rtems_unsigned16 _tx_len; - rtems_unsigned16 iaddr1; - rtems_unsigned16 iaddr2; - rtems_unsigned16 iaddr3; - rtems_unsigned16 iaddr4; - rtems_unsigned16 _boff_cnt; - rtems_unsigned16 taddr_l; - rtems_unsigned16 taddr_m; - rtems_unsigned16 taddr_h; + uint32_t c_pres; + uint32_t c_mask; + uint32_t crcec; + uint32_t alec; + uint32_t disfc; + uint16_t pads; + uint16_t ret_lim; + uint16_t _ret_cnt; + uint16_t mflr; + uint16_t minflr; + uint16_t maxd1; + uint16_t maxd2; + uint16_t _maxd; + uint16_t dma_cnt; + uint16_t _max_b; + uint16_t gaddr1; + uint16_t gaddr2; + uint16_t gaddr3; + uint16_t gaddr4; + uint32_t _tbuf0data0; + uint32_t _tbuf0data1; + uint32_t _tbuf0rba0; + uint32_t _tbuf0crc; + uint16_t _tbuf0bcnt; + uint16_t paddr_h; + uint16_t paddr_m; + uint16_t paddr_l; + uint16_t p_per; + uint16_t _rfbd_ptr; + uint16_t _tfbd_ptr; + uint16_t _tlbd_ptr; + uint32_t _tbuf1data0; + uint32_t _tbuf1data1; + uint32_t _tbuf1rba0; + uint32_t _tbuf1crc; + uint16_t _tbuf1bcnt; + uint16_t _tx_len; + uint16_t iaddr1; + uint16_t iaddr2; + uint16_t iaddr3; + uint16_t iaddr4; + uint16_t _boff_cnt; + uint16_t taddr_l; + uint16_t taddr_m; + uint16_t taddr_h; } ethernet; } un; } m8xxSCCENparms_t; @@ -539,32 +539,32 @@ typedef struct m8xxSCCENparms_ { ************************************************************************* */ typedef struct m8xxSMCparms_ { - rtems_unsigned16 rbase; - rtems_unsigned16 tbase; - rtems_unsigned8 rfcr; - rtems_unsigned8 tfcr; - rtems_unsigned16 mrblr; - rtems_unsigned32 _rstate; - rtems_unsigned32 _pad0; - rtems_unsigned16 _rbptr; - rtems_unsigned16 _pad1; - rtems_unsigned32 _pad2; - rtems_unsigned32 _tstate; - rtems_unsigned32 _pad3; - rtems_unsigned16 _tbptr; - rtems_unsigned16 _pad4; - rtems_unsigned32 _pad5; + uint16_t rbase; + uint16_t tbase; + uint8_t rfcr; + uint8_t tfcr; + uint16_t mrblr; + uint32_t _rstate; + uint32_t _pad0; + uint16_t _rbptr; + uint16_t _pad1; + uint32_t _pad2; + uint32_t _tstate; + uint32_t _pad3; + uint16_t _tbptr; + uint16_t _pad4; + uint32_t _pad5; union { struct { - rtems_unsigned16 max_idl; - rtems_unsigned16 _idlc; - rtems_unsigned16 brkln; - rtems_unsigned16 brkec; - rtems_unsigned16 brkcr; - rtems_unsigned16 _r_mask; + uint16_t max_idl; + uint16_t _idlc; + uint16_t brkln; + uint16_t brkec; + uint16_t brkcr; + uint16_t _r_mask; } uart; struct { - rtems_unsigned16 _pad0[5]; + uint16_t _pad0[5]; } transparent; } un; } m8xxSMCparms_t; @@ -599,21 +599,21 @@ typedef struct m8xxSMCparms_ { ************************************************************************* */ typedef struct m8xxSPIparms_ { - rtems_unsigned16 rbase; - rtems_unsigned16 tbase; - rtems_unsigned8 rfcr; - rtems_unsigned8 tfcr; - rtems_unsigned16 mrblr; - rtems_unsigned32 _rstate; - rtems_unsigned32 _pad0; - rtems_unsigned16 _rbptr; - rtems_unsigned16 _pad1; - rtems_unsigned32 _pad2; - rtems_unsigned32 _tstate; - rtems_unsigned32 _pad3; - rtems_unsigned16 _tbptr; - rtems_unsigned16 _pad4; - rtems_unsigned32 _pad5; + uint16_t rbase; + uint16_t tbase; + uint8_t rfcr; + uint8_t tfcr; + uint16_t mrblr; + uint32_t _rstate; + uint32_t _pad0; + uint16_t _rbptr; + uint16_t _pad1; + uint32_t _pad2; + uint32_t _tstate; + uint32_t _pad3; + uint16_t _tbptr; + uint16_t _pad4; + uint32_t _pad5; } m8xxSPIparms_t; /* @@ -649,8 +649,8 @@ typedef struct m8xxSPIparms_ { ************************************************************************* */ typedef struct m8xxBufferDescriptor_ { - volatile rtems_unsigned16 status; - rtems_unsigned16 length; + volatile uint16_t status; + uint16_t length; volatile void *buffer; } m8xxBufferDescriptor_t; @@ -705,10 +705,10 @@ typedef struct m8xxBufferDescriptor_ { ************************************************************************* */ typedef struct m8xxIDMABufferDescriptor_ { - rtems_unsigned16 status; - rtems_unsigned8 dfcr; - rtems_unsigned8 sfcr; - rtems_unsigned32 length; + uint16_t status; + uint8_t dfcr; + uint8_t sfcr; + uint32_t length; void *source; void *destination; } m8xxIDMABufferDescriptor_t; @@ -1111,245 +1111,245 @@ typedef struct m8xx_ { /* * SIU Block */ - rtems_unsigned32 siumcr; - rtems_unsigned32 sypcr; + uint32_t siumcr; + uint32_t sypcr; #if defined(mpc860) - rtems_unsigned32 swt; + uint32_t swt; #elif defined(mpc821) - rtems_unsigned32 _pad70; + uint32_t _pad70; #endif - rtems_unsigned16 _pad0; - rtems_unsigned16 swsr; - rtems_unsigned32 sipend; - rtems_unsigned32 simask; - rtems_unsigned32 siel; - rtems_unsigned32 sivec; - rtems_unsigned32 tesr; - rtems_unsigned32 _pad1[3]; - rtems_unsigned32 sdcr; - rtems_unsigned8 _pad2[0x80-0x34]; + uint16_t _pad0; + uint16_t swsr; + uint32_t sipend; + uint32_t simask; + uint32_t siel; + uint32_t sivec; + uint32_t tesr; + uint32_t _pad1[3]; + uint32_t sdcr; + uint8_t _pad2[0x80-0x34]; /* * PCMCIA Block */ - rtems_unsigned32 pbr0; - rtems_unsigned32 por0; - rtems_unsigned32 pbr1; - rtems_unsigned32 por1; - rtems_unsigned32 pbr2; - rtems_unsigned32 por2; - rtems_unsigned32 pbr3; - rtems_unsigned32 por3; - rtems_unsigned32 pbr4; - rtems_unsigned32 por4; - rtems_unsigned32 pbr5; - rtems_unsigned32 por5; - rtems_unsigned32 pbr6; - rtems_unsigned32 por6; - rtems_unsigned32 pbr7; - rtems_unsigned32 por7; - rtems_unsigned8 _pad3[0xe0-0xc0]; - rtems_unsigned32 pgcra; - rtems_unsigned32 pgcrb; - rtems_unsigned32 pscr; - rtems_unsigned32 _pad4; - rtems_unsigned32 pipr; - rtems_unsigned32 _pad5; - rtems_unsigned32 per; - rtems_unsigned32 _pad6; + uint32_t pbr0; + uint32_t por0; + uint32_t pbr1; + uint32_t por1; + uint32_t pbr2; + uint32_t por2; + uint32_t pbr3; + uint32_t por3; + uint32_t pbr4; + uint32_t por4; + uint32_t pbr5; + uint32_t por5; + uint32_t pbr6; + uint32_t por6; + uint32_t pbr7; + uint32_t por7; + uint8_t _pad3[0xe0-0xc0]; + uint32_t pgcra; + uint32_t pgcrb; + uint32_t pscr; + uint32_t _pad4; + uint32_t pipr; + uint32_t _pad5; + uint32_t per; + uint32_t _pad6; /* * MEMC Block */ m8xxMEMCRegisters_t memc[8]; - rtems_unsigned8 _pad7[0x164-0x140]; - rtems_unsigned32 mar; - rtems_unsigned32 mcr; - rtems_unsigned32 _pad8; - rtems_unsigned32 mamr; - rtems_unsigned32 mbmr; - rtems_unsigned16 mstat; - rtems_unsigned16 mptpr; - rtems_unsigned32 mdr; - rtems_unsigned8 _pad9[0x200-0x180]; + uint8_t _pad7[0x164-0x140]; + uint32_t mar; + uint32_t mcr; + uint32_t _pad8; + uint32_t mamr; + uint32_t mbmr; + uint16_t mstat; + uint16_t mptpr; + uint32_t mdr; + uint8_t _pad9[0x200-0x180]; /* * System integration timers */ - rtems_unsigned16 tbscr; - rtems_unsigned16 _pad10; - rtems_unsigned32 tbreff0; - rtems_unsigned32 tbreff1; - rtems_unsigned8 _pad11[0x220-0x20c]; - rtems_unsigned16 rtcsc; - rtems_unsigned16 _pad12; - rtems_unsigned32 rtc; - rtems_unsigned32 rtsec; - rtems_unsigned32 rtcal; - rtems_unsigned32 _pad13[4]; - rtems_unsigned16 piscr; - rtems_unsigned16 _pad14; - rtems_unsigned16 pitc; - rtems_unsigned16 _pad_14_1; - rtems_unsigned16 pitr; - rtems_unsigned16 _pad_14_2; - rtems_unsigned8 _pad15[0x280-0x24c]; + uint16_t tbscr; + uint16_t _pad10; + uint32_t tbreff0; + uint32_t tbreff1; + uint8_t _pad11[0x220-0x20c]; + uint16_t rtcsc; + uint16_t _pad12; + uint32_t rtc; + uint32_t rtsec; + uint32_t rtcal; + uint32_t _pad13[4]; + uint16_t piscr; + uint16_t _pad14; + uint16_t pitc; + uint16_t _pad_14_1; + uint16_t pitr; + uint16_t _pad_14_2; + uint8_t _pad15[0x280-0x24c]; /* * Clocks and Reset */ - rtems_unsigned32 sccr; - rtems_unsigned32 plprcr; - rtems_unsigned32 rsr; - rtems_unsigned8 _pad16[0x300-0x28c]; + uint32_t sccr; + uint32_t plprcr; + uint32_t rsr; + uint8_t _pad16[0x300-0x28c]; /* * System integration timers keys */ - rtems_unsigned32 tbscrk; - rtems_unsigned32 tbreff0k; - rtems_unsigned32 tbreff1k; - rtems_unsigned32 tbk; - rtems_unsigned32 _pad17[4]; - rtems_unsigned32 rtcsk; - rtems_unsigned32 rtck; - rtems_unsigned32 rtseck; - rtems_unsigned32 rtcalk; - rtems_unsigned32 _pad18[4]; - rtems_unsigned32 piscrk; - rtems_unsigned32 pitck; - rtems_unsigned8 _pad19[0x380-0x348]; + uint32_t tbscrk; + uint32_t tbreff0k; + uint32_t tbreff1k; + uint32_t tbk; + uint32_t _pad17[4]; + uint32_t rtcsk; + uint32_t rtck; + uint32_t rtseck; + uint32_t rtcalk; + uint32_t _pad18[4]; + uint32_t piscrk; + uint32_t pitck; + uint8_t _pad19[0x380-0x348]; /* * Clocks and Reset Keys */ - rtems_unsigned32 sccrk; - rtems_unsigned32 plprck; - rtems_unsigned32 rsrk; - rtems_unsigned8 _pad20[0x400-0x38c]; - rtems_unsigned8 _pad21[0x800-0x400]; - rtems_unsigned8 _pad22[0x860-0x800]; + uint32_t sccrk; + uint32_t plprck; + uint32_t rsrk; + uint8_t _pad20[0x400-0x38c]; + uint8_t _pad21[0x800-0x400]; + uint8_t _pad22[0x860-0x800]; /* * I2C */ - rtems_unsigned8 i2mod; - rtems_unsigned8 _pad23[3]; - rtems_unsigned8 i2add; - rtems_unsigned8 _pad24[3]; - rtems_unsigned8 i2brg; - rtems_unsigned8 _pad25[3]; - rtems_unsigned8 i2com; - rtems_unsigned8 _pad26[3]; - rtems_unsigned8 i2cer; - rtems_unsigned8 _pad27[3]; - rtems_unsigned8 i2cmr; - rtems_unsigned8 _pad28[0x900-0x875]; + uint8_t i2mod; + uint8_t _pad23[3]; + uint8_t i2add; + uint8_t _pad24[3]; + uint8_t i2brg; + uint8_t _pad25[3]; + uint8_t i2com; + uint8_t _pad26[3]; + uint8_t i2cer; + uint8_t _pad27[3]; + uint8_t i2cmr; + uint8_t _pad28[0x900-0x875]; /* * DMA Block */ - rtems_unsigned32 _pad29; - rtems_unsigned32 sdar; - rtems_unsigned8 sdsr; - rtems_unsigned8 _pad30[3]; - rtems_unsigned8 sdmr; - rtems_unsigned8 _pad31[3]; - rtems_unsigned8 idsr1; - rtems_unsigned8 _pad32[3]; - rtems_unsigned8 idmr1; - rtems_unsigned8 _pad33[3]; - rtems_unsigned8 idsr2; - rtems_unsigned8 _pad34[3]; - rtems_unsigned8 idmr2; - rtems_unsigned8 _pad35[0x930-0x91d]; + uint32_t _pad29; + uint32_t sdar; + uint8_t sdsr; + uint8_t _pad30[3]; + uint8_t sdmr; + uint8_t _pad31[3]; + uint8_t idsr1; + uint8_t _pad32[3]; + uint8_t idmr1; + uint8_t _pad33[3]; + uint8_t idsr2; + uint8_t _pad34[3]; + uint8_t idmr2; + uint8_t _pad35[0x930-0x91d]; /* * CPM Interrupt Control Block */ - rtems_unsigned16 civr; - rtems_unsigned8 _pad36[14]; - rtems_unsigned32 cicr; - rtems_unsigned32 cipr; - rtems_unsigned32 cimr; - rtems_unsigned32 cisr; + uint16_t civr; + uint8_t _pad36[14]; + uint32_t cicr; + uint32_t cipr; + uint32_t cimr; + uint32_t cisr; /* * I/O Port Block */ - rtems_unsigned16 padir; - rtems_unsigned16 papar; - rtems_unsigned16 paodr; - rtems_unsigned16 padat; - rtems_unsigned8 _pad37[8]; - rtems_unsigned16 pcdir; - rtems_unsigned16 pcpar; - rtems_unsigned16 pcso; - rtems_unsigned16 pcdat; - rtems_unsigned16 pcint; - rtems_unsigned8 _pad39[6]; - rtems_unsigned16 pddir; - rtems_unsigned16 pdpar; - rtems_unsigned16 _pad40; - rtems_unsigned16 pddat; - rtems_unsigned8 _pad41[8]; + uint16_t padir; + uint16_t papar; + uint16_t paodr; + uint16_t padat; + uint8_t _pad37[8]; + uint16_t pcdir; + uint16_t pcpar; + uint16_t pcso; + uint16_t pcdat; + uint16_t pcint; + uint8_t _pad39[6]; + uint16_t pddir; + uint16_t pdpar; + uint16_t _pad40; + uint16_t pddat; + uint8_t _pad41[8]; /* * CPM Timers Block */ - rtems_unsigned16 tgcr; - rtems_unsigned8 _pad42[14]; - rtems_unsigned16 tmr1; - rtems_unsigned16 tmr2; - rtems_unsigned16 trr1; - rtems_unsigned16 trr2; - rtems_unsigned16 tcr1; - rtems_unsigned16 tcr2; - rtems_unsigned16 tcn1; - rtems_unsigned16 tcn2; - rtems_unsigned16 tmr3; - rtems_unsigned16 tmr4; - rtems_unsigned16 trr3; - rtems_unsigned16 trr4; - rtems_unsigned16 tcr3; - rtems_unsigned16 tcr4; - rtems_unsigned16 tcn3; - rtems_unsigned16 tcn4; - rtems_unsigned16 ter1; - rtems_unsigned16 ter2; - rtems_unsigned16 ter3; - rtems_unsigned16 ter4; - rtems_unsigned8 _pad43[8]; + uint16_t tgcr; + uint8_t _pad42[14]; + uint16_t tmr1; + uint16_t tmr2; + uint16_t trr1; + uint16_t trr2; + uint16_t tcr1; + uint16_t tcr2; + uint16_t tcn1; + uint16_t tcn2; + uint16_t tmr3; + uint16_t tmr4; + uint16_t trr3; + uint16_t trr4; + uint16_t tcr3; + uint16_t tcr4; + uint16_t tcn3; + uint16_t tcn4; + uint16_t ter1; + uint16_t ter2; + uint16_t ter3; + uint16_t ter4; + uint8_t _pad43[8]; /* * CPM Block */ - rtems_unsigned16 cpcr; - rtems_unsigned16 _pad44; - rtems_unsigned16 rccr; - rtems_unsigned8 _pad45; - rtems_unsigned8 rmds; - rtems_unsigned32 rmdr; - rtems_unsigned16 rctr1; - rtems_unsigned16 rctr2; - rtems_unsigned16 rctr3; - rtems_unsigned16 rctr4; - rtems_unsigned16 _pad46; - rtems_unsigned16 rter; - rtems_unsigned16 _pad47; - rtems_unsigned16 rtmr; - rtems_unsigned8 _pad48[0x9f0-0x9dc]; + uint16_t cpcr; + uint16_t _pad44; + uint16_t rccr; + uint8_t _pad45; + uint8_t rmds; + uint32_t rmdr; + uint16_t rctr1; + uint16_t rctr2; + uint16_t rctr3; + uint16_t rctr4; + uint16_t _pad46; + uint16_t rter; + uint16_t _pad47; + uint16_t rtmr; + uint8_t _pad48[0x9f0-0x9dc]; /* * BRG Block */ - rtems_unsigned32 brgc1; - rtems_unsigned32 brgc2; - rtems_unsigned32 brgc3; - rtems_unsigned32 brgc4; + uint32_t brgc1; + uint32_t brgc2; + uint32_t brgc3; + uint32_t brgc4; /* * SCC Block @@ -1360,7 +1360,7 @@ typedef struct m8xx_ { m8xxSCCRegisters_t scc3; m8xxSCCRegisters_t scc4; #elif defined(mpc821) - rtems_unsigned8 _pad72[0xa80-0xa40]; + uint8_t _pad72[0xa80-0xa40]; #endif /* @@ -1372,62 +1372,62 @@ typedef struct m8xx_ { /* * SPI Block */ - rtems_unsigned16 spmode; - rtems_unsigned16 _pad49[2]; - rtems_unsigned8 spie; - rtems_unsigned8 _pad50; - rtems_unsigned16 _pad51; - rtems_unsigned8 spim; - rtems_unsigned8 _pad52[2]; - rtems_unsigned8 spcom; - rtems_unsigned16 _pad53[2]; + uint16_t spmode; + uint16_t _pad49[2]; + uint8_t spie; + uint8_t _pad50; + uint16_t _pad51; + uint8_t spim; + uint8_t _pad52[2]; + uint8_t spcom; + uint16_t _pad53[2]; /* * PIP Block */ - rtems_unsigned16 pipc; - rtems_unsigned16 _pad54; - rtems_unsigned16 ptpr; - rtems_unsigned32 pbdir; - rtems_unsigned32 pbpar; - rtems_unsigned16 _pad55; - rtems_unsigned16 pbodr; - rtems_unsigned32 pbdat; - rtems_unsigned32 _pad56[6]; + uint16_t pipc; + uint16_t _pad54; + uint16_t ptpr; + uint32_t pbdir; + uint32_t pbpar; + uint16_t _pad55; + uint16_t pbodr; + uint32_t pbdat; + uint32_t _pad56[6]; /* * SI Block */ - rtems_unsigned32 simode; - rtems_unsigned8 sigmr; - rtems_unsigned8 _pad57; - rtems_unsigned8 sistr; - rtems_unsigned8 sicmr; - rtems_unsigned32 _pad58; - rtems_unsigned32 sicr; - rtems_unsigned16 sirp[2]; - rtems_unsigned32 _pad59[3]; - rtems_unsigned8 _pad60[0xc00-0xb00]; - rtems_unsigned8 siram[512]; + uint32_t simode; + uint8_t sigmr; + uint8_t _pad57; + uint8_t sistr; + uint8_t sicmr; + uint32_t _pad58; + uint32_t sicr; + uint16_t sirp[2]; + uint32_t _pad59[3]; + uint8_t _pad60[0xc00-0xb00]; + uint8_t siram[512]; #if defined(mpc860) /* * This is only used on the MPC8xxT - for the Fast Ethernet Controller (FEC) */ m8xxFECRegisters_t fec; #elif defined(mpc821) - rtems_unsigned8 lcdram[512]; + uint8_t lcdram[512]; #endif - rtems_unsigned8 _pad62[0x2000-0x1000]; + uint8_t _pad62[0x2000-0x1000]; /* * Dual-port RAM */ - rtems_unsigned8 dpram0[0x200]; /* BD/DATA/UCODE */ - rtems_unsigned8 dpram1[0x200]; /* BD/DATA/UCODE */ - rtems_unsigned8 dpram2[0x400]; /* BD/DATA/UCODE */ - rtems_unsigned8 dpram3[0x600]; /* BD/DATA*/ - rtems_unsigned8 dpram4[0x200]; /* BD/DATA/UCODE */ - rtems_unsigned8 _pad63[0x3c00-0x3000]; + uint8_t dpram0[0x200]; /* BD/DATA/UCODE */ + uint8_t dpram1[0x200]; /* BD/DATA/UCODE */ + uint8_t dpram2[0x400]; /* BD/DATA/UCODE */ + uint8_t dpram3[0x600]; /* BD/DATA*/ + uint8_t dpram4[0x200]; /* BD/DATA/UCODE */ + uint8_t _pad63[0x3c00-0x3000]; /* When using SCC1 for ethernet, we lose the use of I2C since * their parameters would overlap. Motorola has a microcode @@ -1442,34 +1442,34 @@ typedef struct m8xx_ { * However, Ethernet only works on SCC1 on the 8xx. */ m8xxSCCENparms_t scc1p; - rtems_unsigned8 _rsv1[0xCB0-0xC00-sizeof(m8xxSCCENparms_t)]; + uint8_t _rsv1[0xCB0-0xC00-sizeof(m8xxSCCENparms_t)]; m8xxMiscParms_t miscp; - rtems_unsigned8 _rsv2[0xcc0-0xCB0-sizeof(m8xxMiscParms_t)]; + uint8_t _rsv2[0xcc0-0xCB0-sizeof(m8xxMiscParms_t)]; m8xxIDMAparms_t idma1p; - rtems_unsigned8 _rsv3[0xd00-0xcc0-sizeof(m8xxIDMAparms_t)]; + uint8_t _rsv3[0xd00-0xcc0-sizeof(m8xxIDMAparms_t)]; m8xxSCCparms_t scc2p; - rtems_unsigned8 _rsv4[0xD80-0xD00-sizeof(m8xxSCCparms_t)]; + uint8_t _rsv4[0xD80-0xD00-sizeof(m8xxSCCparms_t)]; m8xxSPIparms_t spip; - rtems_unsigned8 _rsv5[0xDB0-0xD80-sizeof(m8xxSPIparms_t)]; + uint8_t _rsv5[0xDB0-0xD80-sizeof(m8xxSPIparms_t)]; m8xxTimerParms_t tmp; - rtems_unsigned8 _rsv6[0xDC0-0xDB0-sizeof(m8xxTimerParms_t)]; + uint8_t _rsv6[0xDC0-0xDB0-sizeof(m8xxTimerParms_t)]; m8xxIDMAparms_t idma2p; - rtems_unsigned8 _rsv7[0xE00-0xDC0-sizeof(m8xxIDMAparms_t)]; + uint8_t _rsv7[0xE00-0xDC0-sizeof(m8xxIDMAparms_t)]; m8xxSCCparms_t scc3p; /* Not available on MPC821 */ - rtems_unsigned8 _rsv8[0xE80-0xE00-sizeof(m8xxSCCparms_t)]; + uint8_t _rsv8[0xE80-0xE00-sizeof(m8xxSCCparms_t)]; m8xxSMCparms_t smc1p; - rtems_unsigned8 _rsv9[0xEC0-0xE80-sizeof(m8xxSMCparms_t)]; + uint8_t _rsv9[0xEC0-0xE80-sizeof(m8xxSMCparms_t)]; m8xxDSPparms_t dsp1p; - rtems_unsigned8 _rsv10[0xF00-0xEC0-sizeof(m8xxDSPparms_t)]; + uint8_t _rsv10[0xF00-0xEC0-sizeof(m8xxDSPparms_t)]; m8xxSCCparms_t scc4p; /* Not available on MPC821 */ - rtems_unsigned8 _rsv11[0xF80-0xF00-sizeof(m8xxSCCparms_t)]; + uint8_t _rsv11[0xF80-0xF00-sizeof(m8xxSCCparms_t)]; m8xxSMCparms_t smc2p; - rtems_unsigned8 _rsv12[0xFC0-0xF80-sizeof(m8xxSMCparms_t)]; + uint8_t _rsv12[0xFC0-0xF80-sizeof(m8xxSMCparms_t)]; m8xxDSPparms_t dsp2p; - rtems_unsigned8 _rsv13[0x1000-0xFC0-sizeof(m8xxDSPparms_t)]; + uint8_t _rsv13[0x1000-0xFC0-sizeof(m8xxDSPparms_t)]; } m8xx_t; extern volatile m8xx_t m8xx; diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/mmu.c b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/mmu.c index a081b24dc2..99d0a23575 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/mmu.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/mmu.c @@ -34,7 +34,7 @@ */ void mmu_init( void ) { - register unsigned32 reg1, i; + register uint32_t reg1, i; /* * Initialize the TLBs diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c index 6a80358b81..627927bc60 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c @@ -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(); diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c index d272930035..340487f8f7 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c +++ b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c @@ -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 */ diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console.c b/c/src/lib/libcpu/powerpc/ppc403/console/console.c index 7335e6927f..a03231f931 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/console.c +++ b/c/src/lib/libcpu/powerpc/ppc403/console/console.c @@ -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; diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console405.c b/c/src/lib/libcpu/powerpc/ppc403/console/console405.c index fbcbeb8b52..345d1abea2 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/console405.c +++ b/c/src/lib/libcpu/powerpc/ppc403/console/console405.c @@ -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) ); diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c index 769f200822..d459a31306 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c +++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.c @@ -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 ) { diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h index 6c6f77f0e5..3cbaec9c25 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h +++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/ictrl.h @@ -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 ); /* diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c index c5911fe4a2..724b936d94 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/ppc403/timer/timer.c @@ -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(); diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c index 56ff791f41..afbf36667a 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c +++ b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/tty_drv.c @@ -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) ); diff --git a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h b/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h index a728bfd0e5..0d84ee7726 100644 --- a/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h +++ b/c/src/lib/libcpu/powerpc/rtems/powerpc/cache.h @@ -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) \ diff --git a/c/src/lib/libcpu/powerpc/shared/src/cache.c b/c/src/lib/libcpu/powerpc/shared/src/cache.c index a83e28891b..285fe21b8b 100644 --- a/c/src/lib/libcpu/powerpc/shared/src/cache.c +++ b/c/src/lib/libcpu/powerpc/shared/src/cache.c @@ -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; |