Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jennifer Averett
2012-02-23 10:43:58 -06:00
3 changed files with 4 additions and 9 deletions

View File

@@ -263,7 +263,7 @@ rtems_status_code lpc32xx_mlc_read_page(
* @brief Checks if the block with index @a block_index is valid.
*
* The initial valid block information of the manufacturer will be used.
* Unfortunatly there seems to be no standard for this. A block will be
* Unfortunately there seems to be no standard for this. A block will be
* considered as bad if the first or second page of this block does not contain
* 0xff at the 6th byte of the spare area. This should work for flashes with
* small pages and a 8-bit IO width.

View File

@@ -24,15 +24,10 @@
#if __rtems__
/**
* RTEMS_RFS Mutex Attributes
*
* @warning Do not configure as inherit priority. If a driver is in the driver
* initialisation table this locked semaphore will have the IDLE task
* as the holder and a blocking task will raise the priority of the
* IDLE task which can cause unsual side effects like not work.
*/
#define RTEMS_RFS_MUTEX_ATTRIBS \
(RTEMS_PRIORITY | RTEMS_SIMPLE_BINARY_SEMAPHORE | \
RTEMS_NO_INHERIT_PRIORITY | RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL)
(RTEMS_PRIORITY | RTEMS_BINARY_SEMAPHORE | \
RTEMS_INHERIT_PRIORITY | RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL)
#endif
int

View File

@@ -705,7 +705,7 @@ void Cause_faults(void)
status = rmdir( longer_name );
rtems_test_assert( status == 0 );
printf("unlink %s\n", Links_to_Dirs[5]);
printf("unlink %s\n", Links_to_dirlinks[5]);
status = unlink( Links_to_dirlinks[5] );
rtems_test_assert( status == 0 );