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

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

5 files changed, 16 insertions, 11 deletions

diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
index e676a3405f..8b1d38faf9 100644
--- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog
+++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/clockdrv.c, console/conscfg.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/m68k/sim68000/clock/clockdrv.c b/c/src/lib/libbsp/m68k/sim68000/clock/clockdrv.c
index 86e9734960..43347867a5 100644
--- a/c/src/lib/libbsp/m68k/sim68000/clock/clockdrv.c
+++ b/c/src/lib/libbsp/m68k/sim68000/clock/clockdrv.c
@@ -13,13 +13,13 @@
 
 
 typedef struct {
-  volatile unsigned8  cr;       /*  0 -  0 : Timer Control Register */
-  volatile unsigned8  pad0;     /*  1 -  1 : pad */
-  volatile unsigned8  ivr;      /*  2 -  2 : Timer Interrupt Vector Register */
-  volatile unsigned8  pad1;     /*  3 -  3 : pad */ 
-  volatile unsigned32 cpr;      /*  4 -  7 : Timer Counter Preload Register */
-  volatile unsigned8  pad2[12]; /*  8 - 19 : pad */ 
-  volatile unsigned32 sr;       /* 20 - 23 : Timer Status Register */
+  volatile uint8_t    cr;       /*  0 -  0 : Timer Control Register */
+  volatile uint8_t    pad0;     /*  1 -  1 : pad */
+  volatile uint8_t    ivr;      /*  2 -  2 : Timer Interrupt Vector Register */
+  volatile uint8_t    pad1;     /*  3 -  3 : pad */ 
+  volatile uint32_t   cpr;      /*  4 -  7 : Timer Counter Preload Register */
+  volatile uint8_t    pad2[12]; /*  8 - 19 : pad */ 
+  volatile uint32_t   sr;       /* 20 - 23 : Timer Status Register */
 } timer_hw_t;
 
 #define TIMER_BASE (timer_hw_t *)0x72001
diff --git a/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c b/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c
index 091822f086..6d00ec26e9 100644
--- a/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c
+++ b/c/src/lib/libbsp/m68k/sim68000/console/conscfg.c
@@ -56,7 +56,7 @@ console_tbl	Console_Port_Tbl[] = {
 		mc68681_set_register_2,		/* setRegister */
 		NULL, /* unused */		/* getData */
 		NULL, /* unused */		/* setData */
-                (unsigned32)mc68681_baud_rate_table,	/* ulClock */
+                (uint32_t)mc68681_baud_rate_table,	/* ulClock */
 		MC68681_VECTOR			/* ulIntVector */
 	}
 };
diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
index 57ede75c91..04fafbf6a0 100644
--- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h
@@ -65,8 +65,8 @@ extern "C" {
  */
 
 #define rtems_bsp_delay( microseconds ) \
-  { register rtems_unsigned32 _delay=(microseconds); \
-    register rtems_unsigned32 _tmp = 0; /* initialized to avoid warning */ \
+  { register uint32_t         _delay=(microseconds); \
+    register uint32_t         _tmp = 0; /* initialized to avoid warning */ \
     asm volatile( "0: \
                      remo      3,31,%0 ; \
                      cmpo      0,%0 ; \
diff --git a/c/src/lib/libbsp/m68k/sim68000/startup/bspstart.c b/c/src/lib/libbsp/m68k/sim68000/startup/bspstart.c
index 6b4b9d89d7..debdb8d169 100644
--- a/c/src/lib/libbsp/m68k/sim68000/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/sim68000/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 );
 void bsp_pretasking_hook(void);               /* m68k version */
 
 void bsp_predriver_hook(void)