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

	* libchip/ide/ata.c, libchip/ide/ata_internal.h,
	libchip/ide/ide_controller.c, libchip/ide/ide_ctrl_cfg.h,
	libchip/ide/ide_ctrl_io.h, libchip/network/cs8900.c,
	libchip/network/dec21140.c, libchip/network/elnk.c,
	libchip/network/if_fxp.c, libchip/network/open_eth.c,
	libchip/network/open_eth.h, libchip/network/sonic.c,
	libchip/network/sonic.h, libchip/rtc/icm7170.c, libchip/rtc/icm7170.h,
	libchip/rtc/icm7170_reg.c, libchip/rtc/icm7170_reg2.c,
	libchip/rtc/icm7170_reg4.c, libchip/rtc/icm7170_reg8.c,
	libchip/rtc/m48t08.c, libchip/rtc/m48t08.h, libchip/rtc/m48t08_reg.c,
	libchip/rtc/m48t08_reg2.c, libchip/rtc/m48t08_reg4.c,
	libchip/rtc/m48t08_reg8.c, libchip/rtc/rtc.h, libchip/serial/mc68681.c,
	libchip/serial/mc68681.h, libchip/serial/mc68681_reg.c,
	libchip/serial/mc68681_reg2.c, libchip/serial/mc68681_reg4.c,
	libchip/serial/mc68681_reg8.c, libchip/serial/ns16550.c,
	libchip/serial/ns16550_p.h, libchip/serial/serial.h,
	libchip/serial/z85c30.c, libchip/serial/z85c30.h,
	libchip/serial/z85c30_p.h, libchip/serial/z85c30_reg.c,
	libchip/shmdr/addlq.c, libchip/shmdr/cnvpkt.c, libchip/shmdr/dump.c,
	libchip/shmdr/fatal.c, libchip/shmdr/getlq.c, libchip/shmdr/init.c,
	libchip/shmdr/initlq.c, libchip/shmdr/intr.c, libchip/shmdr/poll.c,
	libchip/shmdr/send.c, libchip/shmdr/shm_driver.h: Convert to using c99
	fixed-size types.

11 files changed, 54 insertions, 54 deletions

