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

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

7 files changed, 21 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
index 72c5a66600..13b386880f 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/ckinit.c, shmsupp/getcfg.c, shmsupp/lock.c,
+	startup/bspstart.c, timer/timer.c, timer/timerisr.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/no_cpu/no_bsp/clock/ckinit.c b/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
index d720b66659..e4954ab9af 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
@@ -34,7 +34,7 @@ rtems_isr Clock_isr( rtems_vector_number vector );
  *  number of clock ticks since the driver was initialized.
  */
 
-volatile rtems_unsigned32 Clock_driver_ticks;
+volatile uint32_t         Clock_driver_ticks;
 
 /*
  *  Clock_isrs is the number of clock ISRs until the next invocation of
@@ -44,7 +44,7 @@ volatile rtems_unsigned32 Clock_driver_ticks;
  *  has passed.
  */
 
-rtems_unsigned32 Clock_isrs;              /* ISRs until next tick */
+uint32_t         Clock_isrs;              /* ISRs until next tick */
 
 /*
  * These are set by clock driver during its init
@@ -153,7 +153,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/no_cpu/no_bsp/shmsupp/getcfg.c b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c
index cd6fa7a9c0..2210634983 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/getcfg.c
@@ -46,7 +46,7 @@ XXX: FIX THE COMMENTS BELOW WHEN THE CPU IS KNOWN
 shm_config_table BSP_shm_cfgtbl;
 
 void Shm_Get_configuration(
-  rtems_unsigned32   localnode,
+  uint32_t           localnode,
   shm_config_table **shmcfg
 )
 {
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
index 54ab097d31..94ca2a6c0d 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
@@ -44,9 +44,9 @@ void Shm_Lock(
   Shm_Locked_queue_Control *lq_cb
 )
 {
-  rtems_unsigned32 isr_level;
-  rtems_unsigned32 *lockptr = (rtems_unsigned32 *) &lq_cb->lock;
-  rtems_unsigned32 lock_value;
+  uint32_t         isr_level;
+  uint32_t         *lockptr = (uint32_t*) &lq_cb->lock;
+  uint32_t         lock_value;
 
   lock_value = 0x80000000;
   rtems_interrupt_disable( isr_level );
@@ -76,7 +76,7 @@ void Shm_Unlock(
   Shm_Locked_queue_Control *lq_cb
 )
 {
-  rtems_unsigned32 isr_level;
+  uint32_t         isr_level;
 
   lq_cb->lock = SHM_UNLOCK_VALUE;
   isr_level = Shm_isrstat;
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
index afee9755d4..e5ade81327 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
@@ -38,7 +38,7 @@ char *rtems_progname;
  */
  
 void bsp_postdriver_hook(void);
-void bsp_libc_init( void *, unsigned32, int );
+void bsp_libc_init( void *, uint32_t, int );
 
 /*
  *  Function:   bsp_pretasking_hook
@@ -57,9 +57,9 @@ void bsp_libc_init( void *, unsigned32, int );
 void bsp_pretasking_hook(void)
 {
     extern int end;
-    rtems_unsigned32        heap_start;
+    uint32_t                heap_start;
 
-    heap_start = (rtems_unsigned32) &end;
+    heap_start = (uint32_t) &end;
     if (heap_start & (CPU_ALIGNMENT-1))
         heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
 
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c
index 4ab13f4db8..9bef085916 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timer.c
@@ -21,7 +21,7 @@
 #include <rtems.h>
 #include <bsp.h>
 
-rtems_unsigned32 Timer_interrupts;
+uint32_t         Timer_interrupts;
 rtems_boolean Timer_driver_Find_average_overhead;
 
 void Timer_initialize( void )
@@ -56,8 +56,8 @@ void Timer_initialize( void )
 
 int Read_timer( void )
 {
-  rtems_unsigned32 clicks;
-  rtems_unsigned32 total;
+  uint32_t         clicks;
+  uint32_t         total;
 
   /*
    *  Read the timer and see how many clicks it has been since we started.
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c
index 2e1e4fdb05..7cbd49a050 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/timer/timerisr.c
@@ -25,7 +25,7 @@
 
 #include <rtems.h>
 
-extern rtems_unsigned32 _Timer_interrupts;
+extern uint32_t         _Timer_interrupts;
 
 void timerisr( void )
 {