diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-02 13:49:37 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-02 13:49:37 +0000 |
commit | 78b05d33eafb430c6c814ee25cd384cc103bef79 (patch) | |
tree | 10e0208c3a7d2e87d0b010270b9972be9e27976a | |
parent | 2008-09-02 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-78b05d33eafb430c6c814ee25cd384cc103bef79.tar.bz2 |
Eliminate rtems_boolean.
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/clock/rtc.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/console/inch.c | 38 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/timer/timer.c | 8 |
4 files changed, 27 insertions, 27 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/clock/rtc.c b/c/src/lib/libbsp/i386/pc386/clock/rtc.c index a6330fa929..2845985ebc 100644 --- a/c/src/lib/libbsp/i386/pc386/clock/rtc.c +++ b/c/src/lib/libbsp/i386/pc386/clock/rtc.c @@ -113,7 +113,7 @@ ytos(uint16_t y) | Returns: number of seconds since January. +--------------------------------------------------------------------------*/ static inline uint32_t -mtos(uint8_t m, rtems_boolean leap) +mtos(uint8_t m, bool leap) { static uint16_t daysMonth[] = { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }; diff --git a/c/src/lib/libbsp/i386/pc386/console/inch.c b/c/src/lib/libbsp/i386/pc386/console/inch.c index 90bacbe4fa..77d12d00fb 100644 --- a/c/src/lib/libbsp/i386/pc386/console/inch.c +++ b/c/src/lib/libbsp/i386/pc386/console/inch.c @@ -94,7 +94,7 @@ void rtemsReboot(void) | Returns: TRUE in case a valid character has been read, | FALSE otherwise. +--------------------------------------------------------------------------*/ -static rtems_boolean +static bool _IBMPC_scankey(char *outChar) { unsigned char inChar; @@ -104,7 +104,7 @@ _IBMPC_scankey(char *outChar) static int caps_pressed = 0; static int extended = 0; - *outChar = '\0'; /* default value if we return FALSE */ + *outChar = '\0'; /* default value if we return false */ /* Read keyboard controller, toggle enable */ inport_byte(KBD_CTL, inChar); @@ -115,7 +115,7 @@ _IBMPC_scankey(char *outChar) /* See if it has data */ inport_byte(KBD_STATUS, inChar); if ((inChar & 0x01) == 0) - return FALSE; + return false; /* Read the data. Handle nonsense with shift, control, etc. */ inport_byte(KBD_DATA, inChar); @@ -127,49 +127,49 @@ _IBMPC_scankey(char *outChar) { case 0xe0: extended = 2; - return FALSE; + return false; break; case 0x38: alt_pressed = 1; - return FALSE; + return false; break; case 0xb8: alt_pressed = 0; - return FALSE; + return false; break; case 0x1d: ctrl_pressed = 1; - return FALSE; + return false; break; case 0x9d: ctrl_pressed = 0; - return FALSE; + return false; break; case 0x2a: if (extended) - return FALSE; + return false; case 0x36: shift_pressed = 1; - return FALSE; + return false; break; case 0xaa: if (extended) - return FALSE; + return false; case 0xb6: shift_pressed = 0; - return FALSE; + return false; break; case 0x3a: caps_pressed = 1; - return FALSE; + return false; break; case 0xba: caps_pressed = 0; - return FALSE; + return false; break; case 0x53: @@ -183,7 +183,7 @@ _IBMPC_scankey(char *outChar) default: if ((inChar & 0x80) || (inChar > 0x39)) /* High-bit on means key is being released, not pressed */ - return FALSE; + return false; break; } /* switch */ @@ -206,7 +206,7 @@ _IBMPC_scankey(char *outChar) } } - return TRUE; + return true; } /* _IBMPC_scankey */ /*-------------------------------------------------------------------------+ @@ -217,7 +217,7 @@ _IBMPC_scankey(char *outChar) | unchanged. | Returns: TRUE if keyboard buffer not empty, FALSE otherwise. +--------------------------------------------------------------------------*/ -static rtems_boolean +static bool _IBMPC_chrdy(char *c) { /* FIX ME!!! It doesn't work without something like the following line. @@ -230,10 +230,10 @@ _IBMPC_chrdy(char *c) *c = kbd_buffer[kbd_first]; kbd_first = (kbd_first + 1) % KBD_BUF_SIZE; - return TRUE; + return true; } else - return FALSE; + return false; } /* _IBMPC_chrdy */ /*-------------------------------------------------------------------------+ diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c index bf6ca8469f..2c5484cd01 100644 --- a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c +++ b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c @@ -141,7 +141,7 @@ struct ne_softc { rtems_id rx_daemon_tid; /* Whether we use byte-transfers with the device. */ - rtems_boolean byte_transfers; + bool byte_transfers; /* The number of memory buffers which the transmit daemon has loaded with data to be sent, but which have not yet been completely @@ -1174,9 +1174,9 @@ rtems_ne_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) /* Check whether we do byte-wide or word-wide transfers. */ #ifdef NE2000_BYTE_TRANSFERS - sc->byte_transfers = TRUE; + sc->byte_transfers = true; #else - sc->byte_transfers = FALSE; + sc->byte_transfers = false; #endif /* Handle the options passed in by the caller. */ diff --git a/c/src/lib/libbsp/i386/pc386/timer/timer.c b/c/src/lib/libbsp/i386/pc386/timer/timer.c index 52903e934d..13940b0583 100644 --- a/c/src/lib/libbsp/i386/pc386/timer/timer.c +++ b/c/src/lib/libbsp/i386/pc386/timer/timer.c @@ -121,11 +121,11 @@ tsc_timer_exit(void) void tsc_timer_initialize(void) { - static rtems_boolean First = TRUE; + static bool First = true; if (First) { - First = FALSE; + First = false; atexit(Timer_exit); /* Try not to hose the system at exit. */ } @@ -285,7 +285,7 @@ i386_read_timer(void) void benchmark_timer_initialize(void) { - static rtems_boolean First = TRUE; + static bool First = true; if (First) { if (x86_capability & (1 << 4) ) { @@ -304,7 +304,7 @@ benchmark_timer_initialize(void) benchmark_timer_read_function = &i386_read_timer; Timer_exit_function = &i386_timer_exit; } - First = FALSE; + First = false; } (*benchmark_timer_initialize_function)(); } |