diff options
27 files changed, 66 insertions, 65 deletions
diff --git a/c/src/lib/libbsp/m68k/av5282/timer/timer.c b/c/src/lib/libbsp/m68k/av5282/timer/timer.c index 2caf75b66d..ba638cd17a 100644 --- a/c/src/lib/libbsp/m68k/av5282/timer/timer.c +++ b/c/src/lib/libbsp/m68k/av5282/timer/timer.c @@ -28,6 +28,6 @@ benchmark_timer_read(void) } void -benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) +benchmark_timer_disable_subtracting_average_overhead(bool find_flag) { } diff --git a/c/src/lib/libbsp/m68k/gen68302/console/console.c b/c/src/lib/libbsp/m68k/gen68302/console/console.c index 8e98d42ec2..3d4ac030f5 100644 --- a/c/src/lib/libbsp/m68k/gen68302/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68302/console/console.c @@ -104,7 +104,7 @@ rtems_device_driver console_initialize( * FALSE - no character available */ -rtems_boolean is_character_ready( +bool is_character_ready( char *ch /* -> character */ ) { @@ -113,12 +113,12 @@ rtems_boolean is_character_ready( for (;;) { if (RXS & RBIT_HDLC_EMPTY_BIT) - return FALSE; + return false; *ch = RXD; RXS = RBIT_HDLC_EMPTY_BIT | RBIT_HDLC_WRAP_BIT; if ( *ch >= ' ' && *ch <= '~' ) - return TRUE; + return true; } } diff --git a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c index eaa64e54a5..02c58a2a17 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68302/timer/timer.c @@ -40,7 +40,7 @@ uint32_t Timer_interrupts; -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; rtems_isr timerisr(void); @@ -95,7 +95,7 @@ int benchmark_timer_read( void ) total = (Timer_interrupts * TRR2_VAL) + clicks; - if ( benchmark_timer_find_average_overhead == 1 ) + if ( benchmark_timer_find_average_overhead == true ) return total; /* in XXX microsecond units */ if ( total < LEAST_VALID ) @@ -109,7 +109,7 @@ int benchmark_timer_read( void ) } void benchmark_timer_disable_subtracting_average_overhead( - rtems_boolean find_flag + bool find_flag ) { benchmark_timer_find_average_overhead = find_flag; diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c index f2511dd6a4..64038ee4d2 100644 --- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c @@ -269,6 +269,6 @@ benchmark_timer_read (void) Description: - *****************************************************/ void -benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) +benchmark_timer_disable_subtracting_average_overhead(bool find_flag) { } diff --git a/c/src/lib/libbsp/m68k/gen68360/spi/m360_spi.c b/c/src/lib/libbsp/m68k/gen68360/spi/m360_spi.c index 38f80a5789..182fffc2ed 100644 --- a/c/src/lib/libbsp/m68k/gen68360/spi/m360_spi.c +++ b/c/src/lib/libbsp/m68k/gen68360/spi/m360_spi.c @@ -85,7 +85,7 @@ static rtems_status_code m360_spi_char_mode \*-------------------------------------------------------------------------*/ m360_spi_softc_t *softc_ptr, /* handle */ uint32_t bits_per_char, /* bits per character */ - boolean lsb_first, /* TRUE: send LSB first */ + bool lsb_first, /* TRUE: send LSB first */ uint16_t *spimode /* result value */ ) /*-------------------------------------------------------------------------*\ diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c index 3370b1c379..430ed28cec 100644 --- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c @@ -79,6 +79,6 @@ benchmark_timer_read (void) } void -benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) +benchmark_timer_disable_subtracting_average_overhead(bool find_flag) { } diff --git a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c b/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c index 2fa25576eb..4fae6d18ec 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c +++ b/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c @@ -54,13 +54,13 @@ #include <bsp.h> #include <mcf548x/mcf548x.h> -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; static uint32_t microsecond_timer_value = 0; void benchmark_timer_initialize(void) { -MCF548X_SLT_SLTCNT1 = 0xFFFFFFFF; -MCF548X_SLT_SCR1 |= (MCF548X_SLT_SCR_TEN | MCF548X_SLT_SCR_RUN); + MCF548X_SLT_SLTCNT1 = 0xFFFFFFFF; + MCF548X_SLT_SCR1 |= (MCF548X_SLT_SCR_TEN | MCF548X_SLT_SCR_RUN); } /* @@ -70,12 +70,13 @@ MCF548X_SLT_SCR1 |= (MCF548X_SLT_SCR_TEN | MCF548X_SLT_SCR_RUN); int benchmark_timer_read(void) { - microsecond_timer_value = (0xFFFFFFFF - MCF548X_SLT_SCNT1)/100; + microsecond_timer_value = (0xFFFFFFFF - MCF548X_SLT_SCNT1)/100; + return microsecond_timer_value; } void -benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) +benchmark_timer_disable_subtracting_average_overhead(bool find_flag) { -benchmark_timer_find_average_overhead = find_flag; + benchmark_timer_find_average_overhead = find_flag; } diff --git a/c/src/lib/libbsp/m68k/idp/console/console.c b/c/src/lib/libbsp/m68k/idp/console/console.c index 5319aca174..264ec4a36a 100644 --- a/c/src/lib/libbsp/m68k/idp/console/console.c +++ b/c/src/lib/libbsp/m68k/idp/console/console.c @@ -85,16 +85,16 @@ rtems_device_driver console_initialize( * Return values: */ -rtems_boolean is_character_ready( +bool is_character_ready( char *ch, int port ) { if ( Ring_buffer_Is_empty( &Console_Buffer[ port ] ) ) - return FALSE; + return false; Ring_buffer_Remove_character( &Console_Buffer[ port ], *ch ); - return TRUE; + return true; } /* quick_char_check @@ -109,14 +109,14 @@ rtems_boolean is_character_ready( * Return values: */ -rtems_boolean quick_char_check( +bool quick_char_check( int port ) { if ( Ring_buffer_Is_empty( &Console_Buffer[ port ] ) ) - return FALSE; + return false; - return TRUE; + return true; } /* inbyte diff --git a/c/src/lib/libbsp/m68k/idp/timer/timer.c b/c/src/lib/libbsp/m68k/idp/timer/timer.c index 61d17f2686..a9aaa7f9df 100644 --- a/c/src/lib/libbsp/m68k/idp/timer/timer.c +++ b/c/src/lib/libbsp/m68k/idp/timer/timer.c @@ -32,7 +32,7 @@ #define TIMER_VECTOR 0x4D int Ttimer_val; -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; rtems_isr timerisr(void); @@ -93,7 +93,7 @@ int benchmark_timer_read(void) MC68230_WRITE (MC68230_TCR, 0xA1); /* do not restore old vector */ - if ( benchmark_timer_find_average_overhead == 1 ) + if ( benchmark_timer_find_average_overhead == true ) return total; /* in countdown units */ if ( total < LEAST_VALID ) @@ -106,7 +106,7 @@ int benchmark_timer_read(void) } void benchmark_timer_disable_subtracting_average_overhead( - rtems_boolean find_flag + bool find_flag ) { benchmark_timer_find_average_overhead = find_flag; diff --git a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c index 12a325bd8b..1a83c166b3 100644 --- a/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf52235/timer/timer.c @@ -33,6 +33,6 @@ int benchmark_timer_read(void) return MCF_DTIM3_DTCN; } -void benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) +void benchmark_timer_disable_subtracting_average_overhead(bool find_flag) { } diff --git a/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c index b209d06147..e2479c4c0f 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf5235/timer/timer.c @@ -28,6 +28,6 @@ benchmark_timer_read(void) } void -benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) +benchmark_timer_disable_subtracting_average_overhead(bool find_flag) { } diff --git a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c index 801bcf2f6f..ff18079b3a 100644 --- a/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mcf5329/timer/timer.c @@ -34,6 +34,6 @@ int benchmark_timer_read(void) return MCF_DTIM3_DTCN; } -void benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) +void benchmark_timer_disable_subtracting_average_overhead(bool find_flag) { } diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c index 5dac6004ba..e0b8a29eeb 100644 --- a/c/src/lib/libbsp/m68k/mrm332/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mrm332/timer/timer.c @@ -21,7 +21,7 @@ #include <bsp.h> -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; extern rtems_isr Clock_isr(void); @@ -54,7 +54,7 @@ int benchmark_timer_read( void ) uint32_t total; total = 0; - if ( benchmark_timer_find_average_overhead == 1 ) + if ( benchmark_timer_find_average_overhead == true ) return total; /* in XXX microsecond units */ if ( total < LEAST_VALID ) @@ -64,7 +64,7 @@ int benchmark_timer_read( void ) } void benchmark_timer_disable_subtracting_average_overhead( - rtems_boolean find_flag + bool find_flag ) { benchmark_timer_find_average_overhead = find_flag; diff --git a/c/src/lib/libbsp/m68k/mvme136/console/console.c b/c/src/lib/libbsp/m68k/mvme136/console/console.c index 7045eeb054..40886f5d26 100644 --- a/c/src/lib/libbsp/m68k/mvme136/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme136/console/console.c @@ -61,15 +61,15 @@ rtems_device_driver console_initialize( * Return values: */ -rtems_boolean is_character_ready( +bool is_character_ready( char *ch ) { if ( !(_Read_m681->srb & RXRDYB) ) - return(FALSE); + return false; *ch = _Read_m681->rbb; - return(TRUE); + return true; } /* inbyte diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c index 1bd6c869ce..45471891f1 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c @@ -29,7 +29,7 @@ #define TIMER 0xfffb0000 /* address of Z8036 on MVME136 */ int Ttimer_val; -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; rtems_isr timerisr(void); @@ -82,7 +82,7 @@ remaining = 0xffff - *((uint16_t*) 0xfffb0010); */ total = (Ttimer_val * 0x10000) + remaining; - if ( benchmark_timer_find_average_overhead == 1 ) + if ( benchmark_timer_find_average_overhead == true ) return total; /* in one-half microsecond units */ else { @@ -93,7 +93,7 @@ remaining = 0xffff - *((uint16_t*) 0xfffb0010); } void benchmark_timer_disable_subtracting_average_overhead( - rtems_boolean find_flag + bool find_flag ) { benchmark_timer_find_average_overhead = find_flag; diff --git a/c/src/lib/libbsp/m68k/mvme147/console/console.c b/c/src/lib/libbsp/m68k/mvme147/console/console.c index 4ac4bd55d4..8b3b16f1b1 100644 --- a/c/src/lib/libbsp/m68k/mvme147/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme147/console/console.c @@ -65,7 +65,7 @@ rtems_device_driver console_initialize( * Return values: */ -rtems_boolean is_character_ready( +bool is_character_ready( char *ch ) { @@ -74,10 +74,10 @@ rtems_boolean is_character_ready( for ( ; ; ) { Z8x30_READ_CONTROL( CONSOLE_CONTROL, RR_0, rr_0 ); if ( !(rr_0 & RR_0_RX_DATA_AVAILABLE) ) - return( FALSE ); + return false; Z8x30_READ_DATA( CONSOLE_DATA, *ch ); - return( TRUE ); + return true; } } diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c index 2a8492645e..a7ba99b756 100644 --- a/c/src/lib/libbsp/m68k/mvme147/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme147/timer/timer.c @@ -32,7 +32,7 @@ /* Each tick is 6.25 us */ int Ttimer_val; -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; rtems_isr timerisr(void); @@ -71,7 +71,7 @@ int benchmark_timer_read(void) } void benchmark_timer_disable_subtracting_average_overhead( - rtems_boolean find_flag + bool find_flag ) { benchmark_timer_find_average_overhead = find_flag; diff --git a/c/src/lib/libbsp/m68k/mvme162/console/console.c b/c/src/lib/libbsp/m68k/mvme162/console/console.c index 71c3d2f71e..3d87edabe2 100644 --- a/c/src/lib/libbsp/m68k/mvme162/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme162/console/console.c @@ -110,14 +110,14 @@ rtems_device_driver console_initialize( * Non-blocking char input */ -rtems_boolean char_ready(int port, char *ch) +bool char_ready(int port, char *ch) { if ( Ring_buffer_Is_empty( &Console_Buffer[port] ) ) - return FALSE; + return false; Ring_buffer_Remove_character( &Console_Buffer[port], *ch ); - return TRUE; + return false; } /* diff --git a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h index 45c079f77f..9d13d7dd88 100644 --- a/c/src/lib/libbsp/m68k/mvme162/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme162/include/bsp.h @@ -127,9 +127,9 @@ typedef volatile struct { enum {portB, portA}; -rtems_boolean char_ready(int port, char *ch); -char char_wait(int port); -void char_put(int port, char ch); +extern bool char_ready(int port, char *ch); +extern char char_wait(int port); +extern void char_put(int port, char ch); #define TX_BUFFER_EMPTY 0x04 #define RX_DATA_AVAILABLE 0x01 diff --git a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c index 0a83d7c1d4..507ea04206 100644 --- a/c/src/lib/libbsp/m68k/mvme162/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme162/timer/timer.c @@ -38,7 +38,7 @@ #define TIMER_INT_LEVEL 6 uint32_t Ttimer_val; -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; rtems_isr timerisr(void); @@ -69,7 +69,7 @@ int benchmark_timer_read(void) total = (Ttimer_val * TICK_INTERVAL) + lcsr->timer_cnt_1; - if ( benchmark_timer_find_average_overhead == 1 ) + if ( benchmark_timer_find_average_overhead == true ) return total; /* in one-half microsecond units */ if ( total < LEAST_VALID ) @@ -79,7 +79,7 @@ int benchmark_timer_read(void) } void benchmark_timer_disable_subtracting_average_overhead( - rtems_boolean find_flag + bool find_flag ) { benchmark_timer_find_average_overhead = find_flag; diff --git a/c/src/lib/libbsp/m68k/mvme167/console/console.c b/c/src/lib/libbsp/m68k/mvme167/console/console.c index cbeec4624e..3d981fe664 100644 --- a/c/src/lib/libbsp/m68k/mvme167/console/console.c +++ b/c/src/lib/libbsp/m68k/mvme167/console/console.c @@ -138,7 +138,7 @@ void cd2401_udelay( unsigned long delay ); void cd2401_chan_cmd( uint8_t channel, uint8_t cmd, uint8_t wait ); uint16_t cd2401_bitrate_divisor( uint32_t clkrate, uint32_t * bitrate ); void cd2401_initialize( void ); -void cd2401_interrupts_initialize( rtems_boolean enable ); +void cd2401_interrupts_initialize( bool enable ); /* ISRs */ rtems_isr cd2401_modem_isr( rtems_vector_number vector ); @@ -410,7 +410,7 @@ void cd2401_initialize( void ) * THE LAST CD2401 CHANNEL CLOSED SHOULD DISABLE INTERRUPTS. */ void cd2401_interrupts_initialize( - rtems_boolean enable + bool enable ) { if ( enable ) { diff --git a/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c b/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c index 142e25395a..0568486df3 100644 --- a/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c +++ b/c/src/lib/libbsp/m68k/mvme167/fatal/bspfatal.c @@ -63,7 +63,7 @@ static int mystrcat( */ User_extensions_routine bsp_fatal_error_occurred( Internal_errors_Source the_source, - rtems_boolean is_internal, + bool is_internal, uint32_t the_error ) { diff --git a/c/src/lib/libbsp/m68k/mvme167/include/fatal.h b/c/src/lib/libbsp/m68k/mvme167/include/fatal.h index ee04905486..416282c629 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/fatal.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/fatal.h @@ -14,6 +14,6 @@ User_extensions_routine bsp_fatal_error_occurred( Internal_errors_Source the_source, - rtems_boolean is_internal, + bool is_internal, uint32_t the_error ); diff --git a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c index 5d0f10671f..bdf6fa53d0 100644 --- a/c/src/lib/libbsp/m68k/mvme167/timer/timer.c +++ b/c/src/lib/libbsp/m68k/mvme167/timer/timer.c @@ -42,11 +42,11 @@ uint32_t Ttimer_val; /* - * Set to TRUE to return raw value. Normally zero. Depends on being allocated + * Set to true to return raw value. Normally zero. Depends on being allocated * in the .bss section and on that section being explicitly zeroed at boot * time. */ -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; rtems_isr timerisr(void); @@ -129,7 +129,7 @@ int benchmark_timer_read(void) * Output parameters: time in microseconds */ void benchmark_timer_disable_subtracting_average_overhead( - rtems_boolean find_flag + bool find_flag ) { benchmark_timer_find_average_overhead = find_flag; diff --git a/c/src/lib/libbsp/m68k/ods68302/console/console.c b/c/src/lib/libbsp/m68k/ods68302/console/console.c index 37d0fd96f5..83976a05a0 100644 --- a/c/src/lib/libbsp/m68k/ods68302/console/console.c +++ b/c/src/lib/libbsp/m68k/ods68302/console/console.c @@ -64,16 +64,16 @@ rtems_device_driver console_initialize( * FALSE - no character available */ -rtems_boolean is_character_ready( +bool is_character_ready( char *ch /* -> character */ ) { if (debug_port_status(0)) { *ch = debug_port_in(); - return TRUE; + return true; } - return FALSE; + return false; } /* inbyte diff --git a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c index eaa64e54a5..02c58a2a17 100644 --- a/c/src/lib/libbsp/m68k/ods68302/timer/timer.c +++ b/c/src/lib/libbsp/m68k/ods68302/timer/timer.c @@ -40,7 +40,7 @@ uint32_t Timer_interrupts; -rtems_boolean benchmark_timer_find_average_overhead; +bool benchmark_timer_find_average_overhead; rtems_isr timerisr(void); @@ -95,7 +95,7 @@ int benchmark_timer_read( void ) total = (Timer_interrupts * TRR2_VAL) + clicks; - if ( benchmark_timer_find_average_overhead == 1 ) + if ( benchmark_timer_find_average_overhead == true ) return total; /* in XXX microsecond units */ if ( total < LEAST_VALID ) @@ -109,7 +109,7 @@ int benchmark_timer_read( void ) } void benchmark_timer_disable_subtracting_average_overhead( - rtems_boolean find_flag + bool find_flag ) { benchmark_timer_find_average_overhead = find_flag; diff --git a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c b/c/src/lib/libbsp/m68k/uC5282/timer/timer.c index 763df724b3..47c1b55a13 100644 --- a/c/src/lib/libbsp/m68k/uC5282/timer/timer.c +++ b/c/src/lib/libbsp/m68k/uC5282/timer/timer.c @@ -41,6 +41,6 @@ benchmark_timer_read(void) } void -benchmark_timer_disable_subtracting_average_overhead(rtems_boolean find_flag) +benchmark_timer_disable_subtracting_average_overhead(bool find_flag) { } |