diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-12-02 19:16:37 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-12-02 19:16:37 +0000 |
| commit | 2728d9cf48178eec3eb34f8490d11181d43c6036 (patch) | |
| tree | 17034d0effd8e838f0f2e62ba97ed4e256cbd422 /cpukit/score | |
| parent | 2002-12-02 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-2728d9cf48178eec3eb34f8490d11181d43c6036.tar.bz2 | |
2002-12-02 Joel Sherrill <joel@OARcorp.com>
* include/rtems/score/object.h, include/rtems/score/tod.h:
Added casts to eliminate warnings on 16 bit targets like the h8300.
Diffstat (limited to 'cpukit/score')
| -rw-r--r-- | cpukit/score/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/object.h | 18 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/tod.h | 20 |
3 files changed, 24 insertions, 19 deletions
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog index 1d9b10abd4..14cd83492b 100644 --- a/cpukit/score/ChangeLog +++ b/cpukit/score/ChangeLog @@ -1,3 +1,8 @@ +2002-12-02 Joel Sherrill <joel@OARcorp.com> + + * include/rtems/score/object.h, include/rtems/score/tod.h: + Added casts to eliminate warnings on 16 bit targets like the h8300. + 2002-11-14 Joel Sherrill <joel@OARcorp.com> * macros/rtems/score/object.inl: Keep consistent with inline version. diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h index af2b6f763b..7ccba96e83 100644 --- a/cpukit/score/include/rtems/score/object.h +++ b/cpukit/score/include/rtems/score/object.h @@ -74,15 +74,15 @@ typedef unsigned32 Objects_Id; #define OBJECTS_API_START_BIT 24 #define OBJECTS_CLASS_START_BIT 27 -#define OBJECTS_INDEX_MASK 0x0000ffff -#define OBJECTS_NODE_MASK 0x00ff0000 -#define OBJECTS_API_MASK 0x07000000 -#define OBJECTS_CLASS_MASK 0xf8000000 - -#define OBJECTS_INDEX_VALID_BITS 0x0000ffff -#define OBJECTS_NODE_VALID_BITS 0x000000ff -#define OBJECTS_API_VALID_BITS 0x00000007 -#define OBJECTS_CLASS_VALID_BITS 0x0000001f +#define OBJECTS_INDEX_MASK (Objects_Id)0x0000ffff +#define OBJECTS_NODE_MASK (Objects_Id)0x00ff0000 +#define OBJECTS_API_MASK (Objects_Id)0x07000000 +#define OBJECTS_CLASS_MASK (Objects_Id)0xf8000000 + +#define OBJECTS_INDEX_VALID_BITS (Objects_Id)0x0000ffff +#define OBJECTS_NODE_VALID_BITS (Objects_Id)0x000000ff +#define OBJECTS_API_VALID_BITS (Objects_Id)0x00000007 +#define OBJECTS_CLASS_VALID_BITS (Objects_Id)0x0000001f /* * This enumerated type is used in the class field of the object ID. diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h index c745fdb1f6..7bb7ea60a8 100644 --- a/cpukit/score/include/rtems/score/tod.h +++ b/cpukit/score/include/rtems/score/tod.h @@ -27,21 +27,21 @@ extern "C" { * The following constants are related to the time of day. */ -#define TOD_SECONDS_PER_MINUTE 60 -#define TOD_MINUTES_PER_HOUR 60 -#define TOD_MONTHS_PER_YEAR 12 -#define TOD_DAYS_PER_YEAR 365 -#define TOD_HOURS_PER_DAY 24 -#define TOD_SECONDS_PER_DAY (TOD_SECONDS_PER_MINUTE * \ +#define TOD_SECONDS_PER_MINUTE (unsigned32)60 +#define TOD_MINUTES_PER_HOUR (unsigned32)60 +#define TOD_MONTHS_PER_YEAR (unsigned32)12 +#define TOD_DAYS_PER_YEAR (unsigned32)365 +#define TOD_HOURS_PER_DAY (unsigned32)24 +#define TOD_SECONDS_PER_DAY (unsigned32) (TOD_SECONDS_PER_MINUTE * \ TOD_MINUTES_PER_HOUR * \ TOD_HOURS_PER_DAY) #define TOD_SECONDS_PER_NON_LEAP_YEAR (365 * TOD_SECONDS_PER_DAY) -#define TOD_MILLISECONDS_PER_SECOND 1000 -#define TOD_MICROSECONDS_PER_SECOND 1000000 -#define TOD_NANOSECONDS_PER_SECOND 1000000000 -#define TOD_NANOSECONDS_PER_MICROSECOND 1000 +#define TOD_MILLISECONDS_PER_SECOND (unsigned32)1000 +#define TOD_MICROSECONDS_PER_SECOND (unsigned32)1000000 +#define TOD_NANOSECONDS_PER_SECOND (unsigned32)1000000000 +#define TOD_NANOSECONDS_PER_MICROSECOND (unsigned32)1000 /* * The following constant define the earliest year to which an |