Eliminate obsolete types.

5 files changed, 20 insertions, 16 deletions

diff --git a/cpukit/libi2c/libi2c.c b/cpukit/libi2c/libi2c.c
index 79fe6525bc..cccce0136f 100644
--- a/cpukit/libi2c/libi2c.c
+++ b/cpukit/libi2c/libi2c.c
@@ -2,6 +2,10 @@
 
 /* libi2c Implementation */
 
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -380,7 +384,7 @@ not_started (int busno)
 }
 
 rtems_status_code
-rtems_libi2c_send_start (unsigned32 minor)
+rtems_libi2c_send_start (uint32_t minor)
 {
   int rval;
   DECL_CHECKED_BH (busno, bush, minor, +)
@@ -411,7 +415,7 @@ rtems_libi2c_send_start (unsigned32 minor)
 }
 
 rtems_status_code
-rtems_libi2c_send_stop (unsigned32 minor)
+rtems_libi2c_send_stop (uint32_t minor)
 {
   rtems_status_code rval;
   DECL_CHECKED_BH (busno, bush, minor, +)
@@ -428,7 +432,7 @@ rtems_libi2c_send_stop (unsigned32 minor)
 }
 
 rtems_status_code
-rtems_libi2c_send_addr (unsigned32 minor, int rw)
+rtems_libi2c_send_addr (uint32_t minor, int rw)
 {
   rtems_status_code sc;
   DECL_CHECKED_BH (busno, bush, minor, +)
@@ -443,7 +447,7 @@ rtems_libi2c_send_addr (unsigned32 minor, int rw)
 }
 
 int
-rtems_libi2c_read_bytes (unsigned32 minor, unsigned char *bytes, int nbytes)
+rtems_libi2c_read_bytes (uint32_t minor, unsigned char *bytes, int nbytes)
 {
   int sc;
   DECL_CHECKED_BH (busno, bush, minor, -)
@@ -458,7 +462,7 @@ rtems_libi2c_read_bytes (unsigned32 minor, unsigned char *bytes, int nbytes)
 }
 
 int
-rtems_libi2c_write_bytes (unsigned32 minor, unsigned char *bytes, int nbytes)
+rtems_libi2c_write_bytes (uint32_t minor, unsigned char *bytes, int nbytes)
 {
   int sc;
   DECL_CHECKED_BH (busno, bush, minor, -)
@@ -473,7 +477,7 @@ rtems_libi2c_write_bytes (unsigned32 minor, unsigned char *bytes, int nbytes)
 }
 
 static int
-do_s_rw (unsigned32 minor, unsigned char *bytes, int nbytes, int rw)
+do_s_rw (uint32_t minor, unsigned char *bytes, int nbytes, int rw)
 {
   rtems_status_code sc;
   rtems_libi2c_bus_t *bush;
@@ -501,14 +505,14 @@ do_s_rw (unsigned32 minor, unsigned char *bytes, int nbytes, int rw)
 }
 
 int
