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

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

6 files changed, 51 insertions, 45 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
index 9e8ac12ba0..36acb35c12 100644
--- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-31	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* clock/ckinit.c, console/console.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/m68k/mvme147/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
index 317442faab..9af48570c7 100644
--- a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
@@ -30,8 +30,8 @@
 /* MS_COUNT = 0x10000 - 1e-3/6.25e-6 */
 #define CLOCK_INT_LEVEL   6               /* T2's interrupt level */
 
-rtems_unsigned32 Clock_isrs;                  /* ISRs until next tick */
-volatile rtems_unsigned32 Clock_driver_ticks; /* ticks since initialization */
+uint32_t         Clock_isrs;                  /* ISRs until next tick */
+volatile uint32_t         Clock_driver_ticks; /* ticks since initialization */
 rtems_isr_entry  Old_ticker;
 
 void Clock_exit( void );
@@ -108,7 +108,7 @@ rtems_device_driver Clock_control(
   void *pargp
 )
 {
-    rtems_unsigned32 isrlevel;
+    uint32_t         isrlevel;
     rtems_libio_ioctl_args_t *args = pargp;
  
     if (args == 0)
diff --git a/c/src/lib/libbsp/m68k/mvme147/console/console.c b/c/src/lib/libbsp/m68k/mvme147/console/console.c
index 16e01bb3f8..8c48ebfa25 100644
--- a/c/src/lib/libbsp/m68k/mvme147/console/console.c
+++ b/c/src/lib/libbsp/m68k/mvme147/console/console.c
@@ -70,7 +70,7 @@ rtems_boolean is_character_ready(
   char *ch
 )
 {
-  rtems_unsigned8 rr_0;
+  uint8_t         rr_0;
 
   for ( ; ; ) {
     Z8x30_READ_CONTROL( CONSOLE_CONTROL, RR_0, rr_0 );
@@ -96,7 +96,7 @@ rtems_boolean is_character_ready(
 
 char inbyte( void )
 {
-  rtems_unsigned8 rr_0;
+  uint8_t         rr_0;
   char ch;
 
   for ( ; ; ) {
@@ -124,7 +124,7 @@ void outbyte(
   char ch
 )
 {
-  rtems_unsigned8 rr_0;
+  uint8_t         rr_0;
   char            flow_control;
 
   for ( ; ; ) {
diff --git a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
index 726ed6b579..17d54c6b53 100644
--- a/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme147/include/bsp.h
@@ -49,45 +49,45 @@ extern "C" {
 
 struct pcc_map {
   /* 32 bit registers */
-  rtems_unsigned32 dma_table_address;            /* 0xfffe1000 */
-  rtems_unsigned32 dma_data_address;             /* 0xfffe1004 */
-  rtems_unsigned32 dma_bytecount;                /* 0xfffe1008 */
-  rtems_unsigned32 dma_data_holding;             /* 0xfffe100c */
+  uint32_t         dma_table_address;            /* 0xfffe1000 */
+  uint32_t         dma_data_address;             /* 0xfffe1004 */
+  uint32_t         dma_bytecount;                /* 0xfffe1008 */
+  uint32_t         dma_data_holding;             /* 0xfffe100c */
 
   /* 16 bit registers */
-  rtems_unsigned16 timer1_preload;               /* 0xfffe1010 */
-  rtems_unsigned16 timer1_count;                 /* 0xfffe1012 */
-  rtems_unsigned16 timer2_preload;               /* 0xfffe1014 */
-  rtems_unsigned16 timer2_count;                 /* 0xfffe1016 */
+  uint16_t         timer1_preload;               /* 0xfffe1010 */
+  uint16_t         timer1_count;                 /* 0xfffe1012 */
+  uint16_t         timer2_preload;               /* 0xfffe1014 */
+  uint16_t         timer2_count;                 /* 0xfffe1016 */
 
   /* 8 bit registers */
-  rtems_unsigned8 timer1_int_control;            /* 0xfffe1018 */
-  rtems_unsigned8 timer1_control;                /* 0xfffe1019 */
-  rtems_unsigned8 timer2_int_control;            /* 0xfffe101a */
-  rtems_unsigned8 timer2_control;                /* 0xfffe101b */
-
-  rtems_unsigned8 acfail_int_control;            /* 0xfffe101c */
-  rtems_unsigned8 watchdog_control;              /* 0xfffe101d */
-
-  rtems_unsigned8 printer_int_control;           /* 0xfffe101e */
-  rtems_unsigned8 printer_control;               /* 0xfffe102f */
-
-  rtems_unsigned8 dma_int_control;               /* 0xfffe1020 */
-  rtems_unsigned8 dma_control;                   /* 0xfffe1021 */
-  rtems_unsigned8 bus_error_int_control;         /* 0xfffe1022 */
-  rtems_unsigned8 dma_status;                    /* 0xfffe1023 */
-  rtems_unsigned8 abort_int_control;             /* 0xfffe1024 */
-  rtems_unsigned8 table_address_function_code;   /* 0xfffe1025 */
-  rtems_unsigned8 serial_port_int_control;       /* 0xfffe1026 */
-  rtems_unsigned8 general_purpose_control;       /* 0xfffe1027 */
-  rtems_unsigned8 lan_int_control;               /* 0xfffe1028 */
-  rtems_unsigned8 general_purpose_status;        /* 0xfffe1029 */
-  rtems_unsigned8 scsi_port_int_control;         /* 0xfffe102a */
-  rtems_unsigned8 slave_base_address;            /* 0xfffe102b */
-  rtems_unsigned8 software_int_1_control;        /* 0xfffe102c */
-  rtems_unsigned8 int_base_vector;               /* 0xfffe102d */
-  rtems_unsigned8 software_int_2_control;        /* 0xfffe102e */
-  rtems_unsigned8 revision_level;                /* 0xfffe102f */
+  uint8_t         timer1_int_control;            /* 0xfffe1018 */
+  uint8_t         timer1_control;                /* 0xfffe1019 */
+  uint8_t         timer2_int_control;            /* 0xfffe101a */
+  uint8_t         timer2_control;                /* 0xfffe101b */
+
+  uint8_t         acfail_int_control;            /* 0xfffe101c */
+  uint8_t         watchdog_control;              /* 0xfffe101d */
+
+  uint8_t         printer_int_control;           /* 0xfffe101e */
+  uint8_t         printer_control;               /* 0xfffe102f */
+
+  uint8_t         dma_int_control;               /* 0xfffe1020 */
+  uint8_t         dma_control;                   /* 0xfffe1021 */
+  uint8_t         bus_error_int_control;         /* 0xfffe1022 */
+  uint8_t         dma_status;                    /* 0xfffe1023 */
+  uint8_t         abort_int_control;             /* 0xfffe1024 */
+  uint8_t         table_address_function_code;   /* 0xfffe1025 */
+  uint8_t         serial_port_int_control;       /* 0xfffe1026 */
+  uint8_t         general_purpose_control;       /* 0xfffe1027 */
+  uint8_t         lan_int_control;               /* 0xfffe1028 */
+  uint8_t         general_purpose_status;        /* 0xfffe1029 */
+  uint8_t         scsi_port_int_control;         /* 0xfffe102a */
+  uint8_t         slave_base_address;            /* 0xfffe102b */
+  uint8_t         software_int_1_control;        /* 0xfffe102c */
+  uint8_t         int_base_vector;               /* 0xfffe102d */
+  uint8_t         software_int_2_control;        /* 0xfffe102e */
+  uint8_t         revision_level;                /* 0xfffe102f */
 };
 
 #define pcc      ((volatile struct pcc_map * const) 0xfffe1000)
diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
index 9cc2abaa85..88e3a4040d 100644
--- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
@@ -41,7 +41,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 */
 
 /*
@@ -75,7 +75,7 @@ void bsp_start( void )
 
   pcc->int_base_vector = PCC_BASE_VECTOR; /* Set the PCC int vectors base */
 
-  (*(rtems_unsigned8 *)0xfffe2001) = 0x08; 
+  (*(uint8_t*)0xfffe2001) = 0x08; 
       /* make VME access round-robin */
 
   rtems_cache_enable_instruction();
diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
index 99dc72915e..b533b5a8ba 100644
--- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c
@@ -58,8 +58,8 @@ void Timer_initialize()
 
 int Read_timer()
 {
-  rtems_unsigned32 total;
-  rtems_unsigned16 counter_value;
+  uint32_t         total;
+  uint16_t         counter_value;
 
   counter_value = pcc->timer1_count; /* read the counter value */