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

	* gdbsci/gdbsci.c, include/bsp.h, startup/bspstart.c: Convert to
	using c99 fixed size types.

4 files changed, 20 insertions, 15 deletions

diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog
index 78e3f6efd9..e77f5a32e5 100644
--- a/c/src/lib/libbsp/sh/shsim/ChangeLog
+++ b/c/src/lib/libbsp/sh/shsim/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* gdbsci/gdbsci.c, include/bsp.h, 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/sh/shsim/gdbsci/gdbsci.c b/c/src/lib/libbsp/sh/shsim/gdbsci/gdbsci.c
index f622ac8352..eae0e855d4 100644
--- a/c/src/lib/libbsp/sh/shsim/gdbsci/gdbsci.c
+++ b/c/src/lib/libbsp/sh/shsim/gdbsci/gdbsci.c
@@ -67,7 +67,7 @@
 
 struct scidev_t {
   char *			name ;
-  unsigned32			addr ;
+  uint32_t  			addr ;
   rtems_device_minor_number	minor ;
   unsigned short		opened ;
   tcflag_t			cflags ;
@@ -89,8 +89,8 @@ static int _sci_set_cflags(
   struct scidev_t      *sci_dev,
   tcflag_t      c_cflag )
 {
-  unsigned8	smr;
-  unsigned8	brr;
+  uint8_t  	smr;
+  uint8_t  	brr;
   
   if ( c_cflag & CBAUD )
   {
@@ -134,7 +134,7 @@ static void _sci_init(
   rtems_device_minor_number minor )
 {
 #if NOT_SUPPORTED_BY_GDB
-  unsigned16	temp16 ;
+  uint16_t  	temp16 ;
 
   /* Pin function controller initialisation for asynchronous mode */  
   if( minor == 0)
@@ -174,7 +174,7 @@ static void _sci_tx_polled(
 {
   struct scidev_t *scidev = &sci_device[minor] ;
 #if NOT_SUPPORTED_BY_GDB                
-  signed8         ssr ;
+  int8_t           ssr ;
 
   while ( !inb((scidev->addr + SCI_SSR) & SCI_TDRE ))
       ;
@@ -254,7 +254,7 @@ rtems_device_driver sh_gdbsci_open(
   void                    * arg )
 {
 #if NOT_SUPPORTED_BY_GDB
-  unsigned8 temp8;
+  uint8_t   temp8;
 #endif
  /* check for valid minor number */
    if(( minor > ( SH_GDBSCI_MINOR_DEVICES -1 )) || ( minor < 0 ))
diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/c/src/lib/libbsp/sh/shsim/include/bsp.h
index 606ba02567..ac7b3b5bda 100644
--- a/c/src/lib/libbsp/sh/shsim/include/bsp.h
+++ b/c/src/lib/libbsp/sh/shsim/include/bsp.h
@@ -89,10 +89,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/shsim/startup/bspstart.c b/c/src/lib/libbsp/sh/shsim/startup/bspstart.c
index c5ea32aec7..02cb7c1892 100644
--- a/c/src/lib/libbsp/sh/shsim/startup/bspstart.c
+++ b/c/src/lib/libbsp/sh/shsim/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 );
 
 /*
  *  Function:   bsp_pretasking_hook
@@ -101,8 +101,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
@@ -113,8 +113,8 @@ void bsp_start( void )
   _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ;
 
   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