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

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

6 files changed, 25 insertions, 19 deletions

diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
index 5aa3873394..e87eb31025 100644
--- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog
+++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/ckinit.c, console/m340uart.c, include/bsp.h,
+	include/m340uart.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/gen68340/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
index 2d2a591878..6634fc270a 100644
--- a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
@@ -40,7 +40,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;
 
 /*
  * These are set by clock driver during its init
@@ -93,8 +93,8 @@ Clock_exit (void)
 static void
 Install_clock (rtems_isr_entry clock_isr)
 {
-	unsigned32 pitr_tmp;
-	unsigned32 usecs_per_tick;
+	uint32_t   pitr_tmp;
+	uint32_t   usecs_per_tick;
 
 	Clock_driver_ticks = 0;
 
@@ -160,7 +160,7 @@ rtems_device_driver Clock_control(
 	void *pargp
 )
 {
-	rtems_unsigned32 isrlevel;
+	uint32_t         isrlevel;
 	rtems_libio_ioctl_args_t *args = pargp;
 
 	if (args) {
diff --git a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c b/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c
index adea61b58a..341cd2d0a7 100644
--- a/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c
+++ b/c/src/lib/libbsp/m68k/gen68340/console/m340uart.c
@@ -192,8 +192,8 @@ Find_Right_m340_UART_Channel_Config(float ReceiverBaudRate, float TransmitterBau
 	       needs set 2)
  *****************************************************/
 t_baud_speed_table
-Find_Right_m340_UART_Config(float ChannelA_ReceiverBaudRate, float ChannelA_TransmitterBaudRate, rtems_unsigned8 enableA,
-			    float ChannelB_ReceiverBaudRate, float ChannelB_TransmitterBaudRate, rtems_unsigned8 enableB)
+Find_Right_m340_UART_Config(float ChannelA_ReceiverBaudRate, float ChannelA_TransmitterBaudRate, uint8_t         enableA,
+			    float ChannelB_ReceiverBaudRate, float ChannelB_TransmitterBaudRate, uint8_t         enableB)
 {
  t_baud_speed_table tableA, tableB;
  t_baud_speed_table return_value, tmp;
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
index 93e1490dcc..bf234f433c 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
@@ -72,8 +72,8 @@ extern "C" {
  */
 
 #define rtems_bsp_delay( microseconds ) \
-  { register rtems_unsigned32 _delay=(microseconds); \
-    register rtems_unsigned32 _tmp=123; \
+  { register uint32_t         _delay=(microseconds); \
+    register uint32_t         _tmp=123; \
     asm volatile( "0: \
                      nbcd      %0 ; \
                      nbcd      %0 ; \
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h b/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h
index 765323c720..e9cb6598c7 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h
+++ b/c/src/lib/libbsp/m68k/gen68340/include/m340uart.h
@@ -44,20 +44,20 @@
 void Init_UART_Table(void);
 
 typedef struct {
-		rtems_unsigned8		enable;
-		rtems_unsigned16	rx_buffer_size;	/* NOT IMPLEMENTED */
-		rtems_unsigned16	tx_buffer_size;	/* NOT IMPLEMENTED */
+		uint8_t        		enable;
+		uint16_t        	rx_buffer_size;	/* NOT IMPLEMENTED */
+		uint16_t        	tx_buffer_size;	/* NOT IMPLEMENTED */
 	       } uart_termios_config;
 
 typedef struct { /* for one channel */
-		rtems_unsigned8		enable;		/* use this channel */
+		uint8_t        		enable;		/* use this channel */
 		char			name[64];	/* use UART_CONSOLE_NAME for console purpose */
-		rtems_unsigned8		parity_mode;	/* parity mode, see MR1 section for defines */
-		rtems_unsigned8		bits_per_char;	/* bits per character, see MR1 section for defines  */
+		uint8_t        		parity_mode;	/* parity mode, see MR1 section for defines */
+		uint8_t        		bits_per_char;	/* bits per character, see MR1 section for defines  */
 		float			rx_baudrate;	/* Rx baudrate */
 		float			tx_baudrate;	/* Tx baudrate */
-		rtems_unsigned8		rx_mode;	/* FIFO Full (UART_FIFO_FULL) or ChannelReceiverReady (UART_CRR) */
-		rtems_unsigned8		mode;		/* use interrupts (UART_INTERRUPTS) or polling (UART_POLLING) */
+		uint8_t        		rx_mode;	/* FIFO Full (UART_FIFO_FULL) or ChannelReceiverReady (UART_CRR) */
+		uint8_t        		mode;		/* use interrupts (UART_INTERRUPTS) or polling (UART_POLLING) */
 		uart_termios_config	termios;
 	       } uart_channel_config;
 
@@ -75,8 +75,8 @@ typedef	 struct {
 		} t_baud_speed_table;
 
 extern t_baud_speed_table
-Find_Right_m340_UART_Config(float ChannelA_ReceiverBaudRate, float ChannelA_TransmitterBaudRate, rtems_unsigned8 enableA,
-			    float ChannelB_ReceiverBaudRate, float ChannelB_TransmitterBaudRate, rtems_unsigned8 enableB);
+Find_Right_m340_UART_Config(float ChannelA_ReceiverBaudRate, float ChannelA_TransmitterBaudRate, uint8_t         enableA,
+			    float ChannelB_ReceiverBaudRate, float ChannelB_TransmitterBaudRate, uint8_t         enableB);
 
 extern rtems_isr InterruptHandler (rtems_vector_number v);
 
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
index fea0633091..d7c95a4097 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
@@ -41,7 +41,7 @@ char *rtems_progname;
  *      called from postdriver hook
  */
 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 */
 
 /*