5 files changed, 19 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog
index fcc2ebc304..dd941317b4 100644
--- a/c/src/lib/libbsp/sh/simsh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/ckinit.c, include/bsp.h, 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/sh/simsh4/clock/ckinit.c b/c/src/lib/libbsp/sh/simsh4/clock/ckinit.c
index dcb3b5ffc2..3712597b34 100644
--- a/c/src/lib/libbsp/sh/simsh4/clock/ckinit.c
+++ b/c/src/lib/libbsp/sh/simsh4/clock/ckinit.c
@@ -23,7 +23,7 @@
  * Clock_driver_ticks is a monotonically increasing counter of the
  * number of clock ticks since the driver was initialized.
  */
-volatile rtems_unsigned32 Clock_driver_ticks;
+volatile uint32_t         Clock_driver_ticks;
 
 
 /*
@@ -36,7 +36,7 @@ rtems_device_minor_number rtems_clock_minor;
 rtems_isr (*rtems_clock_hook)(rtems_vector_number) = NULL;
 
 static void
-set_clock_period(rtems_unsigned32 period)
+set_clock_period(uint32_t         period)
 {
     asm volatile ("\tmov %0,r0\n"
                   "\ttrapa\t#4\n" 
@@ -98,7 +98,7 @@ Clock_exit(void)
 static void
 Install_clock(rtems_isr_entry clock_isr)
 {
-    rtems_unsigned32 period;
+    uint32_t         period;
     Clock_driver_ticks = 0;
     if (BSP_Configuration.ticks_per_timeslice)
     {
@@ -164,7 +164,7 @@ Clock_control(rtems_device_major_number major,
               rtems_device_minor_number minor,
               void *pargp)
 {
-    rtems_unsigned32 isrlevel;
+    uint32_t         isrlevel;
     rtems_libio_ioctl_args_t *args = pargp;
 
     if (args)
diff --git a/c/src/lib/libbsp/sh/simsh4/include/bsp.h b/c/src/lib/libbsp/sh/simsh4/include/bsp.h
index bc13eaeea0..0c7bbaf0b6 100644
--- a/c/src/lib/libbsp/sh/simsh4/include/bsp.h
+++ b/c/src/lib/libbsp/sh/simsh4/include/bsp.h
@@ -108,10 +108,10 @@ extern "C" {
  * Defined in the linker script 'linkcmds'
  */
 
-extern unsigned32       HeapStart ;
-extern unsigned32       HeapEnd ;
-extern unsigned32       WorkSpaceStart ;
-extern unsigned32       WorkSpaceEnd ;
+extern uint32_t         HeapStart ;
+extern uint32_t         HeapEnd ;
+extern uint32_t         WorkSpaceStart ;
+extern uint32_t         WorkSpaceEnd ;
 
 extern void *CPU_Interrupt_stack_low ;
 extern void *CPU_Interrupt_stack_high ;
diff --git a/c/src/lib/libbsp/sh/simsh4/startup/bspstart.c b/c/src/lib/libbsp/sh/simsh4/startup/bspstart.c
index 94e14129a1..1a8a434a68 100644
--- a/c/src/lib/libbsp/sh/simsh4/startup/bspstart.c
+++ b/c/src/lib/libbsp/sh/simsh4/startup/bspstart.c
@@ -51,7 +51,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
@@ -112,8 +112,8 @@ void bsp_start(void)
 
   BSP_Configuration.work_space_start = (void *) &WorkSpaceStart ;
   BSP_Configuration.work_space_size  = 
-    (unsigned32) &WorkSpaceEnd - 
-    (unsigned32) &WorkSpaceStart ;
+    (uint32_t) &WorkSpaceEnd - 
+    (uint32_t) &WorkSpaceStart ;
   
   /*
    *  initialize the CPU table for this BSP
@@ -125,8 +125,8 @@ void bsp_start(void)
 
   /* This isn't used anywhere */
   Cpu_table.interrupt_stack_size = 
-    (unsigned32) (&CPU_Interrupt_stack_high) -
-    (unsigned32) (&CPU_Interrupt_stack_low) ;
+    (uint32_t) (&CPU_Interrupt_stack_high) -
+    (uint32_t) (&CPU_Interrupt_stack_low) ;
 #endif
 
 
diff --git a/c/src/lib/libbsp/sh/simsh4/timer/timer.c b/c/src/lib/libbsp/sh/simsh4/timer/timer.c
index 5a3bdf2467..d0084fcb54 100644
--- a/c/src/lib/libbsp/sh/simsh4/timer/timer.c
+++ b/c/src/lib/libbsp/sh/simsh4/timer/timer.c
@@ -20,7 +20,7 @@
 #include <rtems.h>
 #include <bsp.h>
 
-rtems_unsigned32 Timer_interrupts;
+uint32_t         Timer_interrupts;
 
 rtems_boolean Timer_driver_Find_average_overhead;