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

	* clock/clock.c, include/bsp.h, shmsupp/cause_intr.c,
	shmsupp/getcfg.c, shmsupp/lock.c, startup/bspstart.c: Convert to
	using c99 fixed size types.

7 files changed, 22 insertions, 16 deletions

diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog
index 923c889d43..0578f6fb45 100644
--- a/c/src/lib/libbsp/unix/posix/ChangeLog
+++ b/c/src/lib/libbsp/unix/posix/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/clock.c, include/bsp.h, shmsupp/cause_intr.c,
+	shmsupp/getcfg.c, shmsupp/lock.c, startup/bspstart.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/unix/posix/clock/clock.c b/c/src/lib/libbsp/unix/posix/clock/clock.c
index e49f6d6103..ddd7487bc8 100644
--- a/c/src/lib/libbsp/unix/posix/clock/clock.c
+++ b/c/src/lib/libbsp/unix/posix/clock/clock.c
@@ -19,9 +19,9 @@
 
 void Clock_exit(void);
 
-volatile rtems_unsigned32 Clock_driver_ticks;
+volatile uint32_t         Clock_driver_ticks;
 
-rtems_unsigned32 Clock_driver_vector;
+uint32_t         Clock_driver_vector;
 
 /*
  * These are set by clock driver during its init
@@ -84,7 +84,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/unix/posix/include/bsp.h b/c/src/lib/libbsp/unix/posix/include/bsp.h
index 676cfed555..69aab6f029 100644
--- a/c/src/lib/libbsp/unix/posix/include/bsp.h
+++ b/c/src/lib/libbsp/unix/posix/include/bsp.h
@@ -96,7 +96,7 @@ extern rtems_cpu_table           Cpu_table;             /* owned by BSP */
 extern int                       rtems_argc;
 extern char                    **rtems_argv;
 
-extern rtems_unsigned32          bsp_isr_level;
+extern uint32_t                  bsp_isr_level;
 
 extern char *rtems_progname;    /* UNIX executable name */
 
diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c b/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c
index 7526c4e974..09558e1c0a 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/cause_intr.c
@@ -23,7 +23,7 @@
 #include <sys/types.h>      /* pid_t */
 
 void Shm_Cause_interrupt_unix(
-  rtems_unsigned32 node
+  uint32_t         node
 )
 {
   Shm_Interrupt_information *intr;
diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c b/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c
index d475b00b90..d27f995f73 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/getcfg.c
@@ -33,11 +33,11 @@ shm_config_table BSP_shm_cfgtbl;
 int semid;
 
 void Shm_Cause_interrupt_unix(
-  rtems_unsigned32 node
+  uint32_t         node
 );
 
 void Shm_Get_configuration(
-  rtems_unsigned32   localnode,
+  uint32_t           localnode,
   shm_config_table **shmcfg
 )
 {
@@ -45,7 +45,7 @@ void Shm_Get_configuration(
     Shm_Maximum_nodes,
     Shm_Is_master_node(),
     (void **)&BSP_shm_cfgtbl.base,
-    (unsigned32 *)&BSP_shm_cfgtbl.length
+    (uint32_t*)&BSP_shm_cfgtbl.length
   );
 
   BSP_shm_cfgtbl.format       = SHM_BIG;
diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/lock.c b/c/src/lib/libbsp/unix/posix/shmsupp/lock.c
index 15a63b185f..de2f718a27 100644
--- a/c/src/lib/libbsp/unix/posix/shmsupp/lock.c
+++ b/c/src/lib/libbsp/unix/posix/shmsupp/lock.c
@@ -43,7 +43,7 @@ void Shm_Lock(
   Shm_Locked_queue_Control *lq_cb
 )
 {
-  rtems_unsigned32   isr_level;
+  uint32_t           isr_level;
 
   rtems_interrupt_disable( isr_level );
 
@@ -62,7 +62,7 @@ void Shm_Unlock(
   Shm_Locked_queue_Control *lq_cb
 )
 {
-  rtems_unsigned32   isr_level;
+  uint32_t           isr_level;
 
   _CPU_SHM_Unlock( lq_cb->lock );
 
diff --git a/c/src/lib/libbsp/unix/posix/startup/bspstart.c b/c/src/lib/libbsp/unix/posix/startup/bspstart.c
index 48eb5f8bd1..f288ecc22d 100644
--- a/c/src/lib/libbsp/unix/posix/startup/bspstart.c
+++ b/c/src/lib/libbsp/unix/posix/startup/bspstart.c
@@ -34,8 +34,8 @@ extern rtems_configuration_table  Configuration;
 rtems_configuration_table    BSP_Configuration;
 rtems_multiprocessing_table  BSP_Multiprocessing;
 rtems_cpu_table              Cpu_table;
-rtems_unsigned32             bsp_isr_level;
-rtems_unsigned32             Heap_size;
+uint32_t                     bsp_isr_level;
+uint32_t                     Heap_size;
 int                          rtems_argc;
 char                       **rtems_argv;
 
@@ -53,14 +53,14 @@ char                       **rtems_argv;
  * script to bump it without recompiling rtems
  */
 
-rtems_unsigned32 CPU_CLICKS_PER_TICK;
+uint32_t         CPU_CLICKS_PER_TICK;
 
 /*
  *  Use the shared implementations of the following routines
  */
  
 void bsp_postdriver_hook(void);
-void bsp_libc_init( void *, unsigned32, int );
+void bsp_libc_init( void *, uint32_t, int );
 
 /*
  *  Function:   bsp_pretasking_hook
@@ -118,7 +118,7 @@ void bsp_postdriver_hook(void)
 
 void bsp_start(void)
 {
-    unsigned32 workspace_ptr;
+    uint32_t   workspace_ptr;
 
     /*
      *  Copy the table (normally done in shared main).
@@ -173,7 +173,7 @@ void bsp_start(void)
      */
  
     workspace_ptr = 
-      (unsigned32) sbrk(BSP_Configuration.work_space_size + CPU_ALIGNMENT);
+      (uint32_t) sbrk(BSP_Configuration.work_space_size + CPU_ALIGNMENT);
     workspace_ptr += CPU_ALIGNMENT - 1;
     workspace_ptr &= ~(CPU_ALIGNMENT - 1);