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

	* clock/ckinit.c, startup/bspstart.c, timer/timer.c: Convert to
	using c99 fixed size types.

8 files changed, 24 insertions, 14 deletions

diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog
index f957f81d69..95ab315378 100644
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/ckinit.c, startup/bspstart.c, timer/timer.c: Convert to
+	using c99 fixed size types.
+
 2004-02-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reflect changes to bsp.am. 
diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
index 245c84df1f..4080112dd5 100644
--- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
@@ -28,8 +28,8 @@
 #include <bsp.h>
 #include <rtems/libio.h>
 
-rtems_unsigned32 Clock_isrs;        /* ISRs until next tick */
-volatile rtems_unsigned32 Clock_driver_ticks;
+uint32_t         Clock_isrs;        /* ISRs until next tick */
+volatile uint32_t         Clock_driver_ticks;
                                     /* ticks since initialization */
 rtems_isr_entry  Old_ticker;
 
@@ -130,7 +130,7 @@ rtems_isr_entry clock_isr;
 /* The following was added for debugging purposes */
 void Clock_exit( void )
 {
-  rtems_unsigned8 data;
+  uint8_t         data;
 
   /* disable timer
   	data = TCR;
@@ -165,7 +165,7 @@ rtems_device_driver Clock_control(
   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/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
index 5f599a70d4..ba8a3406e0 100644
--- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c
@@ -44,7 +44,7 @@ char *rtems_progname;
  */
  
 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/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c
index 2e7516af32..1c14f595b9 100644
--- a/c/src/lib/libbsp/m68k/idp/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c
@@ -67,9 +67,9 @@ void Timer_initialize()
 
 int Read_timer() 
 {
-  rtems_unsigned8 data;
-  rtems_unsigned8  msb, osb, lsb;
-  rtems_unsigned32 remaining, total;
+  uint8_t         data;
+  uint8_t          msb, osb, lsb;
+  uint32_t         remaining, total;
 
   /* Disable timer so that timer can be read
         data = TCR;
diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index 9ec5f68e62..ef31fdce4a 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/ckinit.c, startup/bspstart.c, timer/timer.c: Convert to
+	using c99 fixed size types.
+
 2004-02-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Reflect changes to bsp.am. 
diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
index 91944686c2..d01e476141 100644
--- a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
@@ -32,8 +32,8 @@
 #define MS_COUNT          1000            /* T2's countdown constant (1 ms) */
 #define CLOCK_INT_LEVEL   6               /* T2's interrupt level */
 
-rtems_unsigned32 Clock_isrs;                  /* ISRs until next tick */
-volatile rtems_unsigned32 Clock_driver_ticks; /* ticks since initialization */
+uint32_t         Clock_isrs;                  /* ISRs until next tick */
+volatile uint32_t         Clock_driver_ticks; /* ticks since initialization */
 rtems_isr_entry  Old_ticker;
 
 void Clock_exit( void );
@@ -114,7 +114,7 @@ rtems_device_driver Clock_control(
   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/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
index c53b506b4e..cc581d62cf 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
@@ -45,7 +45,7 @@ char *rtems_progname;
  */
  
 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/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
index cebd79ac21..0b08bd63a3 100644
--- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c
@@ -37,7 +37,7 @@
 #define TICK_INTERVAL         0x10000U
 #define TIMER_INT_LEVEL       6
 
-rtems_unsigned32    Ttimer_val;
+uint32_t            Ttimer_val;
 rtems_boolean       Timer_driver_Find_average_overhead;
 
 rtems_isr timerisr();
@@ -65,7 +65,7 @@ void Timer_initialize()
 
 int Read_timer() 
 {
-  rtems_unsigned32    total;
+  uint32_t            total;
 
   total = (Ttimer_val * TICK_INTERVAL) + lcsr->timer_cnt_1;