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

	* libcsupport/include/chain.h, libcsupport/include/clockdrv.h,
	libcsupport/include/ringbuf.h, libcsupport/include/spurious.h,
	libcsupport/include/timerdrv.h, libcsupport/include/vmeintr.h,
	libcsupport/include/motorola/mc68230.h,
	libcsupport/include/rtems/assoc.h, libcsupport/include/rtems/libio.h,
	libcsupport/include/rtems/libio_.h,
	libcsupport/include/rtems/termiostypes.h,
	libcsupport/include/zilog/z8036.h, libcsupport/include/zilog/z8530.h,
	libcsupport/include/zilog/z8536.h, libcsupport/src/__gettod.c,
	libcsupport/src/assoc.c, libcsupport/src/assocnamebad.c,
	libcsupport/src/error.c,  libcsupport/src/libio.c,
	libcsupport/src/libio_sockets.c, libcsupport/src/malloc.c,
	libcsupport/src/no_libc.c, libcsupport/src/termios.c,
	libcsupport/src/termiosreserveresources.c: Convert to using c99
	fixed-size types.

10 files changed, 64 insertions, 64 deletions

diff --git a/cpukit/libcsupport/src/__gettod.c b/cpukit/libcsupport/src/__gettod.c
index 5989a8e25f..918c2d3109 100644
--- a/cpukit/libcsupport/src/__gettod.c
+++ b/cpukit/libcsupport/src/__gettod.c
@@ -49,8 +49,8 @@ int gettimeofday(
 )
 {
   rtems_interrupt_level level;
-  rtems_unsigned32      seconds;
-  rtems_unsigned32      microseconds;
+  uint32_t        seconds;
+  uint32_t        microseconds;
 
   if ( !tp ) {
     errno = EFAULT;
diff --git a/cpukit/libcsupport/src/assoc.c b/cpukit/libcsupport/src/assoc.c
index 3e4fb21211..a7cd03b162 100644
--- a/cpukit/libcsupport/src/assoc.c
+++ b/cpukit/libcsupport/src/assoc.c
@@ -38,7 +38,7 @@ rtems_assoc_ptr_by_name(
 const rtems_assoc_t *
 rtems_assoc_ptr_by_local(
     const rtems_assoc_t *ap,
-    unsigned32     local_value
+    uint32_t       local_value
   )
 {
     const rtems_assoc_t *default_ap = 0;
@@ -57,7 +57,7 @@ rtems_assoc_ptr_by_local(
 const rtems_assoc_t *
 rtems_assoc_ptr_by_remote(
     const rtems_assoc_t *ap,
-    unsigned32     remote_value
+    uint32_t       remote_value
   )
 {
     const rtems_assoc_t *default_ap = 0;
@@ -77,10 +77,10 @@ rtems_assoc_ptr_by_remote(
  * Get values
  */
 
-unsigned32
+uint32_t  
 rtems_assoc_remote_by_local(
     const rtems_assoc_t *ap,
-    unsigned32     local_value
+    uint32_t       local_value
   )
 {
     const rtems_assoc_t *nap;
@@ -91,10 +91,10 @@ rtems_assoc_remote_by_local(
     return 0;
 }
 
-unsigned32
+uint32_t  
 rtems_assoc_local_by_remote(
     const rtems_assoc_t *ap,
-    unsigned32     remote_value
+    uint32_t       remote_value
   )
 {
     const rtems_assoc_t *nap;
@@ -105,7 +105,7 @@ rtems_assoc_local_by_remote(
     return 0;
 }
 
-unsigned32
+uint32_t  
 rtems_assoc_remote_by_name(
     const rtems_assoc_t *ap,
     const char          *name
@@ -119,7 +119,7 @@ rtems_assoc_remote_by_name(
     return 0;
 }
 
-unsigned32
+uint32_t  
 rtems_assoc_local_by_name(
     const rtems_assoc_t *ap,
     const char          *name
@@ -139,7 +139,7 @@ rtems_assoc_local_by_name(
  */
 
 const char *rtems_assoc_name_bad(
-    unsigned32 bad_value
+    uint32_t   bad_value
 );
 
 /* body in separate file to reduce dependency on printf */
@@ -148,7 +148,7 @@ const char *rtems_assoc_name_bad(
 const char *
 rtems_assoc_name_by_local(
     const rtems_assoc_t *ap,
-    unsigned32     local_value
+    uint32_t       local_value
   )
 {
     const rtems_assoc_t *nap;
@@ -162,7 +162,7 @@ rtems_assoc_name_by_local(
 const char *
 rtems_assoc_name_by_remote(
     const rtems_assoc_t *ap,
-    unsigned32     remote_value
+    uint32_t       remote_value
   )
 {
     const rtems_assoc_t *nap;
@@ -178,13 +178,13 @@ rtems_assoc_name_by_remote(
  *      entries; they do not check for this.
  */
 
-unsigned32 rtems_assoc_remote_by_local_bitfield(
+uint32_t   rtems_assoc_remote_by_local_bitfield(
     const rtems_assoc_t *ap,
-    unsigned32     local_value
+    uint32_t       local_value
   )
 {  
-    unsigned32 b;
-    unsigned32 remote_value = 0;
+    uint32_t   b;
+    uint32_t   remote_value = 0;
 
     for (b = 1; b; b <<= 1)
         if (b & local_value)
@@ -194,13 +194,13 @@ unsigned32 rtems_assoc_remote_by_local_bitfield(
 }
 
 
-unsigned32 rtems_assoc_local_by_remote_bitfield(
+uint32_t   rtems_assoc_local_by_remote_bitfield(
     const rtems_assoc_t *ap,
-    unsigned32     remote_value
+    uint32_t       remote_value
   )
 {  
-    unsigned32 b;
-    unsigned32 local_value = 0;
+    uint32_t   b;
+    uint32_t   local_value = 0;
 
     for (b = 1; b; b <<= 1)
         if (b & remote_value)
@@ -212,11 +212,11 @@ unsigned32 rtems_assoc_local_by_remote_bitfield(
 char *
 rtems_assoc_name_by_remote_bitfield(
     const rtems_assoc_t *ap,
-    unsigned32     value,
+    uint32_t       value,
     char          *buffer
   )
 {  
-    unsigned32 b;
+    uint32_t   b;
 
     *buffer = 0;
 
@@ -234,11 +234,11 @@ rtems_assoc_name_by_remote_bitfield(
 char *
 rtems_assoc_name_by_local_bitfield(
     const rtems_assoc_t *ap,
-    unsigned32     value,
+    uint32_t       value,
     char          *buffer
   )
 {  
-    unsigned32 b;
+    uint32_t   b;
 
     *buffer = 0;
 
diff --git a/cpukit/libcsupport/src/assocnamebad.c b/cpukit/libcsupport/src/assocnamebad.c
index 4a6a52d6c6..7ca0b628f5 100644
--- a/cpukit/libcsupport/src/assocnamebad.c
+++ b/cpukit/libcsupport/src/assocnamebad.c
@@ -25,7 +25,7 @@
 
 const char *
 rtems_assoc_name_bad(
-    unsigned32 bad_value
+    uint32_t   bad_value
 )
 {
 #ifdef RTEMS_DEBUG
diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c
index fff95ce80c..af3f8b0482 100644
--- a/cpukit/libcsupport/src/error.c
+++ b/cpukit/libcsupport/src/error.c
@@ -108,7 +108,7 @@ rtems_status_text(
 
 
 static int rtems_verror(
-    unsigned32   error_flag,
+    uint32_t     error_flag,
     const char   *printf_format,
     va_list      arglist
 )
diff --git a/cpukit/libcsupport/src/libio.c b/cpukit/libcsupport/src/libio.c
index bc868dd51a..fc46e45f8e 100644
--- a/cpukit/libcsupport/src/libio.c
+++ b/cpukit/libcsupport/src/libio.c
@@ -48,7 +48,7 @@
  *  File descriptor Table Information
  */         
 
-extern unsigned32  rtems_libio_number_iops;
+extern uint32_t    rtems_libio_number_iops;
 rtems_id           rtems_libio_semaphore;
 rtems_libio_t     *rtems_libio_iops;
 rtems_libio_t     *rtems_libio_iop_freelist;
@@ -121,12 +121,12 @@ rtems_assoc_t status_flags_assoc[] = {
   { 0, 0, 0 },
 };
 
-unsigned32 rtems_libio_fcntl_flags(
-  unsigned32 fcntl_flags
+uint32_t   rtems_libio_fcntl_flags(
+  uint32_t   fcntl_flags
 )
 {
-  unsigned32 flags = 0;
-  unsigned32 access_modes;
+  uint32_t   flags = 0;
+  uint32_t   access_modes;
 
   /*
    * Access mode is a small integer
@@ -151,11 +151,11 @@ unsigned32 rtems_libio_fcntl_flags(
  *  Convert RTEMS internal flags to UNIX fnctl(2) flags
  */
 
-unsigned32 rtems_libio_to_fcntl_flags(
-  unsigned32 flags
+uint32_t   rtems_libio_to_fcntl_flags(
+  uint32_t   flags
 )
 {
-  unsigned32 fcntl_flags = 0;
+  uint32_t   fcntl_flags = 0;
 
   if ( (flags & LIBIO_FLAGS_READ_WRITE) == LIBIO_FLAGS_READ_WRITE ) {
     fcntl_flags |= O_RDWR;
diff --git a/cpukit/libcsupport/src/libio_sockets.c b/cpukit/libcsupport/src/libio_sockets.c
index dfff46bbea..88db941083 100644
--- a/cpukit/libcsupport/src/libio_sockets.c
+++ b/cpukit/libcsupport/src/libio_sockets.c
@@ -32,7 +32,7 @@ struct socket *rtems_bsdnet_fdToSocket(
   rtems_libio_t *iop;
 
   /* same as rtems_libio_check_fd(_fd) but different return */
-  if ((unsigned32)fd >= rtems_libio_number_iops) {
+  if ((uint32_t  )fd >= rtems_libio_number_iops) {
     errno = EBADF;
     return NULL;
   }
diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c
index ebee514393..56b2f8cfc5 100644
--- a/cpukit/libcsupport/src/malloc.c
+++ b/cpukit/libcsupport/src/malloc.c
@@ -49,14 +49,14 @@ size_t RTEMS_Malloc_Sbrk_amount;
 #define MSBUMP(f,n)    rtems_malloc_stats.f += (n)
 
 struct {
-    unsigned32  space_available;             /* current size of malloc area */
-    unsigned32  malloc_calls;                /* # calls to malloc */
-    unsigned32  free_calls;
-    unsigned32  realloc_calls;
-    unsigned32  calloc_calls;
-    unsigned32  max_depth;		     /* most ever malloc'd at 1 time */
-    unsigned64  lifetime_allocated;
-    unsigned64  lifetime_freed;
+    uint32_t    space_available;             /* current size of malloc area */
+    uint32_t    malloc_calls;                /* # calls to malloc */
+    uint32_t    free_calls;
+    uint32_t    realloc_calls;
+    uint32_t    calloc_calls;
+    uint32_t    max_depth;		     /* most ever malloc'd at 1 time */
+    uint64_t    lifetime_allocated;
+    uint64_t    lifetime_freed;
 } rtems_malloc_stats;
 
 #else			/* No rtems_malloc_stats */
@@ -71,8 +71,8 @@ void RTEMS_Malloc_Initialize(
 {
   rtems_status_code   status;
   void               *starting_address;
-  rtems_unsigned32    old_address;
-  rtems_unsigned32    u32_address;
+  uint32_t      old_address;
+  uint32_t      u32_address;
 
   /*
    *  Initialize the garbage collection list to start with nothing on it.
@@ -91,7 +91,7 @@ void RTEMS_Malloc_Initialize(
   if (!starting_address) {
     u32_address = (unsigned int)sbrk(length);
 
-    if (u32_address == (rtems_unsigned32) -1) {
+    if (u32_address == (uint32_t  ) -1) {
       rtems_fatal_error_occurred( RTEMS_NO_MEMORY );
       /* DOES NOT RETURN!!! */
     }
@@ -156,8 +156,8 @@ void *malloc(
 {
   void              *return_this;
   void              *starting_address;
-  rtems_unsigned32   the_size;
-  rtems_unsigned32   sbrk_amount;
+  uint32_t     the_size;
+  uint32_t     sbrk_amount;
   rtems_status_code  status;
   Chain_Node        *to_be_freed;
 
@@ -212,8 +212,8 @@ void *malloc(
 
     the_size = ((size + sbrk_amount) / sbrk_amount * sbrk_amount);
 
-    if (((rtems_unsigned32)starting_address = (void *)sbrk(the_size)) 
-            == (rtems_unsigned32) -1)
+    if (((uint32_t  )starting_address = (void *)sbrk(the_size)) 
+            == (uint32_t  ) -1)
       return (void *) 0;
 
     status = rtems_region_extend(
@@ -245,8 +245,8 @@ void *malloc(
 #ifdef MALLOC_STATS
   if (return_this)
   {
-      unsigned32 actual_size;
-      unsigned32 current_depth;
+      uint32_t   actual_size;
+      uint32_t   current_depth;
       status = rtems_region_get_segment_size(
                    RTEMS_Malloc_Heap, return_this, &actual_size);
       MSBUMP(lifetime_allocated, actual_size);
@@ -289,7 +289,7 @@ void *realloc(
   size_t size
 )
 {
-  rtems_unsigned32  old_size;
+  uint32_t    old_size;
   rtems_status_code status;
   char *new_area;
 
@@ -369,7 +369,7 @@ void free(
  
 #ifdef MALLOC_STATS
   {
-      unsigned32        size;
+      uint32_t          size;
       status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &size );
       if ( status == RTEMS_SUCCESSFUL ) {
           MSBUMP(lifetime_freed, size);
@@ -395,7 +395,7 @@ void free(
 
 void malloc_dump(void)
 {
-    unsigned32 allocated = rtems_malloc_stats.lifetime_allocated -
+    uint32_t   allocated = rtems_malloc_stats.lifetime_allocated -
                      rtems_malloc_stats.lifetime_freed;
 
     printf("Malloc stats\n");
@@ -407,8 +407,8 @@ void malloc_dump(void)
            (allocated * 100) / rtems_malloc_stats.space_available,
            (unsigned int) rtems_malloc_stats.max_depth / 1024,
            (rtems_malloc_stats.max_depth * 100) / rtems_malloc_stats.space_available,
-           (unsigned64) rtems_malloc_stats.lifetime_allocated / 1024,
-           (unsigned64) rtems_malloc_stats.lifetime_freed / 1024);
+           (uint64_t  ) rtems_malloc_stats.lifetime_allocated / 1024,
+           (uint64_t  ) rtems_malloc_stats.lifetime_freed / 1024);
     printf("  Call counts:   malloc:%d   free:%d   realloc:%d   calloc:%d\n",
            rtems_malloc_stats.malloc_calls,
            rtems_malloc_stats.free_calls,
diff --git a/cpukit/libcsupport/src/no_libc.c b/cpukit/libcsupport/src/no_libc.c
index 3fea65cd03..afcc30b49c 100644
--- a/cpukit/libcsupport/src/no_libc.c
+++ b/cpukit/libcsupport/src/no_libc.c
@@ -35,7 +35,7 @@ void libc_suspend_main(void)
 
 
 void libc_global_exit(
-  rtems_unsigned32 code
+  uint32_t   code
 )
 {
 }
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c
index a6040e24b8..8e053b9c4c 100644
--- a/cpukit/libcsupport/src/termios.c
+++ b/cpukit/libcsupport/src/termios.c
@@ -787,8 +787,8 @@ rtems_termios_write (void *arg)
 		return sc;
 	}
 	if (tty->termios.c_oflag & OPOST) {
-		unsigned32 count = args->count;
-		unsigned8 *buffer = args->buffer;
+		uint32_t   count = args->count;
+		uint8_t   *buffer = args->buffer;
 		while (count--)
 			oproc (*buffer++, tty);
 		args->bytes_moved = args->count;
@@ -1109,8 +1109,8 @@ rtems_termios_read (void *arg)
 {
 	rtems_libio_rw_args_t *args = arg;
 	struct rtems_termios_tty *tty = args->iop->data1;
-	unsigned32 count = args->count;
-	unsigned8 *buffer = args->buffer;
+	uint32_t   count = args->count;
+	uint8_t   *buffer = args->buffer;
 	rtems_status_code sc;
 
 	sc = rtems_semaphore_obtain (tty->isem, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
diff --git a/cpukit/libcsupport/src/termiosreserveresources.c b/cpukit/libcsupport/src/termiosreserveresources.c
index 86bacc3d53..766763494f 100644
--- a/cpukit/libcsupport/src/termiosreserveresources.c
+++ b/cpukit/libcsupport/src/termiosreserveresources.c
@@ -16,7 +16,7 @@ static int first_time;   /* assumed to be zeroed by BSS initialization */
 
 void rtems_termios_reserve_resources (
   rtems_configuration_table *configuration,
-  rtems_unsigned32           number_of_devices
+  uint32_t             number_of_devices
 )
 {
 #if 0