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

	* clock/ckinit.c, console/console-recording.h, console/console.c,
	fatal/bspfatal.c, include/fatal.h, network/network.c,
	network/uti596.h, startup/bspstart.c, timer/timer.c: Convert to
	using c99 fixed size types.

10 files changed, 119 insertions, 112 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
index 052a949113..f8a54ae409 100644
--- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/ckinit.c, console/console-recording.h, console/console.c,
+	fatal/bspfatal.c, include/fatal.h, network/network.c,
+	network/uti596.h, startup/bspstart.c, timer/timer.c: Convert to
+	using c99 fixed size types.
+
 2004-03-05	Joel Sherrill <joel@OARcorp.com>
 
 	* network/network.c: Remove warnings for unused routines left from
diff --git a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
index 5656f9bec9..e457c21d42 100644
--- a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
@@ -56,7 +56,7 @@ rtems_device_minor_number rtems_clock_minor;
  *  Clock_driver_ticks is a monotonically increasing counter of the number of
  *  VMEchip2 timer #2 ticks since the driver was initialized.
  */
-volatile rtems_unsigned32 Clock_driver_ticks;
+volatile uint32_t         Clock_driver_ticks;
 
 
 /* 
@@ -68,7 +68,7 @@ volatile rtems_unsigned32 Clock_driver_ticks;
  *  cannot tick faster than the hardware clock. Therefore, the kernel clock
  *  ticks cannot occur more frequently than every 1 millisecond.
  */
-rtems_unsigned32 Clock_isrs;
+uint32_t         Clock_isrs;
 
 
 /*
@@ -126,7 +126,7 @@ rtems_isr VMEchip2_T2_isr(
       rtems_clock_tick();
     }
     /* Reset the counter */
-    Clock_isrs = (rtems_unsigned32)-i;
+    Clock_isrs = (uint32_t)-i;
   }
   else 
     Clock_isrs -= overflow;
