diff options
| author | Chris Johns <chrisj@rtems.org> | 2009-08-05 00:00:54 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2009-08-05 00:00:54 +0000 |
| commit | 0d15414ed6c144f7f7e4ce63476b3eb9b94acceb (patch) | |
| tree | d403db6ba0eae020e8613bb81a0427ca1ab85867 /cpukit/score/inline/rtems/score/object.inl | |
| parent | 2009-08-04 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-0d15414ed6c144f7f7e4ce63476b3eb9b94acceb.tar.bz2 | |
009-08-05 Chris Johns <chrisj@rtems.org>
* libmisc/dummy/dummy-networking.c: New.
* libmisc/dummy/dummy.c, libmisc/Makefile.am: Move
trhe networking configuration into a separate file so
configuration varations do not cause conflicts.
* score/inline/rtems/score/object.inl,
score/include/rtems/score/object.h: Remove warnings.
* score/inline/rtems/score/object.inl: Add _Chain_First,
_Chain_Last, _Chain_Mext, and _Chain_Previous.
* sapi/inline/rtems/chain.inl: Add rtems_chain_first,
rtems_chain_last, rtems_chain_mext, and rtems_chain_previous.
* libblock/include/rtems/diskdevs.h: Remove the bdbuf pool id and
block_size_log2. Add media_block_size.
* libblock/src/diskdevs.c: Remove size restrictions on block
size. Add media block size initialisation. Remove comment to clean
up the bdbuf cache.
* libblock/src/blkdev.c: Remove references to
block_size_log2. Allow any block size.
* libblock/include/rtems/bdbuf.h, libblock/src/bdbuf.c: Remove all
references to pools and make the cache handle demand driver
variable buffer size allocation. Added worker threads support the
swapout task.
* sapi/include/confdefs.h: Updated the bdbuf configutation.
Diffstat (limited to 'cpukit/score/inline/rtems/score/object.inl')
| -rw-r--r-- | cpukit/score/inline/rtems/score/object.inl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpukit/score/inline/rtems/score/object.inl b/cpukit/score/inline/rtems/score/object.inl index f722620421..8bb88e831a 100644 --- a/cpukit/score/inline/rtems/score/object.inl +++ b/cpukit/score/inline/rtems/score/object.inl @@ -111,7 +111,9 @@ RTEMS_INLINE_ROUTINE Objects_Maximum _Objects_Get_index( Objects_Id id ) { - return (id >> OBJECTS_INDEX_START_BIT) & OBJECTS_INDEX_VALID_BITS; + return + (Objects_Maximum)((id >> OBJECTS_INDEX_START_BIT) & + OBJECTS_INDEX_VALID_BITS); } /** @@ -224,7 +226,7 @@ RTEMS_INLINE_ROUTINE Objects_Control *_Objects_Get_local_object( RTEMS_INLINE_ROUTINE void _Objects_Set_local_object( Objects_Information *information, - uint16_t index, + uint32_t index, Objects_Control *the_object ) { |