Convert to "bool".

24 files changed, 80 insertions, 80 deletions

diff --git a/c/src/libchip/display/disp_hcms29xx.c b/c/src/libchip/display/disp_hcms29xx.c
index 8566b3939b..d95c6864ca 100644
--- a/c/src/libchip/display/disp_hcms29xx.c
+++ b/c/src/libchip/display/disp_hcms29xx.c
@@ -53,9 +53,9 @@ static disp_font_t disp_hcms29xx_font_rotate;
 const rtems_libi2c_tfr_mode_t spi_disphcms29xx_tfr_mode = {
   .baudrate = 1000000,
   .bits_per_char = 8,
-  .lsb_first = TRUE,
-  .clock_inv = TRUE,
-  .clock_phs = TRUE,
+  .lsb_first = true,
+  .clock_inv = true,
+  .clock_phs = true,
   .idle_char = 0
 };
 
@@ -155,7 +155,7 @@ static rtems_status_code disp_hcms29xx_copy_font
   disp_font_t src,                      /* source font                     */
   struct disp_font_base *dst,           /* ptr to destination font         */
   int shift_cnt,                        /* shift count for font            */
-  boolean do_rotate                     /* rotate font, if TRUE            */
+  bool do_rotate                        /* rotate font, if true            */
 )
 /*-------------------------------------------------------------------------*\
 | Return Value:                                                             |
@@ -262,7 +262,7 @@ static rtems_status_code disp_hcms29xx_alloc_copy_font
   const disp_font_t src,                /* source font                     */
   disp_font_t *dst,                     /* ptr to destination font         */
   int shift_cnt,                        /* shift count for font            */
-  boolean do_rotate                     /* rotate font, if TRUE            */
+  bool do_rotate                        /* rotate font, if true            */
 )
 /*-------------------------------------------------------------------------*\
 | Return Value:                                                             |
@@ -329,7 +329,7 @@ static rtems_status_code disp_hcms29xx_send_to_display
 \*=========================================================================*/
 {
   rtems_status_code rc = RTEMS_SUCCESSFUL;
-  boolean char_avail;
+  bool char_avail;
   const struct disp_font_glyph *glyph_ptr;
   disp_font_t curr_font;
   int i,digit,ret_cnt;
@@ -354,7 +354,7 @@ static rtems_status_code disp_hcms29xx_send_to_display
    * address device
    */
   if (rc == RTEMS_SUCCESSFUL) {
-    rc = rtems_libi2c_send_addr(softc_ptr->disp_param.minor,TRUE);
+    rc = rtems_libi2c_send_addr(softc_ptr->disp_param.minor,true);
   }
 
   /*
@@ -366,7 +366,7 @@ static rtems_status_code disp_hcms29xx_send_to_display
       ? disp_hcms29xx_font_rotate 
       : disp_hcms29xx_font_normal;
 
-    char_avail = TRUE;
+    char_avail = true;
     /*
      * FIXME: for rotated display, write last character first...
      * maybe we should copy everything to a common buffer and use 
@@ -379,7 +379,7 @@ static rtems_status_code disp_hcms29xx_send_to_display
       /* test for end of string... */
       c = disp_buffer[i]; /* perform consistent read of disp_buffer */
       if (char_avail && (c == '\0')) {
-	char_avail = FALSE;
+	char_avail = false;
       }
       glyph_ptr = (char_avail 
 		   ? curr_font->latin1[c]
@@ -478,7 +478,7 @@ static rtems_status_code disp_hcms29xx_send_to_control
        * address device
        */
       if (rc == RTEMS_SUCCESSFUL) {
-	rc = rtems_libi2c_send_addr(softc_ptr->disp_param.minor,TRUE);
+	rc = rtems_libi2c_send_addr(softc_ptr->disp_param.minor,true);
       }
 
       /*
@@ -774,7 +774,7 @@ rtems_device_driver disp_hcms29xx_dev_initialize
     rc = disp_hcms29xx_alloc_copy_font(&FONT_BASE,
 			       &disp_hcms29xx_font_rotate,
 			       0, /* do not shift */
-			       TRUE); /* rotate font */
+			       true); /* rotate font */
   }
   /*
    * create the trns_buffer semaphore
diff --git a/c/src/libchip/display/disp_hcms29xx.h b/c/src/libchip/display/disp_hcms29xx.h
index 6682f1bbdd..ce7107884c 100644
--- a/c/src/libchip/display/disp_hcms29xx.h
+++ b/c/src/libchip/display/disp_hcms29xx.h
@@ -50,7 +50,7 @@ extern "C" {
     
     rtems_id trns_sema_id;  /* ID of disp trns buffer sema   */
     rtems_id task_id;       /* ID of disp task               */