@@ -249,7 +249,7 @@ rtems_device_driver Clock_control(
   rtems_device_minor_number minor,
   void *pargp)
 {
-    rtems_unsigned32 isrlevel;
+    uint32_t         isrlevel;
     rtems_libio_ioctl_args_t *args = pargp;
  
     if ( args == 0 )
diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h b/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h
index 27c41ee6a8..81ea4461a9 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h
+++ b/c/src/lib/libbsp/m68k/mvme167/console/console-recording.h
@@ -139,7 +139,7 @@ struct cd2401_debug_info {
       unsigned char status;
       unsigned char initial_ier;
       unsigned char final_ier;
-      rtems_unsigned8 txEmpty;
+      uint8_t         txEmpty;
     } tx_isr_info;
     struct cd2401_tx_isr_spurious_info {
       unsigned char channel;
@@ -180,11 +180,11 @@ struct cd2401_debug_info {
     } modem_isr_spurious_info;
     struct cd2401_first_open_info {
       unsigned char channel;
-      rtems_unsigned8 init_count;
+      uint8_t         init_count;
     } first_open_info;
     struct cd2401_last_close_info {
       unsigned char channel;
-      rtems_unsigned8 init_count;
+      uint8_t         init_count;
     } last_close_info;
     struct cd2401_start_remote_tx_info {
       unsigned char channel;
@@ -194,33 +194,33 @@ struct cd2401_debug_info {
     } stop_remote_tx_info;
     struct cd2401_set_attribute_info {
       int minor;
-      rtems_unsigned8 need_reinit;
-      rtems_unsigned8 txEmpty;
-      rtems_unsigned8 csize;
-      rtems_unsigned8 cstopb;
-      rtems_unsigned8 parodd;
-      rtems_unsigned8 parenb;
-      rtems_unsigned8 ignpar;
-      rtems_unsigned8 inpck;
-      rtems_unsigned8 hw_flow_ctl;
-      rtems_unsigned8 sw_flow_ctl;
-      rtems_unsigned8 extra_flow_ctl;
-      rtems_unsigned8 icrnl;
-      rtems_unsigned8 igncr;
-      rtems_unsigned8 inlcr;
-      rtems_unsigned8 brkint;
-      rtems_unsigned8 ignbrk;
-      rtems_unsigned8 parmrk;
-      rtems_unsigned8 istrip;
-      rtems_unsigned16 tx_period;
-      rtems_unsigned16 rx_period;
-      rtems_unsigned32 out_baud;
-      rtems_unsigned32 in_baud;
+      uint8_t         need_reinit;
+      uint8_t         txEmpty;
+      uint8_t         csize;
+      uint8_t         cstopb;
+      uint8_t         parodd;
+      uint8_t         parenb;
+      uint8_t         ignpar;
+      uint8_t         inpck;
+      uint8_t         hw_flow_ctl;
+      uint8_t         sw_flow_ctl;
+      uint8_t         extra_flow_ctl;
+      uint8_t         icrnl;
+      uint8_t         igncr;
+      uint8_t         inlcr;
+      uint8_t         brkint;
+      uint8_t         ignbrk;
+      uint8_t         parmrk;
+      uint8_t         istrip;
+      uint16_t         tx_period;
+      uint16_t         rx_period;
+      uint32_t         out_baud;
+      uint32_t         in_baud;
     } set_attribute_info;
     struct cd2401_drain_output_info {
-      rtems_unsigned8 txEmpty;
-      rtems_unsigned8 own_buf_A;
-      rtems_unsigned8 own_buf_B;
+      uint8_t         txEmpty;
+      uint8_t         own_buf_A;
+      uint8_t         own_buf_B;
     } drain_output_info;
     struct cd2401_delay_info {
       rtems_interval start;
@@ -272,7 +272,7 @@ void cd2401_record_tx_isr_info(
   unsigned char status,
   unsigned char initial_ier,
   unsigned char final_ier,
-  rtems_unsigned8 txEmpty
+  uint8_t         txEmpty
 )
 { 
   memset( &(cd2401_debug_buffer[cd2401_debug_index]), '\0', sizeof( struct cd2401_debug_info )  );
@@ -361,8 +361,8 @@ void cd2401_record_rx_isr_info(
 void cd2401_record_rx_isr_spurious_info(
   unsigned char ch,
   unsigned char status,
-  rtems_unsigned32 spur_dev,
-  rtems_unsigned32 spur_cnt
+  uint32_t         spur_dev,
+  uint32_t         spur_cnt
 )
 {
   memset( &(cd2401_debug_buffer[cd2401_debug_index]), '\0', sizeof( struct cd2401_debug_info )  );
@@ -380,8 +380,8 @@ void cd2401_record_rx_isr_spurious_info(
 
 void cd2401_record_re_isr_spurious_info(
   unsigned char ch,
-  rtems_unsigned32 spur_dev,
-  rtems_unsigned32 spur_cnt
+  uint32_t         spur_dev,
+  uint32_t         spur_cnt
 )
 {
   memset( &(cd2401_debug_buffer[cd2401_debug_index]), '\0', sizeof( struct cd2401_debug_info )  );
@@ -398,8 +398,8 @@ void cd2401_record_re_isr_spurious_info(
 
 void cd2401_record_modem_isr_spurious_info(
   unsigned char ch,
-  rtems_unsigned32 spur_dev,
-  rtems_unsigned32 spur_cnt
+  uint32_t         spur_dev,
+  uint32_t         spur_cnt
 )
 {
   memset( &(cd2401_debug_buffer[cd2401_debug_index]), '\0', sizeof( struct cd2401_debug_info )  );
@@ -416,7 +416,7 @@ void cd2401_record_modem_isr_spurious_info(
 
 void cd2401_record_first_open_info(
   unsigned char ch,
-  rtems_unsigned8 init_count
+  uint8_t         init_count
 )
 {
   memset( &(cd2401_debug_buffer[cd2401_debug_index]), '\0', sizeof( struct cd2401_debug_info )  );
@@ -432,7 +432,7 @@ void cd2401_record_first_open_info(
 
 void cd2401_record_last_close_info(
   unsigned char ch,
-  rtems_unsigned8 init_count
+  uint8_t         init_count
 )
 {
   memset( &(cd2401_debug_buffer[cd2401_debug_index]), '\0', sizeof( struct cd2401_debug_info )  );
@@ -476,27 +476,27 @@ void cd2401_record_stop_remote_tx_info(
 
 void cd2401_record_set_attributes_info( 
   int minor,
-  rtems_unsigned8 need_reinit,
-  rtems_unsigned8 csize,
-  rtems_unsigned8 cstopb,
-  rtems_unsigned8 parodd,
-  rtems_unsigned8 parenb,
-  rtems_unsigned8 ignpar,
-  rtems_unsigned8 inpck,
-  rtems_unsigned8 hw_flow_ctl,
-  rtems_unsigned8 sw_flow_ctl,
-  rtems_unsigned8 extra_flow_ctl,
-  rtems_unsigned8 icrnl,
-  rtems_unsigned8 igncr,
-  rtems_unsigned8 inlcr,
-  rtems_unsigned8 brkint,
-  rtems_unsigned8 ignbrk,
-  rtems_unsigned8 parmrk,
-  rtems_unsigned8 istrip,
-  rtems_unsigned16 tx_period,
-  rtems_unsigned16 rx_period,
-  rtems_unsigned32 out_baud,
-  rtems_unsigned32 in_baud
+  uint8_t         need_reinit,
+  uint8_t         csize,
+  uint8_t         cstopb,
+  uint8_t         parodd,
+  uint8_t         parenb,
+  uint8_t         ignpar,
+  uint8_t         inpck,
+  uint8_t         hw_flow_ctl,
+  uint8_t         sw_flow_ctl,
+  uint8_t         extra_flow_ctl,
+  uint8_t         icrnl,
+  uint8_t         igncr,
+  uint8_t         inlcr,
+  uint8_t         brkint,
+  uint8_t         ignbrk,
+  uint8_t         parmrk,
+  uint8_t         istrip,
+  uint16_t         tx_period,
+  uint16_t         rx_period,
+  uint32_t         out_baud,
+  uint32_t         in_baud
 )
 {
   memset( &(cd2401_debug_buffer[cd2401_debug_index]), '\0', sizeof( struct cd2401_debug_info )  );
@@ -532,9 +532,9 @@ void cd2401_record_set_attributes_info(
 
 
 void cd2401_record_drain_output_info(
-  rtems_unsigned8 txEmpty,
-  rtems_unsigned8 own_buf_A,
-  rtems_unsigned8 own_buf_B
+  uint8_t         txEmpty,
+  uint8_t         own_buf_A,
+  uint8_t         own_buf_B
 )
 {
   memset( &(cd2401_debug_buffer[cd2401_debug_index]), '\0', sizeof( struct cd2401_debug_info )  );
diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console.c b/c/src/lib/libbsp/m68k/mvme167/console/console.c
index c179f4c7e9..a68737c342 100644
--- a/c/src/lib/libbsp/m68k/mvme167/console/console.c
+++ b/c/src/lib/libbsp/m68k/mvme167/console/console.c
@@ -135,8 +135,8 @@
 
 /* Utility functions */
 void cd2401_udelay( unsigned long delay );
-void cd2401_chan_cmd( rtems_unsigned8 channel, rtems_unsigned8 cmd, rtems_unsigned8 wait );
-rtems_unsigned16 cd2401_bitrate_divisor( rtems_unsigned32 clkrate, rtems_unsigned32* bitrate );
+void cd2401_chan_cmd( uint8_t         channel, uint8_t         cmd, uint8_t         wait );
+uint16_t         cd2401_bitrate_divisor( uint32_t         clkrate, uint32_t        * bitrate );
 void cd2401_initialize( void );
 void cd2401_interrupts_initialize( rtems_boolean enable );
 
@@ -168,13 +168,13 @@ BSP_output_char_function_type BSP_output_char = _BSP_output_char;
   void *tty;                    /* Really a struct rtems_termios_tty * */
   int len;                      /* Record nb of chars being TX'ed */
   const char *buf;              /* Record where DMA is coming from */
-  rtems_unsigned32 spur_cnt;    /* Nb of spurious ints so far */
-  rtems_unsigned32 spur_dev;    /* Indo on last spurious int */
-  rtems_unsigned32 buserr_addr; /* Faulting address */
-  rtems_unsigned32 buserr_type; /* Reason of bus error during DMA */
-  rtems_unsigned8  own_buf_A;   /* If true, buffer A belongs to the driver */
-  rtems_unsigned8  own_buf_B;   /* If true, buffer B belongs to the driver */
-  rtems_unsigned8  txEmpty;     /* If true, the output FIFO should be empty */
+  uint32_t         spur_cnt;    /* Nb of spurious ints so far */
+  uint32_t         spur_dev;    /* Indo on last spurious int */
+  uint32_t         buserr_addr; /* Faulting address */
+  uint32_t         buserr_type; /* Reason of bus error during DMA */
+  uint8_t          own_buf_A;   /* If true, buffer A belongs to the driver */
+  uint8_t          own_buf_B;   /* If true, buffer B belongs to the driver */
+  uint8_t          txEmpty;     /* If true, the output FIFO should be empty */
 } CD2401_Channel_Info[4];
 
 /*
@@ -186,7 +186,7 @@ BSP_output_char_function_type BSP_output_char = _BSP_output_char;
  *  be allocated in the .bss section, and rely on RTEMS to zero the .bss
  *  section on every startup.
  */
-rtems_unsigned8 Init_count;
+uint8_t         Init_count;
 
 
 /* Record previous handlers */
@@ -255,9 +255,9 @@ rtems_isr_entry Prev_modem_isr;     /* Previous modem/timer isr */
  *  Return values: NONE
  */
 void cd2401_chan_cmd(
-  rtems_unsigned8 channel,
-  rtems_unsigned8 cmd,
-  rtems_unsigned8 wait
+  uint8_t         channel,
+  uint8_t         cmd,
+  uint8_t         wait
 )
 {
   if ( channel < 4 ) {
@@ -291,13 +291,13 @@ void cd2401_chan_cmd(
  *    Returns divisor in lower byte and clock source in upper byte for the
  *    specified bitrate.
  */
-rtems_unsigned16 cd2401_bitrate_divisor(
-  rtems_unsigned32 clkrate,
-  rtems_unsigned32* bitrate
+uint16_t         cd2401_bitrate_divisor(
+  uint32_t         clkrate,
+  uint32_t        * bitrate
 )
 {
-  rtems_unsigned32 divisor;
-  rtems_unsigned16 clksource;
+  uint32_t         divisor;
+  uint16_t         clksource;
 
   divisor = *bitrate << 3;          /* temporary; multiply by 8 for CLK/8 */
   divisor = (clkrate + (divisor>>1)) / divisor; /* divisor for clk0 (CLK/8) */
@@ -465,7 +465,7 @@ rtems_isr cd2401_modem_isr(
   rtems_vector_number vector
 )
 {
-  rtems_unsigned8 ch;
+  uint8_t         ch;
 
   /* Get interrupting channel ID */
   ch = cd2401->licr >> 2;
@@ -501,7 +501,7 @@ rtems_isr cd2401_re_isr(
   rtems_vector_number vector
 )
 {
-  rtems_unsigned8 ch;
+  uint8_t         ch;
 
   /* Get interrupting channel ID */
   ch = cd2401->licr >> 2;
@@ -537,7 +537,7 @@ rtems_isr cd2401_rx_isr(
 )
 {
   char c;
-  rtems_unsigned8 ch, status, nchars, i, total;
+  uint8_t         ch, status, nchars, i, total;
   char buffer[256];
 
   status = cd2401->u5.b.risrl;
@@ -584,7 +584,7 @@ rtems_isr cd2401_tx_isr(
   rtems_vector_number vector
 )
 {
-  rtems_unsigned8 ch, status, buserr, initial_ier, final_ier;
+  uint8_t         ch, status, buserr, initial_ier, final_ier;
 
   status = cd2401->tisr;
   ch = cd2401->licr >> 2;
@@ -615,7 +615,7 @@ rtems_isr cd2401_tx_isr(
     CD2401_Channel_Info[ch].buserr_type =
          (vector << 24) | (buserr << 16) | (cd2401->tir << 8) | cd2401->tisr;
     CD2401_Channel_Info[ch].buserr_addr =
-        (((rtems_unsigned32)cd2401->tcbadru) << 16) | cd2401->tcbadrl;
+        (((uint32_t)cd2401->tcbadru) << 16) | cd2401->tcbadrl;
 
     cd2401->teoir = 0x80;           /* EOI - terminate bad buffer */
     CD2401_RECORD_TX_ISR_BUSERR_INFO(( ch, status, initial_ier, buserr,
@@ -820,13 +820,13 @@ int cd2401_setAttributes(
   const struct termios *t
 )
 {
-  rtems_unsigned8 csize, cstopb, parodd, parenb, ignpar, inpck;
-  rtems_unsigned8 hw_flow_ctl, sw_flow_ctl, extra_flow_ctl;
-  rtems_unsigned8 icrnl, igncr, inlcr, brkint, ignbrk, parmrk, istrip;
-  rtems_unsigned8 need_reinitialization = FALSE;
-  rtems_unsigned8 read_enabled;
-  rtems_unsigned16 tx_period, rx_period;
-  rtems_unsigned32 out_baud, in_baud;
+  uint8_t         csize, cstopb, parodd, parenb, ignpar, inpck;
+  uint8_t         hw_flow_ctl, sw_flow_ctl, extra_flow_ctl;
+  uint8_t         icrnl, igncr, inlcr, brkint, ignbrk, parmrk, istrip;
+  uint8_t         need_reinitialization = FALSE;
+  uint8_t         read_enabled;
+  uint16_t         tx_period, rx_period;
+  uint32_t         out_baud, in_baud;
   rtems_interrupt_level level;
 
   /* Determine what the line parameters should be */
@@ -1202,8 +1202,8 @@ int cd2401_write(
     CD2401_Channel_Info[minor].own_buf_A = FALSE;
     CD2401_Channel_Info[minor].len = len;
     CD2401_Channel_Info[minor].buf = buf;
-    cd2401->atbadru = (rtems_unsigned16)( ( (rtems_unsigned32) buf ) >> 16 );
-    cd2401->atbadrl = (rtems_unsigned16)( (rtems_unsigned32) buf );
+    cd2401->atbadru = (uint16_t)( ( (uint32_t) buf ) >> 16 );
+    cd2401->atbadrl = (uint16_t)( (uint32_t) buf );
     cd2401->atbcnt = len;
     CD2401_RECORD_WRITE_INFO(( len, buf, 'A' ));
     cd2401->atbsts = 0x03;          /* CD2401 owns buffer, int when empty */
@@ -1215,8 +1215,8 @@ int cd2401_write(
     CD2401_Channel_Info[minor].own_buf_B = FALSE;
     CD2401_Channel_Info[minor].len = len;
     CD2401_Channel_Info[minor].buf = buf;
-    cd2401->btbadru = (rtems_unsigned16)( ( (rtems_unsigned32) buf ) >> 16 );
-    cd2401->btbadrl = (rtems_unsigned16)( (rtems_unsigned32) buf );
+    cd2401->btbadru = (uint16_t)( ( (uint32_t) buf ) >> 16 );
+    cd2401->btbadrl = (uint16_t)( (uint32_t) buf );
     cd2401->btbcnt = len;
     CD2401_RECORD_WRITE_INFO(( len, buf, 'B' ));
     cd2401->btbsts = 0x03;          /* CD2401 owns buffer, int when empty */
@@ -1396,7 +1396,7 @@ rtems_status_code do_poll_read(
   int c;
 
   while( (c = _167Bug_pollRead (minor)) == -1 );
-  rw_args->buffer[0] = (unsigned8)c;
+  rw_args->buffer[0] = (uint8_t)c;
   if( rw_args->buffer[0] == '\r' )
       rw_args->buffer[0] = '\n';
   rw_args->bytes_moved = 1;
@@ -1431,7 +1431,7 @@ rtems_status_code do_poll_write(
 )
 {
   rtems_libio_rw_args_t *rw_args = arg;
-  unsigned32 i;
+  uint32_t   i;
   char cr ='\r';
 
   for( i = 0; i < rw_args->count; i++ ) {
diff --git a/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c b/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c
index 5d7c825087..afdd124382 100644
--- a/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c
+++ b/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c
@@ -65,7 +65,7 @@ static int mystrcat(
 User_extensions_routine bsp_fatal_error_occurred(
   Internal_errors_Source  the_source,
   rtems_boolean           is_internal,
-  rtems_unsigned32        the_error
+  uint32_t                the_error
 )
 {
   struct {
diff --git a/c/src/lib/libbsp/m68k/mvme167/include/fatal.h b/c/src/lib/libbsp/m68k/mvme167/include/fatal.h
index b2ba993001..ae5e0cf50f 100644
--- a/c/src/lib/libbsp/m68k/mvme167/include/fatal.h
+++ b/c/src/lib/libbsp/m68k/mvme167/include/fatal.h
@@ -15,5 +15,5 @@
 User_extensions_routine bsp_fatal_error_occurred(
   Internal_errors_Source  the_source,
   rtems_boolean           is_internal,
-  rtems_unsigned32        the_error
+  uint32_t                the_error
 );
diff --git a/c/src/lib/libbsp/m68k/mvme167/network/network.c b/c/src/lib/libbsp/m68k/mvme167/network/network.c
index 6b3b3080ba..73ec6fc1d3 100644
--- a/c/src/lib/libbsp/m68k/mvme167/network/network.c
+++ b/c/src/lib/libbsp/m68k/mvme167/network/network.c
@@ -133,8 +133,8 @@ static unsigned long uti596_portSelfTest( i596_selftest * );
 static int uti596_portDump ( i596_dump_result * );
 static void uti596_CU_dump ( i596_dump_result * );
 #endif
-static int uti596_wait ( uti596_softc_ *, unsigned8 );
-static int uti596_issueCA ( uti596_softc_ *, unsigned8 );
+static int uti596_wait ( uti596_softc_ *, uint8_t);
+static int uti596_issueCA ( uti596_softc_ *, uint8_t);
 static void uti596_addCmd ( i596_cmd * );
 static void uti596_addPolledCmd ( i596_cmd * );
 static void uti596_dump_scb ( void );
@@ -444,7 +444,7 @@ static int uti596_portDump(
  */
 static int uti596_wait(
   uti596_softc_ *sc,
-  unsigned8 waitType
+  uint8_t   waitType
 )
 {
   rtems_interval ticks_per_second, start_ticks, end_ticks;
@@ -541,7 +541,7 @@ static int uti596_wait(
  */
 static int uti596_issueCA(
   uti596_softc_ *sc,
-  unsigned8 waitType
+  uint8_t   waitType
 )
 {
   /* Issue Channel Attention */
diff --git a/c/src/lib/libbsp/m68k/mvme167/network/uti596.h b/c/src/lib/libbsp/m68k/mvme167/network/uti596.h
index 556945a5fe..38b22af0c5 100644
--- a/c/src/lib/libbsp/m68k/mvme167/network/uti596.h
+++ b/c/src/lib/libbsp/m68k/mvme167/network/uti596.h
@@ -304,8 +304,8 @@ typedef volatile struct i596_scb {
  * Intermediate System Configuration Pointer
  */
 typedef volatile struct i596_iscp {
-    unsigned8 null1;            			/* Always zero */
-    unsigned8 busy;										/* Busy byte */
+    uint8_t   null1;            			/* Always zero */
+    uint8_t   busy;										/* Busy byte */
     unsigned short scb_offset;  			/* Not used in linear mode */
     unsigned long scb_pointer;      	/* Swapped pointer to scb */
     i596_scb *scb;										/* Real pointer to scb */
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
index dffb8b44ff..ab716e2dad 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
@@ -45,7 +45,7 @@ rtems_cpu_table Cpu_table;
  *  rtems/c/src/lib/libbsp/shared/bsplibc.c.
  */
 void bsp_postdriver_hook( void );
-void bsp_libc_init( void *, unsigned32, int );
+void bsp_libc_init( void *, uint32_t, int );
 void bsp_pretasking_hook(void);               /* m68k version */
 
 /*
diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
index 61d6bec933..0b718c085f 100644
--- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c
@@ -39,7 +39,7 @@
 #define TIMER_VECTOR (VBR0 * 0x10 + 0x8)  /* T1 is vector $X8 (p. 2-71)*/
 
 /* Number of interrupts since timer was re-initialized */
-rtems_unsigned32    Ttimer_val;
+uint32_t            Ttimer_val;
 
 /*
  *  Set to TRUE to return raw value. Normally zero. Depends on being allocated
@@ -108,7 +108,7 @@ void Timer_initialize()
  */
 int Read_timer() 
 {
-  rtems_unsigned32    total;
+  uint32_t            total;
 
   total = (Ttimer_val * TICK_INTERVAL) + lcsr->timer_cnt_1;