From 9a73f42181a3726e9b9387823660a6c8314efcbc Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 2 Sep 2008 12:55:44 +0000 Subject: Eliminate rtems_boolean. --- c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c | 6 +++--- c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h | 4 ++-- c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c | 4 ++-- c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c | 4 ++-- c/src/lib/libcpu/powerpc/ppc403/clock/clock.c | 10 +++++----- c/src/lib/libcpu/powerpc/ppc403/console/console.c.polled | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c b/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c index 520a1a6bc5..810476e132 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c +++ b/c/src/lib/libcpu/m68k/mcf5206/console/mcfuart.c @@ -351,9 +351,9 @@ mcfuart_poll_read(mcfuart *uart) { uint8_t usr; int ch; - if (uart->parerr_mark_flag == 1) + if (uart->parerr_mark_flag == true) { - uart->parerr_mark_flag = 0; + uart->parerr_mark_flag = false; return 0; } usr = *MCF5206E_USR(MBAR,uart->chn); @@ -365,7 +365,7 @@ mcfuart_poll_read(mcfuart *uart) ch = *MCF5206E_URB(MBAR,uart->chn); /* Clear error bits */ if (uart->c_iflag & PARMRK) { - uart->parerr_mark_flag = 1; + uart->parerr_mark_flag = true; ch = 0xff; } else diff --git a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h b/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h index 0694e6c521..d7ef61289d 100644 --- a/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h +++ b/c/src/lib/libcpu/m68k/mcf5206/include/mcfuart.h @@ -43,8 +43,8 @@ typedef struct mcfuart { volatile uint32_t tx_ptr; /* Index of next char to transmit*/ rtems_isr_entry old_handler; /* Saved interrupt handler */ - tcflag_t c_iflag; /* termios input mode flags */ - rtems_boolean parerr_mark_flag; /* Parity error processing + tcflag_t c_iflag; /* termios input mode flags */ + bool parerr_mark_flag; /* Parity error processing state */ } mcfuart; diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c index d667584c3f..1fcabb5a2b 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c +++ b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c @@ -452,7 +452,7 @@ static rtems_status_code mpc83xx_i2c_send_addr \*=========================================================================*/ { mpc83xx_i2c_softc_t *softc_ptr = &(((mpc83xx_i2c_desc_t *)(bh))->softc); - rtems_boolean long_addr = FALSE; + bool long_addr = false; uint8_t addr_byte; rtems_status_code rc; @@ -464,7 +464,7 @@ static rtems_status_code mpc83xx_i2c_send_addr * determine, whether short or long address is needed, determine rd/wr */ if (addr > 0x7f) { - long_addr = TRUE; + long_addr = true; addr_byte = (0xf0 | ((addr >> 7) & 0x06) | ((rw) ? 1 : 0)); diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c b/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c index 166125829a..dcae520175 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c @@ -73,7 +73,7 @@ void clockOn(void* unused) unsigned desiredLevel; uint32_t pit_value; uint32_t mf_value; - rtems_boolean force_prescaler = FALSE; + bool force_prescaler = false; extern uint32_t bsp_clicks_per_usec; extern uint32_t bsp_clock_speed; @@ -89,7 +89,7 @@ void clockOn(void* unused) * rtems_configuration_get_microseconds_per_tick() / 1000); m8xx.sccr |= (1<<23); - force_prescaler = TRUE; + force_prescaler = true; } else { pit_value = (rtems_configuration_get_microseconds_per_tick() * diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c index 945ffddccb..7c30022fab 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c +++ b/c/src/lib/libcpu/powerpc/ppc403/clock/clock.c @@ -66,7 +66,7 @@ volatile uint32_t Clock_driver_ticks; static uint32_t pit_value, tick_time; -static rtems_boolean auto_restart; +static bool auto_restart; void Clock_exit( void ); @@ -243,13 +243,13 @@ void ClockOn( if ((pvr & 0xff00) == 0x0000) /* 403GA */ #if 0 /* FIXME: in which processor versions will "autoload" work properly? */ - auto_restart = (pvr & 0x00f0) > 0x0000 ? 1 : 0; + auto_restart = (pvr & 0x00f0) > 0x0000 ? true : false; #else /* no known chip version supports auto restart of timer... */ - auto_restart = 0; + auto_restart = false; #endif else if ((pvr & 0xff00) == 0x0100) /* 403GB */ - auto_restart = 1; + auto_restart = true; #else /* ppc405 */ asm volatile ("mfdcr %0, 0x0b2" : "=r" (iocr)); /*405GP CPC0_CR1 */ @@ -265,7 +265,7 @@ void ClockOn( * Enable auto restart */ - auto_restart=1; + auto_restart=true; #endif /* ppc405 */ pit_value = rtems_configuration_get_microseconds_per_tick() * diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/console.c.polled b/c/src/lib/libcpu/powerpc/ppc403/console/console.c.polled index a90da86432..8b0c421f96 100644 --- a/c/src/lib/libcpu/powerpc/ppc403/console/console.c.polled +++ b/c/src/lib/libcpu/powerpc/ppc403/console/console.c.polled @@ -193,7 +193,7 @@ rtems_device_driver console_initialize( * Return values: */ -rtems_boolean is_character_ready( +bool is_character_ready( char *ch ) { @@ -202,7 +202,7 @@ rtems_boolean is_character_ready( if ((status = port->SPLS) & LSRDataReady) { *ch = port->SPRB; - return(TRUE); + return true; } /* Clean any dodgy status */ @@ -213,7 +213,7 @@ rtems_boolean is_character_ready( LSRBreakInterrupt); } - return FALSE; + return false; } /* inbyte -- cgit v1.2.3