diff --git a/arch/sim/src/sim/up_qspiflash.c b/arch/sim/src/sim/up_qspiflash.c index 826ec30aeeb..3648cf374db 100644 --- a/arch/sim/src/sim/up_qspiflash.c +++ b/arch/sim/src/sim/up_qspiflash.c @@ -1,4 +1,4 @@ -/************************************************************************************ +/**************************************************************************** * arch/sim/src/sim/up_qspiflash.c * * Licensed to the Apache Software Foundation (ASF) under one or more @@ -16,11 +16,11 @@ * License for the specific language governing permissions and limitations * under the License. * - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Included Files - ************************************************************************************/ + ****************************************************************************/ #include #include @@ -38,11 +38,11 @@ #include "up_internal.h" -/************************************************************************************ +/**************************************************************************** * Pre-processor Definitions - ************************************************************************************/ + ****************************************************************************/ -/* Configuration ********************************************************************/ +/* Configuration ************************************************************/ /* Define the FLASH SIZE in bytes */ @@ -131,32 +131,33 @@ /* Instructions */ -/* Command Value N Description Addr Dummy Data */ +/* Command Value N Description Addr Dummy Data */ -#define QSPIFLASH_WREN 0x06 /* 1 Write Enable 0 0 0 */ -#define QSPIFLASH_WRDI 0x04 /* 1 Write Disable 0 0 0 */ -#define QSPIFLASH_RDID 0x9f /* 1 Read Identification 0 0 1-3 */ -#define QSPIFLASH_RDSR 0x05 /* 1 Read Status Register 0 0 >=1 */ -#define QSPIFLASH_WRSR 0x01 /* 1 Write Status Register 0 0 1 */ -#define QSPIFLASH_READ 0x03 /* 1 Read Data Bytes 3 0 >=1 */ -#define QSPIFLASH_FAST_READ 0x0b /* 1 Higher speed read 3 1 >=1 */ -#define QSPIFLASH_PP 0x02 /* 1 Page Program 3 0 1-256 */ -#define QSPIFLASH_SE 0xd8 /* 1 Sector Erase 3 0 0 */ -#define QSPIFLASH_BE 0xc7 /* 1 Bulk Erase 0 0 0 */ -#define QSPIFLASH_DP 0xb9 /* 2 Deep power down 0 0 0 */ -#define QSPIFLASH_RES 0xab /* 2 Read Electronic Signature 0 3 >=1 */ -#define QSPIFLASH_SSE 0x20 /* 3 Sub-Sector Erase 0 0 0 */ +#define QSPIFLASH_WREN 0x06 /* 1 Write Enable 0 0 0 */ +#define QSPIFLASH_WRDI 0x04 /* 1 Write Disable 0 0 0 */ +#define QSPIFLASH_RDID 0x9f /* 1 Read Identification 0 0 1-3 */ +#define QSPIFLASH_RDSR 0x05 /* 1 Read Status Register 0 0 >=1 */ +#define QSPIFLASH_WRSR 0x01 /* 1 Write Status Register 0 0 1 */ +#define QSPIFLASH_READ 0x03 /* 1 Read Data Bytes 3 0 >=1 */ +#define QSPIFLASH_FAST_READ 0x0b /* 1 Higher speed read 3 1 >=1 */ +#define QSPIFLASH_PP 0x02 /* 1 Page Program 3 0 1-256 */ +#define QSPIFLASH_SE 0xd8 /* 1 Sector Erase 3 0 0 */ +#define QSPIFLASH_BE 0xc7 /* 1 Bulk Erase 0 0 0 */ +#define QSPIFLASH_DP 0xb9 /* 2 Deep power down 0 0 0 */ +#define QSPIFLASH_RES 0xab /* 2 Read Electronic + * Signature 0 3 >=1 */ +#define QSPIFLASH_SSE 0x20 /* 3 Sub-Sector Erase 0 0 0 */ -#define QSPIFLASH_ID 0x9f /* JEDEC ID */ +#define QSPIFLASH_ID 0x9f /* JEDEC ID */ #define QSPIFLASH_READ_QUAD 0xeb #define QSPIFLASH_DUMMY 0xa5 #define QSPIFLASH_WREN_SET 0x02 -/************************************************************************************ +/**************************************************************************** * Private Types - ************************************************************************************/ + ****************************************************************************/ struct sim_qspiflashdev_s { @@ -170,9 +171,9 @@ struct sim_qspiflashdev_s unsigned char data[CONFIG_QSPIFLASH_SIZE]; }; -/************************************************************************************ +/**************************************************************************** * Private Function Prototypes - ************************************************************************************/ + ****************************************************************************/ /* QSPI methods */ @@ -186,15 +187,17 @@ static int qspiflash_command(FAR struct qspi_dev_s *dev, FAR struct qspi_cmdinfo_s *cmd); static int qspiflash_memory(FAR struct qspi_dev_s *dev, FAR struct qspi_meminfo_s *mem); -static FAR void *qspiflash_alloc(FAR struct qspi_dev_s *dev, size_t buflen); -static void qspiflash_free(FAR struct qspi_dev_s *dev, FAR void *buffer); +static FAR void *qspiflash_alloc(FAR struct qspi_dev_s *dev, + size_t buflen); +static void qspiflash_free(FAR struct qspi_dev_s *dev, + FAR void *buffer); static void qspiflash_writeword(FAR struct sim_qspiflashdev_s *priv, uint16_t data, FAR struct qspi_cmdinfo_s *cmdinfo); -/************************************************************************************ +/**************************************************************************** * Private Data - ************************************************************************************/ + ****************************************************************************/ static const struct qspi_ops_s g_qspiops = { @@ -216,11 +219,11 @@ struct sim_qspiflashdev_s g_qspidev = } }; -/************************************************************************************ +/**************************************************************************** * Private Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_lock * * Description: @@ -239,14 +242,14 @@ struct sim_qspiflashdev_s g_qspidev = * Returned Value: * None * - ************************************************************************************/ + ****************************************************************************/ static int qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock) { return OK; } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_memory * * Description: @@ -255,9 +258,10 @@ static int qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock) * Returned Value: * Always returns zero * - ************************************************************************************/ + ****************************************************************************/ -int qspiflash_memory(FAR struct qspi_dev_s *dev, FAR struct qspi_meminfo_s *mem) +int qspiflash_memory(FAR struct qspi_dev_s *dev, + FAR struct qspi_meminfo_s *mem) { FAR struct sim_qspiflashdev_s *priv = (FAR struct sim_qspiflashdev_s *)dev; @@ -284,7 +288,7 @@ int qspiflash_memory(FAR struct qspi_dev_s *dev, FAR struct qspi_meminfo_s *mem) return 0; } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_setfrequency * * Description: @@ -297,14 +301,15 @@ int qspiflash_memory(FAR struct qspi_dev_s *dev, FAR struct qspi_meminfo_s *mem) * Returned Value: * Returns the actual frequency selected * - ************************************************************************************/ + ****************************************************************************/ -static uint32_t qspiflash_setfrequency(FAR struct qspi_dev_s *dev, uint32_t frequency) +static uint32_t qspiflash_setfrequency(FAR struct qspi_dev_s *dev, + uint32_t frequency) { return frequency; } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_setmode * * Description: @@ -317,13 +322,14 @@ static uint32_t qspiflash_setfrequency(FAR struct qspi_dev_s *dev, uint32_t freq * Returned Value: * Returns the actual frequency selected * - ************************************************************************************/ + ****************************************************************************/ -static void qspiflash_setmode(FAR struct qspi_dev_s *dev, enum qspi_mode_e mode) +static void qspiflash_setmode(FAR struct qspi_dev_s *dev, + enum qspi_mode_e mode) { } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_setbits * * Description: @@ -336,13 +342,13 @@ static void qspiflash_setmode(FAR struct qspi_dev_s *dev, enum qspi_mode_e mode) * Returned Value: * None * - ************************************************************************************/ + ****************************************************************************/ static void qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits) { } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_alloc * * Description: @@ -355,14 +361,14 @@ static void qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits) * Returned Value: * None * - ************************************************************************************/ + ****************************************************************************/ static FAR void *qspiflash_alloc(FAR struct qspi_dev_s *dev, size_t buflen) { return kmm_malloc(buflen); } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_free * * Description: @@ -375,14 +381,14 @@ static FAR void *qspiflash_alloc(FAR struct qspi_dev_s *dev, size_t buflen) * Returned Value: * None * - ************************************************************************************/ + ****************************************************************************/ static void qspiflash_free(FAR struct qspi_dev_s *dev, FAR void *buffer) { kmm_free(buffer); } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_sectorerase * * Description: @@ -394,7 +400,7 @@ static void qspiflash_free(FAR struct qspi_dev_s *dev, FAR void *buffer) * Returned Value: * None * - ************************************************************************************/ + ****************************************************************************/ static void qspiflash_sectorerase(FAR struct sim_qspiflashdev_s *priv) { @@ -423,7 +429,7 @@ static void qspiflash_sectorerase(FAR struct sim_qspiflashdev_s *priv) } } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_writeword * * Description: @@ -436,9 +442,10 @@ static void qspiflash_sectorerase(FAR struct sim_qspiflashdev_s *priv) * Returned Value: * None * - ************************************************************************************/ + ****************************************************************************/ -static void qspiflash_writeword(FAR struct sim_qspiflashdev_s *priv, uint16_t data, +static void qspiflash_writeword(FAR struct sim_qspiflashdev_s *priv, + uint16_t data, FAR struct qspi_cmdinfo_s *cmdinfo) { switch (priv->state) @@ -462,8 +469,9 @@ static void qspiflash_writeword(FAR struct sim_qspiflashdev_s *priv, uint16_t da case QSPIFLASH_SSE: priv->address = cmdinfo->addr; - /* Now perform the sector or sub-sector erase. Really this should - * be done during the deselect, but this is just a simulation . + /* Now perform the sector or sub-sector erase. + * Really this should be done during the deselect, + * but this is just a simulation . */ qspiflash_sectorerase(priv); @@ -491,7 +499,7 @@ static void qspiflash_writeword(FAR struct sim_qspiflashdev_s *priv, uint16_t da } } -/************************************************************************************ +/**************************************************************************** * Name: qspiflash_command * * Description: @@ -500,11 +508,12 @@ static void qspiflash_writeword(FAR struct sim_qspiflashdev_s *priv, uint16_t da * Returned Value: * Always returns zero * - ************************************************************************************/ + ****************************************************************************/ -static int qspiflash_command(FAR struct qspi_dev_s *dev, FAR struct qspi_cmdinfo_s *cmdinfo) +static int qspiflash_command(FAR struct qspi_dev_s *dev, + FAR struct qspi_cmdinfo_s *cmdinfo) { - uint8_t *pBuf; + uint8_t *p_buf; FAR struct sim_qspiflashdev_s *priv = (FAR struct sim_qspiflashdev_s *)dev; DEBUGASSERT(cmdinfo->cmd < 256); @@ -514,7 +523,7 @@ static int qspiflash_command(FAR struct qspi_dev_s *dev, FAR struct qspi_cmdinfo if (QSPICMD_ISDATA(cmdinfo->flags)) { DEBUGASSERT(cmdinfo->buffer != NULL && cmdinfo->buflen > 0); - pBuf = (uint8_t *) cmdinfo->buffer; + p_buf = (uint8_t *) cmdinfo->buffer; /* Read or write operation? */ @@ -531,16 +540,16 @@ static int qspiflash_command(FAR struct qspi_dev_s *dev, FAR struct qspi_cmdinfo switch (cmdinfo->cmd) { case QSPIFLASH_ID: - pBuf[0] = CONFIG_SIM_QSPIFLASH_MANUFACTURER; - pBuf[1] = CONFIG_SIM_QSPIFLASH_MEMORY_TYPE; - pBuf[2] = CONFIG_QSPIFLASH_CAPACITY; + p_buf[0] = CONFIG_SIM_QSPIFLASH_MANUFACTURER; + p_buf[1] = CONFIG_SIM_QSPIFLASH_MEMORY_TYPE; + p_buf[2] = CONFIG_QSPIFLASH_CAPACITY; break; case QSPIFLASH_RDSR: if (priv->wren == 1) - pBuf[0] = QSPIFLASH_WREN_SET; + p_buf[0] = QSPIFLASH_WREN_SET; else - pBuf[0] = 0; + p_buf[0] = 0; break; } } @@ -555,11 +564,11 @@ static int qspiflash_command(FAR struct qspi_dev_s *dev, FAR struct qspi_cmdinfo return 0; } -/************************************************************************************ +/**************************************************************************** * Public Functions - ************************************************************************************/ + ****************************************************************************/ -/************************************************************************************ +/**************************************************************************** * Name: up_qspiflashinitialize * * Description: @@ -571,7 +580,7 @@ static int qspiflash_command(FAR struct qspi_dev_s *dev, FAR struct qspi_cmdinfo * Returned Value: * Valid SPI device structure reference on success; a NULL on failure * - ************************************************************************************/ + ****************************************************************************/ FAR struct qspi_dev_s *up_qspiflashinitialize() { diff --git a/fs/smartfs/smartfs_utils.c b/fs/smartfs/smartfs_utils.c index 4aade8cfccf..b0271653d2a 100644 --- a/fs/smartfs/smartfs_utils.c +++ b/fs/smartfs/smartfs_utils.c @@ -683,13 +683,15 @@ int smartfs_finddirentry(struct smartfs_mountpt_s *fs, if ((smartfs_rdle16(&entry->flags) & SMARTFS_DIRENT_TYPE) == SMARTFS_DIRENT_TYPE_FILE) - { - dirsector = - smartfs_rdle16(&entry->firstsector); #else if ((entry->flags & SMARTFS_DIRENT_TYPE) == SMARTFS_DIRENT_TYPE_FILE) +#endif { +#ifdef CONFIG_SMARTFS_ALIGNED_ACCESS + dirsector = + smartfs_rdle16(&entry->firstsector); +#else dirsector = entry->firstsector; #endif readwrite.count =