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.

14 files changed, 104 insertions, 104 deletions

diff --git a/cpukit/libcsupport/include/chain.h b/cpukit/libcsupport/include/chain.h
index e22bc9f11d..25cdca98aa 100644
--- a/cpukit/libcsupport/include/chain.h
+++ b/cpukit/libcsupport/include/chain.h
@@ -28,8 +28,8 @@
  *
  *  Chain_Control                    *the_chain,		 * IN  * 
  *  void                             *starting_address,		 * IN  * 
- *  rtems_unsigned32                  number_nodes,		 * IN  * 
- *  rtems_unsigned32                  node_size			 * IN  * 
+ *  uint32_t                    number_nodes,		 * IN  * 
+ *  uint32_t                    node_size			 * IN  * 
  */
 
 #define Chain_Initialize( the_chain, starting_address, \
diff --git a/cpukit/libcsupport/include/clockdrv.h b/cpukit/libcsupport/include/clockdrv.h
index c0064e919e..ed7e83cf51 100644
--- a/cpukit/libcsupport/include/clockdrv.h
+++ b/cpukit/libcsupport/include/clockdrv.h
@@ -21,7 +21,7 @@ extern "C" {
 
 /* variables */
 
-extern volatile rtems_unsigned32 Clock_driver_ticks;
+extern volatile uint32_t   Clock_driver_ticks;
 extern rtems_device_major_number rtems_clock_major;
 extern rtems_device_minor_number rtems_clock_minor;
 
diff --git a/cpukit/libcsupport/include/motorola/mc68230.h b/cpukit/libcsupport/include/motorola/mc68230.h
index ff09a0d6c3..952c1cdb3c 100644
--- a/cpukit/libcsupport/include/motorola/mc68230.h
+++ b/cpukit/libcsupport/include/motorola/mc68230.h
@@ -58,7 +58,7 @@
 
 /* Some RTEMS style defines: */
 #ifndef VOL8
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
+#define VOL8( ptr )   ((volatile uint8_t   *)(ptr))
 #endif
 
 #define MC68230_WRITE( reg, data ) \
diff --git a/cpukit/libcsupport/include/ringbuf.h b/cpukit/libcsupport/include/ringbuf.h
index 8c80aaf9c8..8639ff4fb8 100644
--- a/cpukit/libcsupport/include/ringbuf.h
+++ b/cpukit/libcsupport/include/ringbuf.h
@@ -32,7 +32,7 @@ typedef struct {
 
 #define Ring_buffer_Add_character( _buffer, _ch ) \
   do { \
-    rtems_unsigned32 isrlevel; \
+    uint32_t   isrlevel; \
     \
     rtems_interrupt_disable( isrlevel ); \
       (_buffer)->tail = ((_buffer)->tail+1) % RINGBUF_QUEUE_LENGTH; \
@@ -42,7 +42,7 @@ typedef struct {
 
 #define Ring_buffer_Remove_character( _buffer, _ch ) \
   do { \
-    rtems_unsigned32 isrlevel; \
+    uint32_t   isrlevel; \
     \
     rtems_interrupt_disable( isrlevel ); \
       (_buffer)->head = ((_buffer)->head+1) % RINGBUF_QUEUE_LENGTH; \
diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/cpukit/libcsupport/include/rtems/assoc.h
index 1982d654ac..7c5ebe7f6a 100644
--- a/cpukit/libcsupport/include/rtems/assoc.h
+++ b/cpukit/libcsupport/include/rtems/assoc.h
@@ -12,8 +12,8 @@
 
 typedef struct {
     const char   *name;
-    unsigned32   local_value;
-    unsigned32   remote_value;
+    uint32_t     local_value;
+    uint32_t     remote_value;
 } rtems_assoc_t;
 
 /*
@@ -23,20 +23,20 @@ typedef struct {
 #define RTEMS_ASSOC_DEFAULT_NAME "(default)"
 
 const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *);
-const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32);
-const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32);
-unsigned32   rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
-unsigned32   rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
-const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32);
-const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32);
-
-unsigned32   rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32);
-char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *);
-char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *);
-unsigned32   rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32);
+const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, uint32_t  );
+const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, uint32_t  );
+
+uint32_t     rtems_assoc_remote_by_local(const rtems_assoc_t *, uint32_t  );
+uint32_t     rtems_assoc_local_by_remote(const rtems_assoc_t *, uint32_t  );
+uint32_t     rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *);
+uint32_t     rtems_assoc_local_by_name(const rtems_assoc_t *, const char *);
+const char  *rtems_assoc_name_by_local(const rtems_assoc_t *, uint32_t  );
+const char  *rtems_assoc_name_by_remote(const rtems_assoc_t *, uint32_t  );
+
+uint32_t     rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, uint32_t  );
+char  *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, uint32_t  , char *);
+char  *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, uint32_t  , char *);
+uint32_t     rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, uint32_t  );
 
 
 #endif /* ! _INCLUDE_ASSOC_H */
diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h
index a70787d9ca..498ecd1f59 100644
--- a/cpukit/libcsupport/include/rtems/libio.h
+++ b/cpukit/libcsupport/include/rtems/libio.h
@@ -48,8 +48,8 @@ typedef int rtems_filesystem_node_types_t;
 typedef int (*rtems_filesystem_open_t)(
   rtems_libio_t *iop,
   const char    *pathname,
-  unsigned32     flag,
-  unsigned32     mode
+  uint32_t       flag,
+  uint32_t       mode
 );
 
 typedef int (*rtems_filesystem_close_t)(
@@ -59,18 +59,18 @@ typedef int (*rtems_filesystem_close_t)(
 typedef ssize_t (*rtems_filesystem_read_t)(
   rtems_libio_t *iop,
   void          *buffer,
-  unsigned32     count
+  uint32_t       count
 );
 
 typedef ssize_t (*rtems_filesystem_write_t)(
   rtems_libio_t *iop,
   const void    *buffer,
-  unsigned32    count
+  uint32_t      count
 );
 
 typedef int (*rtems_filesystem_ioctl_t)(
   rtems_libio_t *iop,
-  unsigned32     command,
+  uint32_t       command,
   void          *buffer
 );
 
@@ -340,10 +340,10 @@ struct rtems_libio_tt {
     rtems_driver_name_t              *driver;
     off_t                             size;      /* size of file */
     off_t                             offset;    /* current offset into file */
-    unsigned32                        flags;
+    uint32_t                          flags;
     rtems_filesystem_location_info_t  pathinfo;
     Objects_Id                        sem;      
-    unsigned32                        data0;     /* private to "driver" */
+    uint32_t                          data0;     /* private to "driver" */
     void                             *data1;     /* ... */
     void                             *file_info; /* used by file handlers */
     rtems_filesystem_file_handlers_r *handlers;  /* type specific handlers */
@@ -358,10 +358,10 @@ struct rtems_libio_tt {
 typedef struct {
     rtems_libio_t          *iop;
     off_t                   offset;
-    unsigned8              *buffer;
-    unsigned32              count;
-    unsigned32              flags;
-    unsigned32              bytes_moved;
+    uint8_t                *buffer;
+    uint32_t                count;
+    uint32_t                flags;
+    uint32_t                bytes_moved;
 } rtems_libio_rw_args_t;
 
 /*
@@ -370,8 +370,8 @@ typedef struct {
 
 typedef struct {
     rtems_libio_t          *iop;
-    unsigned32              flags;
-    unsigned32              mode;
+    uint32_t                flags;
+    uint32_t                mode;
 } rtems_libio_open_close_args_t;
 
 /*
@@ -380,9 +380,9 @@ typedef struct {
 
 typedef struct {
     rtems_libio_t          *iop;
-    unsigned32              command;
+    uint32_t                command;
     void                   *buffer;
-    unsigned32              ioctl_return;
+    uint32_t                ioctl_return;
 } rtems_libio_ioctl_args_t;
 
 /*
@@ -406,8 +406,8 @@ void rtems_libio_init(void);
 
 typedef int (*rtems_libio_open_t)(
   const char  *pathname,
-  unsigned32  flag,
-  unsigned32  mode
+  uint32_t    flag,
+  uint32_t    mode
 );
 
 typedef int (*rtems_libio_close_t)(
@@ -417,18 +417,18 @@ typedef int (*rtems_libio_close_t)(
 typedef int (*rtems_libio_read_t)(
   int         fd,
   void       *buffer,
-  unsigned32  count
+  uint32_t    count
 );
 
 typedef int (*rtems_libio_write_t)(
   int         fd,
   const void *buffer,
-  unsigned32  count
+  uint32_t    count
 );
 
 typedef int (*rtems_libio_ioctl_t)(
   int         fd,
-  unsigned32  command,
+  uint32_t    command,
   void       *buffer
 );
 
@@ -601,7 +601,7 @@ int rtems_termios_dequeue_characters(
 
 void rtems_termios_reserve_resources(
   rtems_configuration_table *configuration,
-  rtems_unsigned32           number_of_devices
+  uint32_t             number_of_devices
 );
 
 int unmount(
diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/libcsupport/include/rtems/libio_.h
index 841c3e38a8..cc5b4ff7bc 100644
--- a/cpukit/libcsupport/include/rtems/libio_.h
+++ b/cpukit/libcsupport/include/rtems/libio_.h
@@ -39,7 +39,7 @@ extern rtems_filesystem_file_handlers_r  rtems_filesystem_null_handlers;
  *  File descriptor Table Information
  */
 
-extern unsigned32      rtems_libio_number_iops;
+extern uint32_t        rtems_libio_number_iops;
 extern rtems_libio_t  *rtems_libio_iops;
 extern rtems_libio_t  *rtems_libio_last_iop;
 extern rtems_libio_t *rtems_libio_iop_freelist;
@@ -51,7 +51,7 @@ extern rtems_libio_t *rtems_libio_iop_freelist;
  */
 
 #define rtems_libio_iop(_fd) \
-  ((((unsigned32)(_fd)) < rtems_libio_number_iops) ? \
+  ((((uint32_t  )(_fd)) < rtems_libio_number_iops) ? \
          &rtems_libio_iops[_fd] : 0)
 
 /*
@@ -86,7 +86,7 @@ extern rtems_libio_t *rtems_libio_iop_freelist;
 
 #define rtems_libio_check_fd(_fd) \
   do {                                                     \
-      if ((unsigned32) (_fd) >= rtems_libio_number_iops) { \
+      if ((uint32_t  ) (_fd) >= rtems_libio_number_iops) { \
           errno = EBADF;                                   \
           return -1;                                       \
       }                                                    \
@@ -206,12 +206,12 @@ rtems_status_code rtems_libio_share_private_env(rtems_id task_id) ;
 
 rtems_libio_t *rtems_libio_allocate(void);
 
-unsigned32 rtems_libio_fcntl_flags(
-  unsigned32 fcntl_flags
+uint32_t   rtems_libio_fcntl_flags(
+  uint32_t   fcntl_flags
 );
 
-unsigned32 rtems_libio_to_fcntl_flags(
-  unsigned32 flags
+uint32_t   rtems_libio_to_fcntl_flags(
+  uint32_t   flags
 );
 
 void rtems_libio_free(
diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/cpukit/libcsupport/include/rtems/termiostypes.h
index 6a4852cd08..ab5968d0a2 100644
--- a/cpukit/libcsupport/include/rtems/termiostypes.h
+++ b/cpukit/libcsupport/include/rtems/termiostypes.h
@@ -90,7 +90,7 @@ struct rtems_termios_tty {
 	 * Raw input character buffer
 	 */
         struct rtems_termios_rawbuf rawInBuf;
-	rtems_unsigned32	rawInBufSemaphoreOptions;
+	uint32_t  	rawInBufSemaphoreOptions;
 	rtems_interval		rawInBufSemaphoreTimeout;
 	rtems_interval		rawInBufSemaphoreFirstTimeout;
 	unsigned int		rawInBufDropped;	/* Statistics */
diff --git a/cpukit/libcsupport/include/spurious.h b/cpukit/libcsupport/include/spurious.h
index e839eab5cf..729245fb95 100644
--- a/cpukit/libcsupport/include/spurious.h
+++ b/cpukit/libcsupport/include/spurious.h
@@ -27,7 +27,7 @@ rtems_device_driver Spurious_Initialize(
   rtems_device_minor_number,
   void *,
   rtems_id,
-  rtems_unsigned32 *
+  uint32_t   *
 );
 
 #ifdef __cplusplus
diff --git a/cpukit/libcsupport/include/timerdrv.h b/cpukit/libcsupport/include/timerdrv.h
index 7adb4833e6..9b1772201e 100644
--- a/cpukit/libcsupport/include/timerdrv.h
+++ b/cpukit/libcsupport/include/timerdrv.h
@@ -23,7 +23,7 @@ extern "C" {
 
 void Timer_initialize( void );
 
-rtems_unsigned32 Read_timer( void );
+uint32_t   Read_timer( void );
 
 rtems_status_code Empty_function( void );
 
diff --git a/cpukit/libcsupport/include/vmeintr.h b/cpukit/libcsupport/include/vmeintr.h
index 081acc8883..95d53db263 100644
--- a/cpukit/libcsupport/include/vmeintr.h
+++ b/cpukit/libcsupport/include/vmeintr.h
@@ -30,7 +30,7 @@ extern "C" {
  *
  */
 
-typedef rtems_unsigned8 VME_interrupt_Mask;
+typedef uint8_t   VME_interrupt_Mask;
 
 /*
  *  VME_interrupt_Disable
diff --git a/cpukit/libcsupport/include/zilog/z8036.h b/cpukit/libcsupport/include/zilog/z8036.h
index f2f4ec5a21..748736884e 100644
--- a/cpukit/libcsupport/include/zilog/z8036.h
+++ b/cpukit/libcsupport/include/zilog/z8036.h
@@ -46,58 +46,58 @@ extern "C" {
 
 struct z8036_map {
 /* MAIN CONTROL REGISTERS (0x00-0x07) */
-  rtems_unsigned8 MASTER_INTR;           /* Master Interrupt Ctl Reg */
-  rtems_unsigned8 MASTER_CFG;            /* Master Configuration Ctl Reg */
-  rtems_unsigned8 PORTA_VECTOR;          /* Port A - Interrupt Vector */
-  rtems_unsigned8 PORTB_VECTOR;          /* Port B - Interrupt Vector */
-  rtems_unsigned8 CNT_TMR_VECTOR;        /* Counter/Timer Interrupt Vector */
-  rtems_unsigned8 PORTC_DATA_POLARITY;   /* Port C - Data Path Polarity */
-  rtems_unsigned8 PORTC_DIRECTION;       /* Port C - Data Direction */
-  rtems_unsigned8 PORTC_SPECIAL_IO_CTL;  /* Port C - Special IO Control */
+  uint8_t   MASTER_INTR;           /* Master Interrupt Ctl Reg */
+  uint8_t   MASTER_CFG;            /* Master Configuration Ctl Reg */
+  uint8_t   PORTA_VECTOR;          /* Port A - Interrupt Vector */
+  uint8_t   PORTB_VECTOR;          /* Port B - Interrupt Vector */
+  uint8_t   CNT_TMR_VECTOR;        /* Counter/Timer Interrupt Vector */
+  uint8_t   PORTC_DATA_POLARITY;   /* Port C - Data Path Polarity */
+  uint8_t   PORTC_DIRECTION;       /* Port C - Data Direction */
+  uint8_t   PORTC_SPECIAL_IO_CTL;  /* Port C - Special IO Control */
 /* MOST OFTEN ACCESSED REGISTERS (0x08 - 0x0f) */
-  rtems_unsigned8 PORTA_CMD_STATUS;      /* Port A - Command Status Reg */
-  rtems_unsigned8 PORTB_CMD_STATUS;      /* Port B - Command Status Reg */
-  rtems_unsigned8 CT1_CMD_STATUS;        /* Ctr/Timer 1 - Command Status Reg */
-  rtems_unsigned8 CT2_CMD_STATUS;        /* Ctr/Timer 2 - Command Status Reg */
-  rtems_unsigned8 CT3_CMD_STATUS;        /* Ctr/Timer 3 - Command Status Reg */
-  rtems_unsigned8 PORTA_DATA;            /* Port A - Data */
-  rtems_unsigned8 PORTB_DATA;            /* Port B - Data */
-  rtems_unsigned8 PORTC_DATA;            /* Port C - Data */
+  uint8_t   PORTA_CMD_STATUS;      /* Port A - Command Status Reg */
+  uint8_t   PORTB_CMD_STATUS;      /* Port B - Command Status Reg */
+  uint8_t   CT1_CMD_STATUS;        /* Ctr/Timer 1 - Command Status Reg */
+  uint8_t   CT2_CMD_STATUS;        /* Ctr/Timer 2 - Command Status Reg */
+  uint8_t   CT3_CMD_STATUS;        /* Ctr/Timer 3 - Command Status Reg */
+  uint8_t   PORTA_DATA;            /* Port A - Data */
+  uint8_t   PORTB_DATA;            /* Port B - Data */
+  uint8_t   PORTC_DATA;            /* Port C - Data */
 /* COUNTER/TIMER RELATED REGISTERS (0x10-0x1f) */
-  rtems_unsigned8 CT1_CUR_CNT_MSB;       /* Ctr/Timer 1 - Current Count (MSB) */
-  rtems_unsigned8 CT1_CUR_CNT_LSB;       /* Ctr/Timer 1 - Current Count (LSB) */
-  rtems_unsigned8 CT2_CUR_CNT_MSB;       /* Ctr/Timer 2 - Current Count (MSB) */
-  rtems_unsigned8 CT2_CUR_CNT_LSB;       /* Ctr/Timer 2 - Current Count (LSB) */
-  rtems_unsigned8 CT3_CUR_CNT_MSB;       /* Ctr/Timer 3 - Current Count (MSB) */
-  rtems_unsigned8 CT3_CUR_CNT_LSB;       /* Ctr/Timer 3 - Current Count (LSB) */
-  rtems_unsigned8 CT1_TIME_CONST_MSB;    /* Ctr/Timer 1 - Time Constant (MSB) */
-  rtems_unsigned8 CT1_TIME_CONST_LSB;    /* Ctr/Timer 1 - Time Constant (LSB) */
-  rtems_unsigned8 CT2_TIME_CONST_MSB;    /* Ctr/Timer 2 - Time Constant (MSB) */
-  rtems_unsigned8 CT2_TIME_CONST_LSB;    /* Ctr/Timer 2 - Time Constant (LSB) */
-  rtems_unsigned8 CT3_TIME_CONST_MSB;    /* Ctr/Timer 3 - Time Constant (MSB) */
-  rtems_unsigned8 CT3_TIME_CONST_LSB;    /* Ctr/Timer 3 - Time Constant (LSB) */
-  rtems_unsigned8 CT1_MODE_SPEC;         /* Ctr/Timer 1 - Mode Specification  */
-  rtems_unsigned8 CT2_MODE_SPEC;         /* Ctr/Timer 2 - Mode Specification  */
-  rtems_unsigned8 CT3_MODE_SPEC;         /* Ctr/Timer 3 - Mode Specification  */
-  rtems_unsigned8 CURRENT_VECTOR;        /* Current Vector */
+  uint8_t   CT1_CUR_CNT_MSB;       /* Ctr/Timer 1 - Current Count (MSB) */
+  uint8_t   CT1_CUR_CNT_LSB;       /* Ctr/Timer 1 - Current Count (LSB) */
+  uint8_t   CT2_CUR_CNT_MSB;       /* Ctr/Timer 2 - Current Count (MSB) */
+  uint8_t   CT2_CUR_CNT_LSB;       /* Ctr/Timer 2 - Current Count (LSB) */
+  uint8_t   CT3_CUR_CNT_MSB;       /* Ctr/Timer 3 - Current Count (MSB) */
+  uint8_t   CT3_CUR_CNT_LSB;       /* Ctr/Timer 3 - Current Count (LSB) */
+  uint8_t   CT1_TIME_CONST_MSB;    /* Ctr/Timer 1 - Time Constant (MSB) */
+  uint8_t   CT1_TIME_CONST_LSB;    /* Ctr/Timer 1 - Time Constant (LSB) */
+  uint8_t   CT2_TIME_CONST_MSB;    /* Ctr/Timer 2 - Time Constant (MSB) */
+  uint8_t   CT2_TIME_CONST_LSB;    /* Ctr/Timer 2 - Time Constant (LSB) */
+  uint8_t   CT3_TIME_CONST_MSB;    /* Ctr/Timer 3 - Time Constant (MSB) */
+  uint8_t   CT3_TIME_CONST_LSB;    /* Ctr/Timer 3 - Time Constant (LSB) */
+  uint8_t   CT1_MODE_SPEC;         /* Ctr/Timer 1 - Mode Specification  */
+  uint8_t   CT2_MODE_SPEC;         /* Ctr/Timer 2 - Mode Specification  */
+  uint8_t   CT3_MODE_SPEC;         /* Ctr/Timer 3 - Mode Specification  */
+  uint8_t   CURRENT_VECTOR;        /* Current Vector */
 /* PORT A SPECIFICATION REGISTERS (0x20 -0x27) */
-  rtems_unsigned8 PORTA_MODE;            /* Port A - Mode Specification  */
-  rtems_unsigned8 PORTA_HANDSHAKE;       /* Port A - Handshake Specification  */
-  rtems_unsigned8 PORTA_DATA_POLARITY;   /* Port A - Data Path Polarity */
-  rtems_unsigned8 PORTA_DIRECTION;       /* Port A - Data Direction */
-  rtems_unsigned8 PORTA_SPECIAL_IO_CTL;  /* Port A - Special IO Control */
-  rtems_unsigned8 PORTA_PATT_POLARITY;   /* Port A - Pattern Polarity */
-  rtems_unsigned8 PORTA_PATT_TRANS;      /* Port A - Pattern Transition */
-  rtems_unsigned8 PORTA_PATT_MASK;       /* Port A - Pattern Mask */
+  uint8_t   PORTA_MODE;            /* Port A - Mode Specification  */
+  uint8_t   PORTA_HANDSHAKE;       /* Port A - Handshake Specification  */
+  uint8_t   PORTA_DATA_POLARITY;   /* Port A - Data Path Polarity */
+  uint8_t   PORTA_DIRECTION;       /* Port A - Data Direction */
+  uint8_t   PORTA_SPECIAL_IO_CTL;  /* Port A - Special IO Control */
+  uint8_t   PORTA_PATT_POLARITY;   /* Port A - Pattern Polarity */
+  uint8_t   PORTA_PATT_TRANS;      /* Port A - Pattern Transition */
+  uint8_t   PORTA_PATT_MASK;       /* Port A - Pattern Mask */
 /* PORT B SPECIFICATION REGISTERS (0x28-0x2f) */
-  rtems_unsigned8 PORTB_MODE;            /* Port B - Mode Specification  */
-  rtems_unsigned8 PORTB_HANDSHAKE;       /* Port B - Handshake Specification  */
-  rtems_unsigned8 PORTB_DATA_POLARITY;   /* Port B - Data Path Polarity */
-  rtems_unsigned8 PORTB_DIRECTION;       /* Port B - Data Direction */
-  rtems_unsigned8 PORTB_SPECIAL_IO_CTL;  /* Port B - Special IO Control */
-  rtems_unsigned8 PORTB_PATT_POLARITY;   /* Port B - Pattern Polarity */
-  rtems_unsigned8 PORTB_PATT_TRANS;      /* Port B - Pattern Transition */
-  rtems_unsigned8 PORTB_PATT_MASK;       /* Port B - Pattern Mask */
+  uint8_t   PORTB_MODE;            /* Port B - Mode Specification  */
+  uint8_t   PORTB_HANDSHAKE;       /* Port B - Handshake Specification  */
+  uint8_t   PORTB_DATA_POLARITY;   /* Port B - Data Path Polarity */
+  uint8_t   PORTB_DIRECTION;       /* Port B - Data Direction */
+  uint8_t   PORTB_SPECIAL_IO_CTL;  /* Port B - Special IO Control */
+  uint8_t   PORTB_PATT_POLARITY;   /* Port B - Pattern Polarity */
+  uint8_t   PORTB_PATT_TRANS;      /* Port B - Pattern Transition */
+  uint8_t   PORTB_PATT_MASK;       /* Port B - Pattern Mask */
 };
 
 #ifdef __cplusplus
diff --git a/cpukit/libcsupport/include/zilog/z8530.h b/cpukit/libcsupport/include/zilog/z8530.h
index c097e1b6b6..f77178f8ef 100644
--- a/cpukit/libcsupport/include/zilog/z8530.h
+++ b/cpukit/libcsupport/include/zilog/z8530.h
@@ -26,7 +26,7 @@ extern "C" {
 
 /* macros */
 
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
+#define VOL8( ptr )   ((volatile uint8_t   *)(ptr))
 
 #define Z8x30_STATE0 ( z8530 ) \
   { char *garbage; \
diff --git a/cpukit/libcsupport/include/zilog/z8536.h b/cpukit/libcsupport/include/zilog/z8536.h
index ea540ce63d..22457c8bca 100644
--- a/cpukit/libcsupport/include/zilog/z8536.h
+++ b/cpukit/libcsupport/include/zilog/z8536.h
@@ -29,7 +29,7 @@ extern "C" {
 
 /* macros */
 
-#define VOL8( ptr )   ((volatile rtems_unsigned8 *)(ptr))
+#define VOL8( ptr )   ((volatile uint8_t   *)(ptr))
 
 #define Z8x36_STATE0 ( z8536 ) \
   { char *garbage; \