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

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

6 files changed, 34 insertions, 24 deletions

diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog
index 364e82fe43..8f36a2ff79 100644
--- a/c/src/lib/libbsp/sh/gensh1/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* include/bsp.h, startup/bspstart.c: Convert to using c99 fixed size
+	types.
+
 2004-03-03	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/linkcmds: Add more memory and sections so tests can link.
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
index 5131369313..8cd2caa33d 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
@@ -98,10 +98,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/gensh1/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
index 2fdedf6d70..52486e2383 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
+++ b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c
@@ -48,7 +48,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
@@ -104,8 +104,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
@@ -116,8 +116,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
 
 
diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog
index ae96341294..7c76b8b0d0 100644
--- a/c/src/lib/libbsp/sh/gensh4/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* 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/gensh4/include/bsp.h b/c/src/lib/libbsp/sh/gensh4/include/bsp.h
index 90c159be68..1d27ef61ff 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/bsp.h
@@ -94,16 +94,16 @@ extern "C" {
 
 #define Cause_tm27_intr() \
 { \
-    *(volatile rtems_unsigned16 *)SH7750_IPRB |= 0xf000; \
-    *(volatile rtems_unsigned16 *)SH7750_WTCSR = SH7750_WTCSR_KEY; \
-    *(volatile rtems_unsigned16 *)SH7750_WTCNT = SH7750_WTCNT_KEY | 0xfe; \
-    *(volatile rtems_unsigned16 *)SH7750_WTCSR = \
+    *(volatile uint16_t*)SH7750_IPRB |= 0xf000; \
+    *(volatile uint16_t*)SH7750_WTCSR = SH7750_WTCSR_KEY; \
+    *(volatile uint16_t*)SH7750_WTCNT = SH7750_WTCNT_KEY | 0xfe; \
+    *(volatile uint16_t*)SH7750_WTCSR = \
                             SH7750_WTCSR_KEY | SH7750_WTCSR_TME; \
 }
 
 #define Clear_tm27_intr() \
 { \
-    *(volatile rtems_unsigned16 *)SH7750_WTCSR = SH7750_WTCSR_KEY; \
+    *(volatile uint16_t*)SH7750_WTCSR = SH7750_WTCSR_KEY; \
 }
 
 #define Lower_tm27_intr() \
@@ -126,10 +126,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 ;
@@ -137,7 +137,7 @@ extern void *CPU_Interrupt_stack_high ;
 /*
  * Defined in start.S
  */
-extern unsigned32 boot_mode;
+extern uint32_t   boot_mode;
 #define SH4_BOOT_MODE_FLASH 0
 #define SH4_BOOT_MODE_IPL   1
   
diff --git a/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c
index 94e14129a1..1a8a434a68 100644
--- a/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c
+++ b/c/src/lib/libbsp/sh/gensh4/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