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

ST25FL1: Correct some compile problems when file system debug is enabled

Browse Source
This commit is contained in:
Gregory Nutt 2015-08-31 09:25:14 -06:00
parent 409262a8ef
commit 2d84270552
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch

@ -1 +1 @@
Subproject commit e076ee09c276733d56014afa87c19c077b8f9385 Subproject commit eaba40bd7303c737a812e307e2b687cd473d90da

2
configs

@ -1 +1 @@
Subproject commit 0198c46e0bd38d2a7fada9e4a1ea445218284c61 Subproject commit 08a06b5db223a973e8f25b092f787e27ccc7b400

13
drivers/mtd/st25fl1.c
View File

@ -908,7 +908,7 @@ static int st25fl1_read_byte(FAR struct st25fl1_dev_s *priv, FAR uint8_t *buffer
{ {
struct qspi_meminfo_s meminfo; struct qspi_meminfo_s meminfo;
fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)nbytes); fvdbg("address: %08lx nbytes: %d\n", (long)address, (int)buflen);
#ifdef CONFIG_ST25FL1_SCRAMBLE #ifdef CONFIG_ST25FL1_SCRAMBLE
meminfo.flags = QSPIMEM_READ | QSPIMEM_QUADIO | QSPIMEM_SCRAMBLE; meminfo.flags = QSPIMEM_READ | QSPIMEM_QUADIO | QSPIMEM_SCRAMBLE;
@ -977,7 +977,7 @@ static int st25fl1_write_page(struct st25fl1_dev_s *priv, FAR const uint8_t *buf
if (ret < 0) if (ret < 0)
{ {
fdbg("ERROR: QSPI_MEMORY failed writing address=%06x\n", fdbg("ERROR: QSPI_MEMORY failed writing address=%06x\n",
address) address);
return ret; return ret;
} }
@ -1423,9 +1423,12 @@ static int st25fl1_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
* Name: st25fl1_initialize * Name: st25fl1_initialize
* *
* Description: * Description:
* Create an initialize MTD device instance. MTD devices are not registered * Create an initialize MTD device instance for the QuadSPI-based ST24FL1
* in the file system, but are created as instances that can be bound to * FLASH part.
* other functions (such as a block or character driver front end). *
* MTD devices are not registered in the file system, but are created as instances
* that can be bound to other functions (such as a block or character driver front
* end).
* *
************************************************************************************/ ************************************************************************************/

12
include/nuttx/mtd/mtd.h
View File

@ -474,6 +474,18 @@ FAR struct mtd_dev_s *sst39vf_initialize(void);
FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *dev); FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *dev);
/****************************************************************************
* Name: st25fl1_initialize
*
* Description:
* Create an initialize MTD device instance for the QuadSPI-based ST24FL1
* FLASH part.
*
****************************************************************************/
struct qspi_dev_s; /* Forward reference */
FAR struct mtd_dev_s *st25fl1_initialize(FAR struct qspi_dev_s *qspi);
/**************************************************************************** /****************************************************************************
* Name: up_flashinitialize * Name: up_flashinitialize
* *