Changeset d189646 in rtems


Ignore:
Timestamp:
Apr 12, 2012, 8:52:29 AM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
1f16a9f
Parents:
45494d9c (diff), b467782b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'upstream'

Conflicts:

cpukit/libblock/include/rtems/bdbuf.h
cpukit/libblock/src/bdbuf.c

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libblock/include/rtems/bdbuf.h

    r45494d9c rd189646  
    471471 * of the partition on the media.
    472472 *
     473 * Before you can use this function, the rtems_bdbuf_init() routine must be
     474 * called at least once to initialize the cache, otherwise a fatal error will
     475 * occur.
     476 *
    473477 * @param dd [in] The disk device.
    474478 * @param block [in] Linear media block number.
     
    476480 *
    477481 * @retval RTEMS_SUCCESSFUL Successful operation.
    478  * @retval RTEMS_INVALID_NUMBER Invalid block size.
     482 * @retval RTEMS_INVALID_ID Invalid block number.
    479483 */
    480484rtems_status_code
     
    500504 * first.
    501505 *
     506 * Before you can use this function, the rtems_bdbuf_init() routine must be
     507 * called at least once to initialize the cache, otherwise a fatal error will
     508 * occur.
     509 *
    502510 * @param dd [in] The disk device.
    503511 * @param block [in] Linear media block number.
     
    505513 *
    506514 * @retval RTEMS_SUCCESSFUL Successful operation.
    507  * @retval RTEMS_INVALID_NUMBER Invalid block size.
     515 * @retval RTEMS_INVALID_ID Invalid block number.
    508516 * @retval RTEMS_IO_ERROR IO error.
    509517 */
     
    523531 * queue. The buffers is returned to the end of the LRU list.
    524532 *
    525  * @param bd [in] Reference to the buffer descriptor.
     533 * Before you can use this function, the rtems_bdbuf_init() routine must be
     534 * called at least once to initialize the cache, otherwise a fatal error will
     535 * occur.
     536 *
     537 * @param bd [in] Reference to the buffer descriptor.  The buffer descriptor
     538 * reference must not be @c NULL and must be obtained via rtems_bdbuf_get() or
     539 * rtems_bdbuf_read().
    526540 *
    527541 * @retval RTEMS_SUCCESSFUL Successful operation.
     
    541555 * before the hold timer has expired the buffer will be returned to the user.
    542556 *
    543  * @param bd [in] Reference to the buffer descriptor.
     557 * Before you can use this function, the rtems_bdbuf_init() routine must be
     558 * called at least once to initialize the cache, otherwise a fatal error will
     559 * occur.
     560 *
     561 * @param bd [in] Reference to the buffer descriptor.  The buffer descriptor
     562 * reference must not be @c NULL and must be obtained via rtems_bdbuf_get() or
     563 * rtems_bdbuf_read().
    544564 *
    545565 * @retval RTEMS_SUCCESSFUL Successful operation.
     
    557577 * @note This code does not lock the sync mutex and stop additions to the
    558578 *       modified queue.
    559 
    560  * @param bd [in] Reference to the buffer descriptor.
     579 *
     580 * Before you can use this function, the rtems_bdbuf_init() routine must be
     581 * called at least once to initialize the cache, otherwise a fatal error will
     582 * occur.
     583 *
     584 * @param bd [in] Reference to the buffer descriptor.  The buffer descriptor
     585 * reference must not be @c NULL and must be obtained via rtems_bdbuf_get() or
     586 * rtems_bdbuf_read().
    561587 *
    562588 * @retval RTEMS_SUCCESSFUL Successful operation.
     
    575601 * nested call will be blocked until the first sync request has complete.
    576602 *
     603 * Before you can use this function, the rtems_bdbuf_init() routine must be
     604 * called at least once to initialize the cache, otherwise a fatal error will
     605 * occur.
     606 *
    577607 * @param dd [in] The disk device.
    578608 *
     
    586616 *
    587617 * This may result in loss of data.
     618 *
     619 * Before you can use this function, the rtems_bdbuf_init() routine must be
     620 * called at least once to initialize the cache, otherwise a fatal error will
     621 * occur.
     622 *
     623 * @param dd [in] The disk device.
    588624 */
    589625void
     
    595631 * This will also change the block_to_media_block_shift and bds_per_group
    596632 * fields of the disk device.
     633 *
     634 * Before you can use this function, the rtems_bdbuf_init() routine must be
     635 * called at least once to initialize the cache, otherwise a fatal error will
     636 * occur.
    597637 *
    598638 * @param dd [in, out] The disk device.
  • cpukit/libblock/src/bdbuf.c

    r45494d9c rd189646  
    155155#define RTEMS_BLKDEV_FATAL_BDBUF_TREE_RM       RTEMS_BLKDEV_FATAL_ERROR(9)
    156156#define RTEMS_BLKDEV_FATAL_BDBUF_SWAPOUT       RTEMS_BLKDEV_FATAL_ERROR(10)
     157
     158/*
     159 * The lock/unlock fatal errors occur in case the bdbuf is not initialized with
     160 * rtems_bdbuf_init().  General system corruption like stack overflow etc. may
     161 * also trigger these fatal errors.
     162 */
    157163#define RTEMS_BLKDEV_FATAL_BDBUF_SYNC_LOCK     RTEMS_BLKDEV_FATAL_ERROR(11)
    158164#define RTEMS_BLKDEV_FATAL_BDBUF_SYNC_UNLOCK   RTEMS_BLKDEV_FATAL_ERROR(12)
    159165#define RTEMS_BLKDEV_FATAL_BDBUF_CACHE_LOCK    RTEMS_BLKDEV_FATAL_ERROR(13)
    160166#define RTEMS_BLKDEV_FATAL_BDBUF_CACHE_UNLOCK  RTEMS_BLKDEV_FATAL_ERROR(14)
     167
    161168#define RTEMS_BLKDEV_FATAL_BDBUF_PREEMPT_DIS   RTEMS_BLKDEV_FATAL_ERROR(15)
    162169#define RTEMS_BLKDEV_FATAL_BDBUF_CACHE_WAIT_2  RTEMS_BLKDEV_FATAL_ERROR(16)
     
    17451752  if (mb >= dd->size)
    17461753  {
    1747     return RTEMS_INVALID_NUMBER;
     1754    return RTEMS_INVALID_ID;
    17481755  }
    17491756
  • doc/user/conf.t

    r45494d9c rd189646  
    21882188as needed.
    21892189
     2190@findex rtems_resource_unlimited
    21902191When the number of objects is not known ahead of time, RTEMS provides an
    21912192auto-extending mode that can be enabled individually for each object
     
    22052206@end example
    22062207
     2208@findex rtems_resource_is_unlimited
     2209@findex rtems_resource_maximum_per_allocation
     2210Object maximum specifications can be evaluated with the
     2211@code{rtems_resource_is_unlimited} and
     2212@code{rtems_resource_maximum_per_allocation} macros.
     2213
    22072214To ease the burden of developers who are porting new software RTEMS also
    22082215provides the following macros:
Note: See TracChangeset for help on using the changeset viewer.