diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-06-22 15:37:13 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-06-24 14:44:31 +0200 |
| commit | 1d72f03e5a86a0475cbd4fe92e6b47b053880503 (patch) | |
| tree | 238840221a46b63e00d4442838265e8f69616dc7 /cpukit | |
| parent | testsuites: Increase invalid priority values (diff) | |
| download | rtems-1d72f03e5a86a0475cbd4fe92e6b47b053880503.tar.bz2 | |
score: Silence integer conversion warnings
Diffstat (limited to 'cpukit')
4 files changed, 5 insertions, 4 deletions
diff --git a/cpukit/score/include/rtems/score/prioritybitmapimpl.h b/cpukit/score/include/rtems/score/prioritybitmapimpl.h index 0082720392..82c92eb5d6 100644 --- a/cpukit/score/include/rtems/score/prioritybitmapimpl.h +++ b/cpukit/score/include/rtems/score/prioritybitmapimpl.h @@ -61,7 +61,8 @@ RTEMS_INLINE_ROUTINE unsigned int _Bitfield_Find_first_bit( #if ( CPU_USE_GENERIC_BITFIELD_CODE == FALSE ) _CPU_Bitfield_Find_first_bit( value, bit_number ); #elif defined(__GNUC__) - bit_number = __builtin_clz( value ) - __SIZEOF_INT__ * __CHAR_BIT__ + 16; + bit_number = (unsigned int) __builtin_clz( value ) + - __SIZEOF_INT__ * __CHAR_BIT__ + 16; #else if ( value < 0x100 ) { bit_number = _Bitfield_Leading_zeros[ value ] + 8; diff --git a/cpukit/score/include/rtems/score/schedulerimpl.h b/cpukit/score/include/rtems/score/schedulerimpl.h index 11347fe047..9885adf210 100644 --- a/cpukit/score/include/rtems/score/schedulerimpl.h +++ b/cpukit/score/include/rtems/score/schedulerimpl.h @@ -749,7 +749,7 @@ RTEMS_INLINE_ROUTINE Objects_Id _Scheduler_Build_id( uint32_t scheduler_index ) OBJECTS_FAKE_OBJECTS_API, OBJECTS_FAKE_OBJECTS_SCHEDULERS, _Objects_Local_node, - scheduler_index + 1 + (uint16_t) ( scheduler_index + 1 ) ); } diff --git a/cpukit/score/include/rtems/score/timestamp.h b/cpukit/score/include/rtems/score/timestamp.h index 9d25943a8c..8b1a73816a 100644 --- a/cpukit/score/include/rtems/score/timestamp.h +++ b/cpukit/score/include/rtems/score/timestamp.h @@ -282,7 +282,7 @@ RTEMS_INLINE_ROUTINE uint32_t _Timestamp_Get_nanoseconds( bintime2timespec( _time, &_ts ); - return _ts.tv_nsec; + return (uint32_t) _ts.tv_nsec; } /** diff --git a/cpukit/score/include/rtems/score/watchdogimpl.h b/cpukit/score/include/rtems/score/watchdogimpl.h index b76a51acfa..c5f8d209a6 100644 --- a/cpukit/score/include/rtems/score/watchdogimpl.h +++ b/cpukit/score/include/rtems/score/watchdogimpl.h @@ -318,7 +318,7 @@ RTEMS_INLINE_ROUTINE uint64_t _Watchdog_Ticks_from_timespec( _Assert( ts->tv_nsec < 1000000000 ); ticks <<= WATCHDOG_BITS_FOR_1E9_NANOSECONDS; - ticks |= ts->tv_nsec; + ticks |= (uint32_t) ts->tv_nsec; return ticks; } |