-    rtems_boolean rotate;  /* FLAG: display is upside down       */
+    bool rotate;            /* FLAG: display is upside down       */
   } spi_disp_hcms29xx_param_t;
 
   typedef struct {
diff --git a/c/src/libchip/i2c/spi-flash-m25p40.c b/c/src/libchip/i2c/spi-flash-m25p40.c
index 4e2e4b9423..57f590ed56 100644
--- a/c/src/libchip/i2c/spi-flash-m25p40.c
+++ b/c/src/libchip/i2c/spi-flash-m25p40.c
@@ -30,7 +30,7 @@ static spi_memdrv_t spi_flash_m25p40_rw_drv_t = {
   },
   { /* our private fields */
   baudrate:             2000000,
-  erase_before_program: TRUE,
+  erase_before_program: true,
   empty_state:          0xff,
   page_size:            256, /* programming page size in byte */
   sector_size:          64*1024, /* erase sector size in byte */
@@ -48,7 +48,7 @@ static spi_memdrv_t spi_flash_m25p40_ro_drv_t = {
   },
   { /* our private fields */
   baudrate:             2000000,
-  erase_before_program: TRUE,
+  erase_before_program: true,
   empty_state:          0xff,
   page_size:            256, /* programming page size in byte */
   sector_size:          64*1024, /* erase sector size in byte */
diff --git a/c/src/libchip/i2c/spi-fram-fm25l256.c b/c/src/libchip/i2c/spi-fram-fm25l256.c
index b09e97154b..9f89952295 100644
--- a/c/src/libchip/i2c/spi-fram-fm25l256.c
+++ b/c/src/libchip/i2c/spi-fram-fm25l256.c
@@ -30,7 +30,7 @@ static spi_memdrv_t spi_fram_fm25l256_rw_drv_t = {
   },
   { /* our private fields */
   baudrate:             2000000,
-  erase_before_program: FALSE,
+  erase_before_program: false,
   empty_state:          0xff,
   page_size:            32*1024, /* programming page size in byte */
   sector_size:          1,       /* erase sector size in byte     */
@@ -48,7 +48,7 @@ static spi_memdrv_t spi_fram_fm25l256_ro_drv_t = {
   },
   { /* our private fields */
   baudrate:             2000000,
-  erase_before_program: FALSE,
+  erase_before_program: false,
   empty_state:          0xff,
   page_size:            32*1024, /* programming page size in byte */
   sector_size:          1,       /* erase sector size in byte     */
diff --git a/c/src/libchip/i2c/spi-memdrv.h b/c/src/libchip/i2c/spi-memdrv.h
index fb95b3dd4f..aa6027c73b 100644
--- a/c/src/libchip/i2c/spi-memdrv.h
+++ b/c/src/libchip/i2c/spi-memdrv.h
@@ -68,7 +68,7 @@ rtems_status_code spi_memdrv_read
 
   typedef struct {
     uint32_t baudrate;           /* tfr rate, bits per second     */
-    boolean  erase_before_program;
+    bool     erase_before_program;
     uint32_t empty_state;        /* value of erased cells         */
     uint32_t page_size;          /* programming page size in byte */
     uint32_t sector_size;        /* erase sector size in byte     */
diff --git a/c/src/libchip/ide/ata.c b/c/src/libchip/ide/ata.c
index 47272b2f7c..db9125c397 100644
--- a/c/src/libchip/ide/ata.c
+++ b/c/src/libchip/ide/ata.c
@@ -105,7 +105,7 @@ typedef rtems_mode preemption_key;
     } while (0)
 #endif
 #else /* !SAFE */
-typedef boolean preemption_key;
+typedef bool preemption_key;
 
 #define PREEMPTION_KEY(key) preemption_key key
 
@@ -145,7 +145,7 @@ static ata_ide_dev_t ata_devs[2 * IDE_CTRL_MAX_MINOR_NUMBER];
 static int ata_devs_number;
 
 /* Flag meaning that ATA driver has already been initialized */
-static rtems_boolean ata_initialized = FALSE;
+static bool ata_initialized = false;
 
 
 /* task and queue used for asynchronous I/O operations */
@@ -525,7 +525,7 @@ ata_process_request(rtems_device_minor_number ctrl_minor)
         }
         else
         {
-            if (IDE_Controller_Table[ctrl_minor].int_driven == 0)
+            if (IDE_Controller_Table[ctrl_minor].int_driven == false)
             {
                 ide_controller_read_register(
                     ctrl_minor,
@@ -540,7 +540,7 @@ ata_process_request(rtems_device_minor_number ctrl_minor)
         }
     }
 
-    if (IDE_Controller_Table[ctrl_minor].int_driven == 0)
+    if (IDE_Controller_Table[ctrl_minor].int_driven == false)
     {
         do {
             ide_controller_read_register(ctrl_minor, IDE_REGISTER_STATUS,
@@ -801,7 +801,7 @@ ata_pio_in_protocol(rtems_device_minor_number ctrl_minor, ata_req_t *areq)
     {
         ata_request_done(areq, ctrl_minor, RTEMS_SUCCESSFUL, RTEMS_SUCCESSFUL);
     }
-    else if (IDE_Controller_Table[ctrl_minor].int_driven == 0)
+    else if (IDE_Controller_Table[ctrl_minor].int_driven == false)
     {
         do {
            ide_controller_read_register(ctrl_minor, IDE_REGISTER_STATUS, &val);
@@ -851,7 +851,7 @@ ata_pio_out_protocol(rtems_device_minor_number ctrl_minor, ata_req_t *areq)
                                         areq->breq->bufs, &areq->cbuf,
                                         &areq->pos);
         areq->cnt -= min_val;
-        if (IDE_Controller_Table[ctrl_minor].int_driven == 0)
+        if (IDE_Controller_Table[ctrl_minor].int_driven == false)
         {
             do {
                 ide_controller_read_register(ctrl_minor, IDE_REGISTER_STATUS,
@@ -1209,7 +1209,7 @@ rtems_ata_initialize(rtems_device_major_number major,
     {
         rtems_chain_initialize_empty(&ata_ide_ctrls[ctrl_minor].reqs);
 
-        if (IDE_Controller_Table[ctrl_minor].int_driven == TRUE)
+        if (IDE_Controller_Table[ctrl_minor].int_driven == true)
         {
             int_st = malloc(sizeof(ata_int_st_t));
             if (int_st == NULL)
@@ -1319,33 +1319,33 @@ rtems_ata_initialize(rtems_device_major_number major,
         /* disassemble returned diagnostic codes */
         if (breq.req.error == ATA_DEV0_PASSED_DEV1_PASSED_OR_NOT_PRSNT)
         {
-            ATA_DEV_INFO(ctrl_minor, 0).present = 1;
-            ATA_DEV_INFO(ctrl_minor,1).present = 1;
+            ATA_DEV_INFO(ctrl_minor, 0).present = true;
+            ATA_DEV_INFO(ctrl_minor,1).present = true;
         }
         else if (breq.req.error == ATA_DEV0_PASSED_DEV1_FAILED)
         {
-            ATA_DEV_INFO(ctrl_minor,0).present = 1;
-            ATA_DEV_INFO(ctrl_minor,1).present = 0;
+            ATA_DEV_INFO(ctrl_minor,0).present = true;
+            ATA_DEV_INFO(ctrl_minor,1).present = false;
         }
         else if (breq.req.error < ATA_DEV1_PASSED_DEV0_FAILED)
         {
-            ATA_DEV_INFO(ctrl_minor,0).present = 0;
-            ATA_DEV_INFO(ctrl_minor,1).present = 1;
+            ATA_DEV_INFO(ctrl_minor,0).present = false;
+            ATA_DEV_INFO(ctrl_minor,1).present = true;
         }
         else
         {
-            ATA_DEV_INFO(ctrl_minor, 0).present = 0;
-            ATA_DEV_INFO(ctrl_minor, 1).present = 0;
+            ATA_DEV_INFO(ctrl_minor, 0).present = false;
+            ATA_DEV_INFO(ctrl_minor, 1).present = false;
         }
 
         /* refine the returned codes */
-        if (ATA_DEV_INFO(ctrl_minor, 1).present != 0)
+        if (ATA_DEV_INFO(ctrl_minor, 1).present != false)
         {
             ide_controller_read_register(ctrl_minor, IDE_REGISTER_ERROR, &ec);
             if (ec & ATA_DEV1_PASSED_DEV0_FAILED)
-                ATA_DEV_INFO(ctrl_minor, 1).present = 1;
+                ATA_DEV_INFO(ctrl_minor, 1).present = true;
             else
-                ATA_DEV_INFO(ctrl_minor, 1).present = 0;
+                ATA_DEV_INFO(ctrl_minor, 1).present = false;
         }
 
         /* for each found ATA device obtain it configuration */
@@ -1457,7 +1457,7 @@ rtems_ata_initialize(rtems_device_major_number major,
             }
             ata_devs_number++;
         }
-        if (IDE_Controller_Table[ctrl_minor].int_driven == TRUE)
+        if (IDE_Controller_Table[ctrl_minor].int_driven == true)
         {
             ide_controller_write_register(ctrl_minor,
                                           IDE_REGISTER_DEVICE_CONTROL_OFFSET,
@@ -1466,7 +1466,7 @@ rtems_ata_initialize(rtems_device_major_number major,
     }
 
     free(buffer);
-    ata_initialized = TRUE;
+    ata_initialized = true;
     return RTEMS_SUCCESSFUL;
 }
 
diff --git a/c/src/libchip/ide/ata_internal.h b/c/src/libchip/ide/ata_internal.h
index 0c24a96bbf..5c36ceecca 100644
--- a/c/src/libchip/ide/ata_internal.h
+++ b/c/src/libchip/ide/ata_internal.h
@@ -298,7 +298,7 @@ typedef struct ata_dev_s {
  * structures is indexed by controller minor number
  */
 typedef struct ata_ide_ctrl_s {
-    rtems_boolean present;   /* controller state */
+    bool          present;   /* controller state */
     ata_dev_t     device[2]; /* ata diveces description */
     rtems_chain_control reqs; /* requests chain */
 } ata_ide_ctrl_t;
diff --git a/c/src/libchip/ide/ide_ctrl_cfg.h b/c/src/libchip/ide/ide_ctrl_cfg.h
index 14279a9704..13c9f31afa 100644
--- a/c/src/libchip/ide/ide_ctrl_cfg.h
+++ b/c/src/libchip/ide/ide_ctrl_cfg.h
@@ -16,12 +16,12 @@
 #ifndef __IDE_CTRL_CFG_H__
 #define __IDE_CTRL_CFG_H__
 
+#include <rtems/blkdev.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <rtems/blkdev.h>
-
 /*
  * Avaible drivers for IDE controllers
  */
@@ -57,7 +57,7 @@ typedef enum {
  * is contInit.
  */
 typedef struct ide_ctrl_fns_s {
-    boolean           (*ctrl_probe)(int minor); /* probe routine */
+    bool              (*ctrl_probe)(int minor); /* probe routine */
     void              (*ctrl_initialize)(int minor);
     int               (*ctrl_control)(int minor, uint32_t   command,
                                       void *arg);
@@ -92,12 +92,12 @@ typedef struct ide_controller_bsp_table_s {
     char                *name;  /* device name */
     ide_ctrl_devs_t      type;  /* chip type */
     ide_ctrl_fns_t      *fns;   /* pointer to the set of driver routines */
-    boolean              (*probe)(int minor); /* general probe routine */
+    bool                 (*probe)(int minor); /* general probe routine */
     uint8_t              status; /* initialized/non initialized. Should be set
                                   * to zero by static initialization
                                   */
     uint32_t             port1; /* port number for the port of the device */
-    rtems_boolean        int_driven; /* interrupt/poll driven */
+    bool                 int_driven; /* interrupt/poll driven */
     rtems_vector_number  int_vec; /* the interrupt vector of the device */
     void                *params;  /* contains either device specific data or a
                                    * pointer to s device specific information
diff --git a/c/src/libchip/network/if_fxp.c b/c/src/libchip/network/if_fxp.c
index 3a2188843d..61dc691fdc 100644
--- a/c/src/libchip/network/if_fxp.c
+++ b/c/src/libchip/network/if_fxp.c
@@ -125,7 +125,7 @@ if (DEBUG_OUT >= (LVL)) {                                    \
 
 #define NFXPDRIVER 1
 static struct fxp_softc fxp_softc[NFXPDRIVER];
-static int fxp_is_verbose = TRUE;
+static bool fxp_is_verbose = true;
 /*
  * NOTE!  On the Alpha, we have an alignment constraint.  The
  * card DMAs the packet immediately following the RFA.  However,
@@ -561,14 +561,14 @@ rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
 	pcib_conf_read16(sc->pci_signature, PCI_COMMAND,&val16);
 	DBGLVL_PRINTK(4,"fxp_attach: PCI_COMMAND_read  = 0x%x\n",val16);
 	if((val16 & PCI_COMMAND_IO) != 0) {
-	  sc->pci_regs_are_io = TRUE;
+	  sc->pci_regs_are_io = true;
 	  pcib_conf_read32(sc->pci_signature,
 			   PCI_BASE_ADDRESS_1,
 			   &val32);
 	  sc->pci_regs_base = val32 & PCI_BASE_ADDRESS_IO_MASK;
 	}
 	else {
-	  sc->pci_regs_are_io = FALSE;
+	  sc->pci_regs_are_io = false;
 	  pcib_conf_read32(sc->pci_signature,
 			   PCI_BASE_ADDRESS_0,
 			   &val32);
diff --git a/c/src/libchip/network/if_fxpvar.h b/c/src/libchip/network/if_fxpvar.h
index 1c61dda945..85844773e1 100644
--- a/c/src/libchip/network/if_fxpvar.h
+++ b/c/src/libchip/network/if_fxpvar.h
@@ -105,7 +105,7 @@ struct fxp_softc {
 	bus_space_handle_t sc_sh;	/* bus space handle */
 #else
         int pci_signature;              /* RTEMS i386 PCI signature */
-        boolean pci_regs_are_io;        /* RTEMS dev regs are I/O mapped */
+        bool pci_regs_are_io;           /* RTEMS dev regs are I/O mapped */
         u_int32_t pci_regs_base;        /* RTEMS i386 register base */
         rtems_id daemonTid;             /* Task ID of deamon        */
         rtems_irq_connect_data	irqInfo;
diff --git a/c/src/libchip/rtc/ds1375-rtc.h b/c/src/libchip/rtc/ds1375-rtc.h
index 8741fe33d0..98d44b4916 100644
--- a/c/src/libchip/rtc/ds1375-rtc.h
+++ b/c/src/libchip/rtc/ds1375-rtc.h
@@ -60,7 +60,7 @@ extern "C" {
 
 extern rtc_fns rtc_ds1375_fns;
 
-boolean
+bool
 rtc_ds1375_device_probe( int minor );
 
 uint32_t
diff --git a/c/src/libchip/rtc/ds1375.c b/c/src/libchip/rtc/ds1375.c
index 25d0f93b46..53378579cd 100644
--- a/c/src/libchip/rtc/ds1375.c
+++ b/c/src/libchip/rtc/ds1375.c
@@ -412,29 +412,29 @@ uint8_t v = value;
 
 }
 
-boolean
+bool
 rtc_ds1375_device_probe( int minor )
 {
 int fd;
 
 	if ( ( fd = getfd( minor ) ) < 0 ) {
 		STDIOSAFE( "ds1375_probe (open): %s\n", strerror( errno ) );
-		return FALSE;
+		return false;
 	}
 
 	/* Try to set file pointer */
 	if ( 0 != wr_bytes( fd, DS1375_SEC_REG, 0, 0 ) ) {
 		STDIOSAFE( "ds1375_probe (wr_bytes): %s\n", strerror( errno ) );
 		close( fd );
-		return FALSE;
+		return false;
 	}
 
 	if ( close( fd ) ) {
 		STDIOSAFE( "ds1375_probe (close): %s\n", strerror( errno ) );
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 rtc_fns rtc_ds1375_fns = {
diff --git a/c/src/libchip/rtc/mc146818a.c b/c/src/libchip/rtc/mc146818a.c
index 8eb6a00f3b..19f726b644 100644
--- a/c/src/libchip/rtc/mc146818a.c
+++ b/c/src/libchip/rtc/mc146818a.c
@@ -32,7 +32,7 @@
 /*
  * See if chip is present
  */
-boolean mc146818a_probe(
+bool mc146818a_probe(
   int minor
 )
 {
@@ -47,8 +47,8 @@ boolean mc146818a_probe(
   getReg = RTC_Table[ minor ].getRegister;
   value = (*getReg)( mc146818a, MC146818A_STATUSD );
   if ((value == 0) || (value == 0xFF))
-    return FALSE;
-  return TRUE;
+    return false;
+  return true;
 }
 
 /*
diff --git a/c/src/libchip/rtc/mc146818a.h b/c/src/libchip/rtc/mc146818a.h
index df4a234b78..e631708e43 100644
--- a/c/src/libchip/rtc/mc146818a.h
+++ b/c/src/libchip/rtc/mc146818a.h
@@ -48,7 +48,7 @@
  *  Driver function table
  */
 extern rtc_fns mc146818a_fns;
-boolean mc146818a_probe(
+bool mc146818a_probe(
   int minor
 );
 
diff --git a/c/src/libchip/rtc/rtc.h b/c/src/libchip/rtc/rtc.h
index ff42cff5ee..f044721bec 100644
--- a/c/src/libchip/rtc/rtc.h
+++ b/c/src/libchip/rtc/rtc.h
@@ -63,7 +63,7 @@ typedef struct _rtc_tbl {
   char          *sDeviceName;
   rtc_devs       deviceType;
   rtc_fns       *pDeviceFns;
-  boolean      (*deviceProbe)(int minor);
+  bool           (*deviceProbe)(int minor);
   void          *pDeviceParams;
   uint32_t       ulCtrlPort1;
   uint32_t       ulDataPort;
@@ -75,7 +75,7 @@ extern rtc_tbl  RTC_Table[];
 extern size_t   RTC_Count;
 
 
-boolean rtc_probe( int minor );
+extern bool rtc_probe( int minor );
 
 #endif
 /* end of include file */
diff --git a/c/src/libchip/rtc/rtcprobe.c b/c/src/libchip/rtc/rtcprobe.c
index 682518200b..bb51fc15ef 100644
--- a/c/src/libchip/rtc/rtcprobe.c
+++ b/c/src/libchip/rtc/rtcprobe.c
@@ -15,9 +15,9 @@
 #include <libchip/rtc.h>
 
 
-boolean rtc_probe(
+bool rtc_probe(
   int minor
 )
 {
-  return TRUE;
+  return true;
 }
diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c
index 111e394c10..c471635096 100644
--- a/c/src/libchip/serial/mc68681.c
+++ b/c/src/libchip/serial/mc68681.c
@@ -39,7 +39,7 @@ console_fns mc68681_fns =
   mc68681_initialize_interrupts,  /* deviceInitialize */
   mc68681_write_polled,           /* deviceWritePolled */
   mc68681_set_attributes,         /* deviceSetAttributes */
-  TRUE                            /* deviceOutputUsesInterrupts */
+  true                            /* deviceOutputUsesInterrupts */
 };
 
 console_fns mc68681_fns_polled =
@@ -52,7 +52,7 @@ console_fns mc68681_fns_polled =
   mc68681_init,                        /* deviceInitialize */
   mc68681_write_polled,                /* deviceWritePolled */
   mc68681_set_attributes,              /* deviceSetAttributes */
-  FALSE,                               /* deviceOutputUsesInterrupts */
+  false,                               /* deviceOutputUsesInterrupts */
 };
 
 extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
@@ -652,7 +652,7 @@ MC68681_STATIC void mc68681_process(
   /*
    * Deal with any received characters
    */
-  while(TRUE) {
+  while(true) {
     ucLineStatus = (*getReg)(pMC68681_port, MC68681_STATUS);
     if(!(ucLineStatus & MC68681_RX_READY)) {
       break;
diff --git a/c/src/libchip/serial/mc68681_p.h b/c/src/libchip/serial/mc68681_p.h
index 2fe7789fae..88304a0133 100644
--- a/c/src/libchip/serial/mc68681_p.h
+++ b/c/src/libchip/serial/mc68681_p.h
@@ -251,7 +251,7 @@ typedef struct _mc68681_context
 /*
  * Driver functions
  */
-MC68681_STATIC boolean mc68681_probe(int minor);
+MC68681_STATIC bool mc68681_probe(int minor);
 
 MC68681_STATIC int mc68681_set_attributes(
   int minor,
diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c
index ed4876c697..32f7f5b467 100644
--- a/c/src/libchip/serial/ns16550.c
+++ b/c/src/libchip/serial/ns16550.c
@@ -53,7 +53,7 @@ console_fns ns16550_fns = {
   ns16550_initialize_interrupts,  /* deviceInitialize */
   ns16550_write_polled,           /* deviceWritePolled */
   ns16550_set_attributes,         /* deviceSetAttributes */
-  TRUE                            /* deviceOutputUsesInterrupts */
+  true                            /* deviceOutputUsesInterrupts */
 };
 
 console_fns ns16550_fns_polled = {
@@ -65,7 +65,7 @@ console_fns ns16550_fns_polled = {
   ns16550_init,                        /* deviceInitialize */
   ns16550_write_polled,                /* deviceWritePolled */
   ns16550_set_attributes,              /* deviceSetAttributes */
-  FALSE                                /* deviceOutputUsesInterrupts */
+  false                                /* deviceOutputUsesInterrupts */
 };
 
 #if defined(__PPC__)
@@ -460,7 +460,7 @@ NS16550_STATIC void ns16550_process(
     /*
      * Deal with any received characters
      */
-    while(TRUE) {
+    while(true) {
       ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
       if(~ucLineStatus & SP_LSR_RDY) {
         break;
@@ -477,7 +477,7 @@ NS16550_STATIC void ns16550_process(
      *  TX all the characters we can
      */
 
-    while(TRUE) {
+    while(true) {
         ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS);
         if(~ucLineStatus & SP_LSR_THOLD) {
           /*
diff --git a/c/src/libchip/serial/ns16550_p.h b/c/src/libchip/serial/ns16550_p.h
index 1034728709..6f4b9ed257 100644
--- a/c/src/libchip/serial/ns16550_p.h
+++ b/c/src/libchip/serial/ns16550_p.h
@@ -167,7 +167,7 @@ typedef struct _ns16550_context
  * Driver functions
  */
 
-NS16550_STATIC boolean ns16550_probe(int minor);
+NS16550_STATIC bool ns16550_probe(int minor);
 
 NS16550_STATIC void ns16550_init(int minor);
 
diff --git a/c/src/libchip/serial/serial.h b/c/src/libchip/serial/serial.h
index 7bbb5f9da8..089d583e3a 100644
--- a/c/src/libchip/serial/serial.h
+++ b/c/src/libchip/serial/serial.h
@@ -29,7 +29,7 @@ typedef uint8_t   (*getData_f)(uint32_t   port);
 typedef void      (*setData_f)(uint32_t   port, uint8_t   value);
 
 typedef struct _console_fns {
-  boolean (*deviceProbe)(int minor);
+  bool    (*deviceProbe)(int minor);
   int     (*deviceFirstOpen)(int major, int minor, void *arg);
   int     (*deviceLastClose)(int major, int minor, void *arg);
   int     (*deviceRead)(int minor);
@@ -37,7 +37,7 @@ typedef struct _console_fns {
   void    (*deviceInitialize)(int minor);
   void    (*deviceWritePolled)(int minor, char cChar);
   int     (*deviceSetAttributes)(int minor, const struct termios *t);
-  int       deviceOutputUsesInterrupts;
+  bool      deviceOutputUsesInterrupts;
 } console_fns;
 
 typedef struct _console_flow {
@@ -118,7 +118,7 @@ typedef struct _console_tbl {
   char          *sDeviceName;
   console_devs   deviceType;
   console_fns   *pDeviceFns;
-  boolean      (*deviceProbe)(int minor);
+  bool         (*deviceProbe)(int minor);
   console_flow  *pDeviceFlow;
   uint32_t       ulMargin;
   uint32_t       ulHysteresis;
@@ -136,7 +136,7 @@ typedef struct _console_tbl {
 
 typedef struct _console_data {
   void                   *termios_data;
-  volatile boolean        bActive;
+  volatile bool           bActive;
   /*
    * This field may be used for any purpose required by the driver
    */
diff --git a/c/src/libchip/serial/serprobe.c b/c/src/libchip/serial/serprobe.c
index 2018727d56..5ce4d7ca40 100644
--- a/c/src/libchip/serial/serprobe.c
+++ b/c/src/libchip/serial/serprobe.c
@@ -6,12 +6,12 @@
 #include <libchip/serial.h>
 #include <libchip/sersupp.h>
 
-boolean libchip_serial_default_probe(int minor)
+bool libchip_serial_default_probe(int minor)
 {
   /*
    * If the configuration dependent probe has located the device then
    * assume it is there
    */
 
-  return TRUE;
+  return true;
 }
diff --git a/c/src/libchip/serial/sersupp.h b/c/src/libchip/serial/sersupp.h
index a996d53c7c..29db6b298b 100644
--- a/c/src/libchip/serial/sersupp.h
+++ b/c/src/libchip/serial/sersupp.h
@@ -13,7 +13,7 @@ int termios_baud_to_number(
   int termios_baud
 );
 
-boolean libchip_serial_default_probe(
+bool libchip_serial_default_probe(
   int minor
 );
 
diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c
index 8472565fb0..d2b0c62bce 100644
--- a/c/src/libchip/serial/z85c30.c
+++ b/c/src/libchip/serial/z85c30.c
@@ -65,7 +65,7 @@ console_fns z85c30_fns = {
   z85c30_initialize_interrupts,  /* deviceInitialize */
   z85c30_write_polled,           /* deviceWritePolled */
   NULL,                          /* deviceSetAttributes */
-  TRUE                           /* deviceOutputUsesInterrupts */
+  true                           /* deviceOutputUsesInterrupts */
 };
 
 console_fns z85c30_fns_polled = {
@@ -77,7 +77,7 @@ console_fns z85c30_fns_polled = {
   z85c30_init,                       /* deviceInitialize */
   z85c30_write_polled,               /* deviceWritePolled */
   NULL,                              /* deviceSetAttributes */
-  FALSE                              /* deviceOutputUsesInterrupts */
+  false                              /* deviceOutputUsesInterrupts */
 };
 
 extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
@@ -578,7 +578,7 @@ Z85C30_STATIC void z85c30_process(
    *  in RR3.
    */
 
-  while (TRUE) {
+  while (true) {
     z85c30_status = (*getReg)(ulCtrlPort, SCC_WR0_SEL_RD0);
     if (!Z85C30_Status_Is_TX_buffer_empty(z85c30_status)) {
       /*