Changeset 8f7f6ca in rtems


Ignore:
Timestamp:
02/23/12 16:43:58 (11 years ago)
Author:
Jennifer Averett <jennifer.averett@…>
Branches:
4.11, 5, master
Children:
19d18f23, 7e664023
Parents:
4f1173bc (diff), 9294f8f (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 remote-tracking branch 'upstream/master'

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/lpc32xx/include/nand-mlc.h

    r4f1173bc r8f7f6ca  
    264264 *
    265265 * The initial valid block information of the manufacturer will be used.
    266  * Unfortunatly there seems to be no standard for this.  A block will be
     266 * Unfortunately there seems to be no standard for this.  A block will be
    267267 * considered as bad if the first or second page of this block does not contain
    268268 * 0xff at the 6th byte of the spare area.  This should work for flashes with
  • cpukit/libfs/src/rfs/rtems-rfs-mutex.c

    r4f1173bc r8f7f6ca  
    2525/**
    2626 * RTEMS_RFS Mutex Attributes
    27  *
    28  * @warning Do not configure as inherit priority. If a driver is in the driver
    29  *          initialisation table this locked semaphore will have the IDLE task
    30  *          as the holder and a blocking task will raise the priority of the
    31  *          IDLE task which can cause unsual side effects like not work.
    3227 */
    3328#define RTEMS_RFS_MUTEX_ATTRIBS \
    34   (RTEMS_PRIORITY | RTEMS_SIMPLE_BINARY_SEMAPHORE | \
    35    RTEMS_NO_INHERIT_PRIORITY | RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL)
     29  (RTEMS_PRIORITY | RTEMS_BINARY_SEMAPHORE | \
     30   RTEMS_INHERIT_PRIORITY | RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL)
    3631#endif
    3732
  • testsuites/psxtests/psxstat/test.c

    r4f1173bc r8f7f6ca  
    706706  rtems_test_assert( status == 0 );
    707707
    708   printf("unlink %s\n", Links_to_Dirs[5]);
     708  printf("unlink %s\n", Links_to_dirlinks[5]);
    709709  status = unlink( Links_to_dirlinks[5] );
    710710  rtems_test_assert( status == 0 );
Note: See TracChangeset for help on using the changeset viewer.