sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into bas24

Browse Source
This commit is contained in:
Gregory Nutt 2014-11-07 15:57:11 -06:00
commit f2c661f7e1
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -8911,4 +8911,5 @@
* libc/stdio/lib_tempnam.c, lib_tmpnam.c, Kconfig, Make.defs and
include/stdio.h: Add tmpnam() and tempnam() (2014-11-05).
* drivers/rwbuffer.c: Fix typo that can cause compiler error (2014-11-05).
* drivers/mtd/m25px.c: Extend MTD support to M25P16. From Sébastien
Lorquet (2014-11-07).

21
drivers/mtd/m25px.c
View File

@ -90,6 +90,7 @@
#define M25P_RES_ID 0x13
#define M25P_M25P1_CAPACITY 0x11 /* 1 M-bit */
#define M25P_EN25F80_CAPACITY 0x14 /* 8 M-bit */
#define M25P_M25P16_CAPACITY 0x15 /* 16 M-bit */
#define M25P_M25P32_CAPACITY 0x16 /* 32 M-bit */
#define M25P_M25P64_CAPACITY 0x17 /* 64 M-bit */
#define M25P_M25P128_CAPACITY 0x18 /* 128 M-bit */
@ -116,6 +117,16 @@
#define M25P_EN25F80_SUBSECT_SHIFT 12 /* Sub-Sector size 1 << 12 = 4,096 */
#define M25P_EN25F80_NSUBSECTORS 256
/* M25P16 capacity is 2,097,152 bytes:
* (32 sectors) * (65,536 bytes per sector)
* (8192 pages) * (256 bytes per page)
*/
#define M25P_M25P16_SECTOR_SHIFT 16 /* Sector size 1 << 16 = 65,536 */
#define M25P_M25P16_NSECTORS 32
#define M25P_M25P16_PAGE_SHIFT 8 /* Page size 1 << 8 = 256 */
#define M25P_M25P16_NPAGES 8192
/* M25P32 capacity is 4,194,304 bytes:
* (64 sectors) * (65,536 bytes per sector)
* (16384 pages) * (256 bytes per page)
@ -349,6 +360,16 @@ static inline int m25p_readid(struct m25p_dev_s *priv)
#endif
return OK;
}
else if (capacity == M25P_M25P16_CAPACITY)
{
/* Save the FLASH geometry */
priv->sectorshift = M25P_M25P16_SECTOR_SHIFT;
priv->nsectors = M25P_M25P16_NSECTORS;
priv->pageshift = M25P_M25P16_PAGE_SHIFT;
priv->npages = M25P_M25P16_NPAGES;
return OK;
}
else if (capacity == M25P_M25P32_CAPACITY)
{
/* Save the FLASH geometry */

4
sched/semaphore/sem_post.c
View File

@ -94,9 +94,7 @@
* 0 (OK) or -1 (ERROR) if unsuccessful
*
* Assumptions:
* This function cannot be called from an interrupt handler.
* It assumes the currently executing task is the one that
* is performing the unlock.
* This function may be called from an interrupt handler.
*
****************************************************************************/