-rtems_libi2c_start_read_bytes (unsigned32 minor, unsigned char *bytes,
+rtems_libi2c_start_read_bytes (uint32_t minor, unsigned char *bytes,
                                int nbytes)
 {
   return do_s_rw (minor, bytes, nbytes, 1);
 }
 
 int
-rtems_libi2c_start_write_bytes (unsigned32 minor, unsigned char *bytes,
+rtems_libi2c_start_write_bytes (uint32_t minor, unsigned char *bytes,
                                 int nbytes)
 {
   return do_s_rw (minor, bytes, nbytes, 0);
@@ -549,7 +553,7 @@ rtems_libi2c_register_drv (char *name, rtems_libi2c_drv_t * drvtbl,
     if (!drvs[i].drv) {
       char *str;
       dev_t dev;
-      unsigned32 mode;
+      uint32_t mode;
 
       /* found a free slot; encode slot + 1 ! */
       minor = ((i + 1) << 13) | RTEMS_LIBI2C_MAKE_MINOR (busno, i2caddr);
diff --git a/cpukit/libi2c/libi2c.h b/cpukit/libi2c/libi2c.h
index 761e44a9d2..1ef7f8b547 100644
--- a/cpukit/libi2c/libi2c.h
+++ b/cpukit/libi2c/libi2c.h
@@ -49,7 +49,7 @@ typedef struct rtems_libi2c_bus_ops_
   rtems_status_code (*send_stop) (rtems_libi2c_bus_t * bushdl);
   /* initiate transfer from (rw!=0) or to a device */
   rtems_status_code (*send_addr) (rtems_libi2c_bus_t * bushdl,
-                                  unsigned32 addr, int rw);
+                                  uint32_t addr, int rw);
   /* read a number of bytes */
   int (*read_bytes) (rtems_libi2c_bus_t * bushdl, unsigned char *bytes,
                      int nbytes);
@@ -219,12 +219,12 @@ rtems_libi2c_write_bytes (rtems_device_minor_number minor,
 
 /* Send start, send address and read bytes */
 int
-rtems_libi2c_start_read_bytes (unsigned32 minor, unsigned char *bytes,
+rtems_libi2c_start_read_bytes (uint32_t minor, unsigned char *bytes,
                                int nbytes);
 
 /* Send start, send address and write bytes */
 int
-rtems_libi2c_start_write_bytes (unsigned32 minor, unsigned char *bytes,
+rtems_libi2c_start_write_bytes (uint32_t minor, unsigned char *bytes,
                                 int nbytes);
 
 #ifdef __cplusplus
diff --git a/cpukit/libnetworking/rtems/rtems_mii_ioctl.h b/cpukit/libnetworking/rtems/rtems_mii_ioctl.h
index 5de2ed4f09..cecdfca236 100644
--- a/cpukit/libnetworking/rtems/rtems_mii_ioctl.h
+++ b/cpukit/libnetworking/rtems/rtems_mii_ioctl.h
@@ -26,13 +26,13 @@ extern "C" {
  * RETURNS 0 on success, -1 otherwise (e.g., illegal phy)
  */
 typedef int (*rtems_mdio_read_func) (int phy, void *uarg, unsigned reg,
-                                     unsigned32 * pval);
+                                     uint32_t * pval);
 
 /* write mii register 'reg' at 'phy' (-1 meaning any/currently active)
  * RETURNS 0 on success, -1 otherwise (e.g., illegal phy)
  */
 typedef int (*rtems_mdio_write_func) (int phy, void *uarg, unsigned reg,
-                                      unsigned32 val);
+                                      uint32_t val);
 
 /* Values to this must be provided by the driver */
 struct rtems_mdio_info
diff --git a/cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c b/cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c
index cd763917be..3d61f1901c 100644
--- a/cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c
+++ b/cpukit/libnetworking/rtems/rtems_mii_ioctl_kern.c
@@ -44,7 +44,7 @@ int
 rtems_mii_ioctl (struct rtems_mdio_info *info, void *uarg, int cmd,
                  int *media)
 {
-  unsigned32 bmcr, bmsr, bmcr2 = 0, bmsr2 = 0, anar, lpar;
+  uint32_t bmcr, bmsr, bmcr2 = 0, bmsr2 = 0, anar, lpar;
   int phy = IFM_INST (*media);
   unsigned tmp;
   int subtype = 0, options = 0;
diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
index e6c9cd920c..5a38d3f449 100644
--- a/cpukit/score/src/heap.c
+++ b/cpukit/score/src/heap.c
@@ -224,7 +224,7 @@ uint32_t _Heap_Calc_block_size(
  * When split, make the lower part used, and leave the upper part free.
  * Return the size of allocated block.
  */
-unsigned32 _Heap_Block_allocate(
+uint32_t _Heap_Block_allocate(
   Heap_Control* the_heap,
   Heap_Block* the_block,
   uint32_t alloc_size)