diff --git a/c/src/libchip/shmdr/addlq.c b/c/src/libchip/shmdr/addlq.c
index 50a1f07a76..3bda767933 100644
--- a/c/src/libchip/shmdr/addlq.c
+++ b/c/src/libchip/shmdr/addlq.c
@@ -26,7 +26,7 @@ void Shm_Locked_queue_Add(
   Shm_Envelope_control     *ecb
 )
 {
-  rtems_unsigned32 index;
+  uint32_t   index;
 
   ecb->next  = Shm_Locked_queue_End_of_list;
   ecb->queue = lq_cb->owner;
diff --git a/c/src/libchip/shmdr/cnvpkt.c b/c/src/libchip/shmdr/cnvpkt.c
index 733ee803c0..697b1c84c6 100644
--- a/c/src/libchip/shmdr/cnvpkt.c
+++ b/c/src/libchip/shmdr/cnvpkt.c
@@ -30,9 +30,9 @@ void Shm_Convert_packet(
   rtems_packet_prefix *packet
 )
 {
-  rtems_unsigned32 *pkt, i;
+  uint32_t   *pkt, i;
 
-  pkt = (rtems_unsigned32 *) packet;
+  pkt = (uint32_t   *) packet;
   for ( i=RTEMS_MINIMUN_HETERO_CONVERSION ; i ; i--, pkt++ )
     *pkt = CPU_swap_u32( *pkt );
 
diff --git a/c/src/libchip/shmdr/dump.c b/c/src/libchip/shmdr/dump.c
index 35a6cf58e0..4a122d41cf 100644
--- a/c/src/libchip/shmdr/dump.c
+++ b/c/src/libchip/shmdr/dump.c
@@ -24,9 +24,9 @@
 void
 Shm_Print_statistics(void)
 {
-  rtems_unsigned32  ticks;
-  rtems_unsigned32  ticks_per_second;
-  rtems_unsigned32  seconds;
+  uint32_t    ticks;
+  uint32_t    ticks_per_second;
+  uint32_t    seconds;
   int               packets_per_second;
 
   (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &ticks );
diff --git a/c/src/libchip/shmdr/fatal.c b/c/src/libchip/shmdr/fatal.c
index 7f8558b7bb..b89265da00 100644
--- a/c/src/libchip/shmdr/fatal.c
+++ b/c/src/libchip/shmdr/fatal.c
@@ -23,7 +23,7 @@
 void MPCI_Fatal(
   Internal_errors_Source  source,
   boolean                 is_internal,
-  rtems_unsigned32        error
+  uint32_t          error
 )
 {
    /*   Eventually need to attempt to broadcast a K_FATAL message
diff --git a/c/src/libchip/shmdr/getlq.c b/c/src/libchip/shmdr/getlq.c
index 543a7f9d5e..337b3a78de 100644
--- a/c/src/libchip/shmdr/getlq.c
+++ b/c/src/libchip/shmdr/getlq.c
@@ -28,7 +28,7 @@ Shm_Envelope_control *Shm_Locked_queue_Get(
 )
 {
   Shm_Envelope_control *tmp_ecb;
-  rtems_unsigned32 tmpfront;
+  uint32_t   tmpfront;
 
   tmp_ecb = NULL;
   Shm_Lock( lq_cb );
diff --git a/c/src/libchip/shmdr/init.c b/c/src/libchip/shmdr/init.c
index 033acac1f6..66e3ffba0a 100644
--- a/c/src/libchip/shmdr/init.c
+++ b/c/src/libchip/shmdr/init.c
@@ -36,12 +36,12 @@ rtems_extensions_table MPCI_Shm_extensions;
 rtems_mpci_entry Shm_Initialization( void )
 
 {
-  rtems_unsigned32         i, all_initialized;
-  rtems_unsigned32         interrupt_cause, interrupt_value;
+  uint32_t           i, all_initialized;
+  uint32_t           interrupt_cause, interrupt_value;
   void                    *interrupt_address;
   Shm_Node_status_control *nscb;
-  rtems_unsigned32         extension_id;    /* for installation of MPCI_Fatal */
-  rtems_unsigned32         remaining_memory;
+  uint32_t           extension_id;    /* for installation of MPCI_Fatal */
+  uint32_t           remaining_memory;
 /* XXX these should use "public" methods to set their values.... */
   rtems_configuration_table   *configuration = _Configuration_Table;
   rtems_multiprocessing_table *mp_configuration = _Configuration_MP_table;
@@ -122,7 +122,7 @@ rtems_mpci_entry Shm_Initialization( void )
    */
 
   interrupt_address =
-    (void *) Shm_Convert( (rtems_unsigned32)Shm_Configuration->Intr.address );
+    (void *) Shm_Convert( (uint32_t  )Shm_Configuration->Intr.address );
   interrupt_value   = Shm_Convert( Shm_Configuration->Intr.value );
   interrupt_cause   = Shm_Convert( Shm_Configuration->Intr.length );
 
@@ -172,7 +172,7 @@ rtems_mpci_entry Shm_Initialization( void )
      *  shared area so other nodes can interrupt us.
      */
 
-    Shm_Local_node_status->int_address = (rtems_unsigned32) interrupt_address;
+    Shm_Local_node_status->int_address = (uint32_t  ) interrupt_address;
     Shm_Local_node_status->int_value   = interrupt_value;
     Shm_Local_node_status->int_length  = interrupt_cause;
 
@@ -220,7 +220,7 @@ rtems_mpci_entry Shm_Initialization( void )
          */
 
         Shm_Local_node_status->int_address =
-          (rtems_unsigned32) interrupt_address;
+          (uint32_t  ) interrupt_address;
         Shm_Local_node_status->int_value   = interrupt_value;
         Shm_Local_node_status->int_length  = interrupt_cause;
 
diff --git a/c/src/libchip/shmdr/initlq.c b/c/src/libchip/shmdr/initlq.c
index 031156a6be..ee7047b2e6 100644
--- a/c/src/libchip/shmdr/initlq.c
+++ b/c/src/libchip/shmdr/initlq.c
@@ -24,7 +24,7 @@
 
 void Shm_Locked_queue_Initialize(
   Shm_Locked_queue_Control *lq_cb,
-  rtems_unsigned32 owner
+  uint32_t   owner
 )
 {
   Shm_Initialize_lock( lq_cb );
diff --git a/c/src/libchip/shmdr/intr.c b/c/src/libchip/shmdr/intr.c
index 9e40b12bbd..76129f7c95 100644
--- a/c/src/libchip/shmdr/intr.c
+++ b/c/src/libchip/shmdr/intr.c
@@ -26,14 +26,14 @@
 #include "shm_driver.h"
 
 void Shm_Cause_interrupt(
-  rtems_unsigned32 node
+  uint32_t   node
 )
 {
   Shm_Interrupt_information *intr;
-  rtems_unsigned8  *u8;
-  rtems_unsigned16 *u16;
-  rtems_unsigned32 *u32;
-  rtems_unsigned32  value;
+  uint8_t    *u8;
+  uint16_t   *u16;
+  uint32_t   *u32;
+  uint32_t    value;
 
   intr = &Shm_Interrupt_table[node];
   value = intr->value;
@@ -42,16 +42,16 @@ void Shm_Cause_interrupt(
     case NO_INTERRUPT:
        break;
     case BYTE:
-      u8   = (rtems_unsigned8 *)intr->address;
-      *u8  = (rtems_unsigned8) value;
+      u8   = (uint8_t   *)intr->address;
+      *u8  = (uint8_t  ) value;
       break;
     case WORD:
-      u16   = (rtems_unsigned16 *)intr->address;
-      *u16  = (rtems_unsigned16) value;
+      u16   = (uint16_t   *)intr->address;
+      *u16  = (uint16_t  ) value;
       break;
     case LONG:
-      u32   = (rtems_unsigned32 *)intr->address;
-      *u32  = (rtems_unsigned32) value;
+      u32   = (uint32_t   *)intr->address;
+      *u32  = (uint32_t  ) value;
       break;
   }
 }
diff --git a/c/src/libchip/shmdr/poll.c b/c/src/libchip/shmdr/poll.c
index a0ef443698..dca454879d 100644
--- a/c/src/libchip/shmdr/poll.c
+++ b/c/src/libchip/shmdr/poll.c
@@ -26,7 +26,7 @@
 
 void Shm_Poll()
 {
-  rtems_unsigned32 tmpfront;
+  uint32_t   tmpfront;
   rtems_libio_ioctl_args_t args;
 
   /* invoke clock isr */
diff --git a/c/src/libchip/shmdr/send.c b/c/src/libchip/shmdr/send.c
index 622689a67e..bdfd272b32 100644
--- a/c/src/libchip/shmdr/send.c
+++ b/c/src/libchip/shmdr/send.c
@@ -25,16 +25,16 @@
 #include "shm_driver.h"
 
 struct pkt_cpy {
-  rtems_unsigned32 packet[MAX_PACKET_SIZE/4];
+  uint32_t   packet[MAX_PACKET_SIZE/4];
 };
 
 rtems_mpci_entry Shm_Send_packet(
-  rtems_unsigned32 node,
+  uint32_t   node,
   rtems_packet_prefix *packet
 )
 {
   Shm_Envelope_control *ecb, *tmp_ecb;
-  rtems_unsigned32 nnum;
+  uint32_t   nnum;
 
   ecb = Shm_Packet_prefix_to_envelope_control_pointer( packet );
   if ( node ) {
diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h
index 4034220c42..eec63a91a9 100644
--- a/c/src/libchip/shmdr/shm_driver.h
+++ b/c/src/libchip/shmdr/shm_driver.h
@@ -84,7 +84,7 @@ extern "C" {
  *  "tas" instruction which is atomic.  All ports to other CPUs
  *  comply with the restrictive placement of lock bit by this
  *  instruction.  The lock bit is the most significant bit in a
- *  big-endian rtems_unsigned32.  On other processors, the lock is
+ *  big-endian uint32_t  .  On other processors, the lock is
  *  typically implemented via an atomic swap or atomic modify
  *  bits type instruction.
  */
@@ -254,7 +254,7 @@ extern "C" {
    ((void *)(ecb)->packet)
 
 #define Shm_Packet_prefix_to_envelope_control_pointer( pkt )   \
-   ((Shm_Envelope_control *)((rtems_unsigned8 *)(pkt) - \
+   ((Shm_Envelope_control *)((uint8_t   *)(pkt) - \
    (sizeof(Shm_Envelope_preamble) + SHM_ENVELOPE_PREFIX_OVERHEAD)))
 
 #define Shm_Build_preamble(ecb, node) \
@@ -264,8 +264,8 @@ extern "C" {
 
 /* volatile types */
 
-typedef volatile rtems_unsigned8  vol_u8;
-typedef volatile rtems_unsigned32 vol_u32;
+typedef volatile uint8_t    vol_u8;
+typedef volatile uint32_t   vol_u32;
 
 /* shm control information */
 
@@ -396,7 +396,7 @@ typedef struct {
  *  base       - The base address of the shared memory.  This
  *               address may be specific to this node.
  *  length     - The length of the shared memory in bytes.
- *  format     - The natural format for rtems_unsigned32's in the
+ *  format     - The natural format for uint32_t  's in the
  *               shared memory.  Valid values are currently
  *               only SHM_LITTLE and SHM_BIG.
  *  convert    - The address of the routine which converts
@@ -425,7 +425,7 @@ struct shm_config_info {
   vol_u32            format;   /* SHM is big or little endian */
   vol_u32          (*convert)();/* neutral conversion routine */
   vol_u32            poll_intr;/* POLLED or INTR driven mode  */
-  void             (*cause_intr)( rtems_unsigned32 );
+  void             (*cause_intr)( uint32_t   );
   Shm_Interrupt_information   Intr;     /* cause intr information      */
 };
 
@@ -446,24 +446,24 @@ SHM_EXTERN Shm_Locked_queue_Control     *Shm_Locked_queues;
 SHM_EXTERN Shm_Envelope_control         *Shm_Envelopes;
 SHM_EXTERN rtems_configuration_table    *Shm_RTEMS_Configuration;
 SHM_EXTERN rtems_multiprocessing_table  *Shm_RTEMS_MP_Configuration;
-SHM_EXTERN rtems_unsigned32              Shm_Receive_message_count;
-SHM_EXTERN rtems_unsigned32              Shm_Null_message_count;
-SHM_EXTERN rtems_unsigned32              Shm_Interrupt_count;
-SHM_EXTERN rtems_unsigned32              Shm_Local_node;
+SHM_EXTERN uint32_t                Shm_Receive_message_count;
+SHM_EXTERN uint32_t                Shm_Null_message_count;
+SHM_EXTERN uint32_t                Shm_Interrupt_count;
+SHM_EXTERN uint32_t                Shm_Local_node;
 SHM_EXTERN Shm_Locked_queue_Control      *Shm_Local_receive_queue;
 SHM_EXTERN Shm_Node_status_control       *Shm_Local_node_status;
-SHM_EXTERN rtems_unsigned32              Shm_isrstat;
+SHM_EXTERN uint32_t                Shm_isrstat;
                                                      /* reported by shmdr */
 
-SHM_EXTERN rtems_unsigned32 Shm_Pending_initialization;
-SHM_EXTERN rtems_unsigned32 Shm_Initialization_complete;
-SHM_EXTERN rtems_unsigned32 Shm_Active_node;
+SHM_EXTERN uint32_t   Shm_Pending_initialization;
+SHM_EXTERN uint32_t   Shm_Initialization_complete;
+SHM_EXTERN uint32_t   Shm_Active_node;
 
-SHM_EXTERN rtems_unsigned32 Shm_Maximum_nodes;
-SHM_EXTERN rtems_unsigned32 Shm_Maximum_envelopes;
+SHM_EXTERN uint32_t   Shm_Maximum_nodes;
+SHM_EXTERN uint32_t   Shm_Maximum_envelopes;
 
-SHM_EXTERN rtems_unsigned32 Shm_Locked_queue_End_of_list;
-SHM_EXTERN rtems_unsigned32 Shm_Locked_queue_Not_on_list;
+SHM_EXTERN uint32_t   Shm_Locked_queue_End_of_list;
+SHM_EXTERN uint32_t   Shm_Locked_queue_Not_on_list;
 
 /* functions */
 
@@ -472,7 +472,7 @@ void           Shm_Locked_queue_Add(
                   Shm_Locked_queue_Control *, Shm_Envelope_control * );
 Shm_Envelope_control *Shm_Locked_queue_Get( Shm_Locked_queue_Control * );
 void           Shm_Locked_queue_Initialize(
-                  Shm_Locked_queue_Control *, rtems_unsigned32 );
+                  Shm_Locked_queue_Control *, uint32_t   );
             /* Shm_Initialize_lock is CPU dependent */
             /* Shm_Lock is CPU dependent */
             /* Shm_Unlock is CPU dependent */
@@ -480,8 +480,8 @@ void           Shm_Locked_queue_Initialize(
 /* portable routines */
 void           Init_env_pool();
 void           Shm_Print_statistics( void );
-void           MPCI_Fatal( Internal_errors_Source, boolean, rtems_unsigned32 );
-rtems_task     Shm_Cause_interrupt( rtems_unsigned32 );
+void           MPCI_Fatal( Internal_errors_Source, boolean, uint32_t   );
+rtems_task     Shm_Cause_interrupt( uint32_t   );
 void           Shm_Poll();
 void           Shm_setclockvec();
 void           Shm_Convert_packet( rtems_packet_prefix * );
@@ -490,7 +490,7 @@ void           Shm_Convert_packet( rtems_packet_prefix * );
 
 /* target specific routines */
 void          *Shm_Convert_address( void * );
-void           Shm_Get_configuration( rtems_unsigned32, shm_config_table ** );
+void           Shm_Get_configuration( uint32_t  , shm_config_table ** );
 void           Shm_isr();
 void           Shm_setvec( void );
 
@@ -514,7 +514,7 @@ rtems_mpci_entry Shm_Return_packet(
 );
 
 rtems_mpci_entry Shm_Send_packet(
-  rtems_unsigned32,
+  uint32_t  ,
   rtems_packet_prefix *
 );