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

drivers/mtd/w25.c: fix finfo format warning

Browse Source 
Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
This commit is contained in:
Juha Niskanen 2020-12-13 15:45:43 +02:00 committed by Xiang Xiao
parent 66bdec6754
commit 93991670af
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mtd/w25.c
View File

@ -28,7 +28,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h> #include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -163,6 +163,7 @@
# define W25X64_SR_BP_LOWER8th (12 << W25_SR_BP_SHIFT) /* Lower 8th */ # define W25X64_SR_BP_LOWER8th (12 << W25_SR_BP_SHIFT) /* Lower 8th */
# define W25X64_SR_BP_LOWERQTR (13 << W25_SR_BP_SHIFT) /* Lower quarter */ # define W25X64_SR_BP_LOWERQTR (13 << W25_SR_BP_SHIFT) /* Lower quarter */
# define W25X64_SR_BP_LOWERHALF (14 << W25_SR_BP_SHIFT) /* Lower half */ # define W25X64_SR_BP_LOWERHALF (14 << W25_SR_BP_SHIFT) /* Lower half */
/* Bit 6: Reserved */ /* Bit 6: Reserved */
#define W25_SR_SRP (1 << 7) /* Bit 7: Status register write protect */ #define W25_SR_SRP (1 << 7) /* Bit 7: Status register write protect */
@ -220,7 +221,7 @@ struct w25_dev_s
#if defined(CONFIG_W25_SECTOR512) && !defined(CONFIG_W25_READONLY) #if defined(CONFIG_W25_SECTOR512) && !defined(CONFIG_W25_READONLY)
uint8_t flags; /* Buffered sector flags */ uint8_t flags; /* Buffered sector flags */
uint16_t esectno; /* Erase sector number in the cache*/ uint16_t esectno; /* Erase sector number in the cache */
FAR uint8_t *sector; /* Allocated sector data */ FAR uint8_t *sector; /* Allocated sector data */
#endif #endif
}; };
@ -1261,7 +1262,8 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
#endif #endif
ret = OK; ret = OK;
finfo("blocksize: %d erasesize: %d neraseblocks: %d\n", finfo("blocksize: %" PRIu32 " erasesize: %" PRIu32
" neraseblocks: %" PRIu32 "\n",
geo->blocksize, geo->erasesize, geo->neraseblocks); geo->blocksize, geo->erasesize, geo->neraseblocks);
} }
} }
@ -1350,7 +1352,9 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
} }
else else
{ {
/* Make sure that the FLASH is unprotected so that we can write into it */ /* Make sure that the FLASH is unprotected so that we can write
* into it.
*/
#ifndef CONFIG_W25_READONLY #ifndef CONFIG_W25_READONLY
w25_unprotect(priv); w25_unprotect(priv);
@ -1362,7 +1366,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
priv->sector = (FAR uint8_t *)kmm_malloc(W25_SECTOR_SIZE); priv->sector = (FAR uint8_t *)kmm_malloc(W25_SECTOR_SIZE);
if (!priv->sector) if (!priv->sector)
{ {
/* Allocation failed! Discard all of that work we just did and return NULL */ /* Discard all of that work we just did and return NULL */
ferr("ERROR: Allocation failed\n"); ferr("ERROR: Allocation failed\n");
kmm_free(priv); kmm_free(priv);