You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2022/01/06 07:06:27 UTC

[GitHub] [incubator-nuttx] xiaoxiang781216 opened a new pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

xiaoxiang781216 opened a new pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179


   ## Summary
   since it's common implementation can be used in other arch too
   
   ## Impact
   Minor, reorganize the layout
   
   ## Testing
   Pass CI
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179#discussion_r779530236



##########
File path: arch/sim/src/sim/up_initialize.c
##########
@@ -125,12 +128,12 @@ static void up_init_smartfs(void)
         }
     }
 #endif
-#endif      /* CONFIG_SIM_SPIFLASH */
+#endif      /* CONFIG_SPI_FLASH */

Review comment:
       Done.

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);

Review comment:
       Done.

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);

Review comment:
       Done.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179#discussion_r779989451



##########
File path: drivers/spi/spi_flash.c
##########
@@ -642,15 +635,15 @@ static void spiflash_sectorerase(FAR struct sim_spiflashdev_s *priv)
   if (priv->wren)
     {
       address = priv->address;
-      if (priv->last_cmd == SPIFLASH_SE)
+      if (priv->last_cmd == SPI_FLASH_SE)
         {
-          address &= CONFIG_SIM_SPIFLASH_SECTORSIZE_MASK;
-          len = CONFIG_SIM_SPIFLASH_SECTORSIZE;
+          address &= CONFIG_SPI_FLASH_SECTORSIZE_MASK;
+          len = CONFIG_SPI_FLASH_SECTORSIZE;
         }
-      else if (priv->last_cmd == SPIFLASH_SSE)
+      else if (priv->last_cmd == SPI_FLASH_SSE)
         {
-          address &= CONFIG_SIM_SPIFLASH_SUBSECTORSIZE_MASK;
-          len = CONFIG_SIM_SPIFLASH_SUBSECTORSIZE;
+          address &= CONFIG_SPI_FLASH_SUBSECTORSIZE_MASK;
+          len = CONFIG_SPI_FLASH_SUBSECTORSIZE;
         }

Review comment:
       Done, but I skip the check before memset since memset will take care this special case.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] pkarashchenko commented on a change in pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
pkarashchenko commented on a change in pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179#discussion_r779927647



##########
File path: drivers/spi/spi_flash.c
##########
@@ -642,15 +635,15 @@ static void spiflash_sectorerase(FAR struct sim_spiflashdev_s *priv)
   if (priv->wren)
     {
       address = priv->address;
-      if (priv->last_cmd == SPIFLASH_SE)
+      if (priv->last_cmd == SPI_FLASH_SE)
         {
-          address &= CONFIG_SIM_SPIFLASH_SECTORSIZE_MASK;
-          len = CONFIG_SIM_SPIFLASH_SECTORSIZE;
+          address &= CONFIG_SPI_FLASH_SECTORSIZE_MASK;
+          len = CONFIG_SPI_FLASH_SECTORSIZE;
         }
-      else if (priv->last_cmd == SPIFLASH_SSE)
+      else if (priv->last_cmd == SPI_FLASH_SSE)
         {
-          address &= CONFIG_SIM_SPIFLASH_SUBSECTORSIZE_MASK;
-          len = CONFIG_SIM_SPIFLASH_SUBSECTORSIZE;
+          address &= CONFIG_SPI_FLASH_SUBSECTORSIZE_MASK;
+          len = CONFIG_SPI_FLASH_SUBSECTORSIZE;
         }

Review comment:
       ```suggestion
           }
         else
           {
             len = 0;
           }
   
           if (len > 0)
             {
                /*​ Now perform the erase ​*/ 
     
    ​     ​       memset​(&priv->​data​[address], ​0xff​, len);
             }
   ```
   




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179#discussion_r779530569



##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);
-static int         qspiflash_memory(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_memory(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_meminfo_s *mem);

Review comment:
       Done.

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);
-static int         qspiflash_memory(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_memory(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_meminfo_s *mem);
-static FAR void   *qspiflash_alloc(FAR struct qspi_dev_s *dev,
+static FAR void   *qspi_flash_alloc(FAR struct qspi_dev_s *dev,
                                    size_t buflen);
-static void        qspiflash_free(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_free(FAR struct qspi_dev_s *dev,
                                   FAR void *buffer);

Review comment:
       Done.

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -532,23 +525,23 @@ static int qspiflash_command(FAR struct qspi_dev_s *dev,
         {
           /* Write data operation */
 
-          qspiflash_writeword(priv, cmdinfo->cmd, cmdinfo);
+          qspi_flash_writeword(priv, cmdinfo->cmd, cmdinfo);
         }
       else
         {
           /* Read data operation */
 
           switch (cmdinfo->cmd)
           {
-            case QSPIFLASH_ID:
-              p_buf[0] = CONFIG_SIM_QSPIFLASH_MANUFACTURER;
-              p_buf[1] = CONFIG_SIM_QSPIFLASH_MEMORY_TYPE;
-              p_buf[2] = CONFIG_QSPIFLASH_CAPACITY;
+            case QSPI_FLASH_ID:
+              p_buf[0] = CONFIG_QSPI_FLASH_MANUFACTURER;
+              p_buf[1] = CONFIG_QSPI_FLASH_MEMORY_TYPE;
+              p_buf[2] = CONFIG_QSPI_FLASH_CAPACITY;
               break;
 
-            case QSPIFLASH_RDSR:
+            case QSPI_FLASH_RDSR:
               if (priv->wren == 1)
-                  p_buf[0] = QSPIFLASH_WREN_SET;
+                  p_buf[0] = QSPI_FLASH_WREN_SET;
               else
                   p_buf[0] = 0;

Review comment:
       Done.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] pkarashchenko commented on a change in pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
pkarashchenko commented on a change in pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179#discussion_r779503516



##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);

Review comment:
       ```suggestion
                                              uint32_t frequency);
   ```

##########
File path: arch/sim/src/sim/up_initialize.c
##########
@@ -125,12 +128,12 @@ static void up_init_smartfs(void)
         }
     }
 #endif
-#endif      /* CONFIG_SIM_SPIFLASH */
+#endif      /* CONFIG_SPI_FLASH */

Review comment:
       ```suggestion
   #endif /* CONFIG_SPI_FLASH */
   ```

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);
-static int         qspiflash_memory(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_memory(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_meminfo_s *mem);

Review comment:
       ```suggestion
                                        FAR struct qspi_meminfo_s *mem);
   ```

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);
-static int         qspiflash_memory(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_memory(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_meminfo_s *mem);
-static FAR void   *qspiflash_alloc(FAR struct qspi_dev_s *dev,
+static FAR void   *qspi_flash_alloc(FAR struct qspi_dev_s *dev,
                                    size_t buflen);

Review comment:
       ```suggestion
                                       size_t buflen);
   ```

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);
-static int         qspiflash_memory(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_memory(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_meminfo_s *mem);
-static FAR void   *qspiflash_alloc(FAR struct qspi_dev_s *dev,
+static FAR void   *qspi_flash_alloc(FAR struct qspi_dev_s *dev,
                                    size_t buflen);
-static void        qspiflash_free(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_free(FAR struct qspi_dev_s *dev,
                                   FAR void *buffer);

Review comment:
       ```suggestion
                                      FAR void *buffer);
   ```

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);
-static int         qspiflash_memory(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_memory(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_meminfo_s *mem);
-static FAR void   *qspiflash_alloc(FAR struct qspi_dev_s *dev,
+static FAR void   *qspi_flash_alloc(FAR struct qspi_dev_s *dev,
                                    size_t buflen);
-static void        qspiflash_free(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_free(FAR struct qspi_dev_s *dev,
                                   FAR void *buffer);
 
-static void qspiflash_writeword(FAR struct sim_qspiflashdev_s *priv,
+static void qspi_flash_writeword(FAR struct qspi_flashdev_s *priv,
                     uint16_t data, FAR struct qspi_cmdinfo_s *cmdinfo);

Review comment:
       ```suggestion
                                    uint16_t data,
                                    FAR struct qspi_cmdinfo_s *cmdinfo);
   ```

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);

Review comment:
       ```suggestion
                                         enum qspi_mode_e mode);
   ```

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);

Review comment:
       ```suggestion
                                         FAR struct qspi_cmdinfo_s *cmd);
   ```

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -532,23 +525,23 @@ static int qspiflash_command(FAR struct qspi_dev_s *dev,
         {
           /* Write data operation */
 
-          qspiflash_writeword(priv, cmdinfo->cmd, cmdinfo);
+          qspi_flash_writeword(priv, cmdinfo->cmd, cmdinfo);
         }
       else
         {
           /* Read data operation */
 
           switch (cmdinfo->cmd)
           {
-            case QSPIFLASH_ID:
-              p_buf[0] = CONFIG_SIM_QSPIFLASH_MANUFACTURER;
-              p_buf[1] = CONFIG_SIM_QSPIFLASH_MEMORY_TYPE;
-              p_buf[2] = CONFIG_QSPIFLASH_CAPACITY;
+            case QSPI_FLASH_ID:
+              p_buf[0] = CONFIG_QSPI_FLASH_MANUFACTURER;
+              p_buf[1] = CONFIG_QSPI_FLASH_MEMORY_TYPE;
+              p_buf[2] = CONFIG_QSPI_FLASH_CAPACITY;
               break;
 
-            case QSPIFLASH_RDSR:
+            case QSPI_FLASH_RDSR:
               if (priv->wren == 1)
-                  p_buf[0] = QSPIFLASH_WREN_SET;
+                  p_buf[0] = QSPI_FLASH_WREN_SET;
               else
                   p_buf[0] = 0;

Review comment:
       ```suggestion
                 p_buf[0] = (priv->wren == 1) ? QSPI_FLASH_WREN_SET : 0;
   ```




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] xiaoxiang781216 commented on pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179#issuecomment-1006803230


   @pkarashchenko the new patch is used to verify the change work.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179#discussion_r779530975



##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);
-static int         qspiflash_memory(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_memory(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_meminfo_s *mem);
-static FAR void   *qspiflash_alloc(FAR struct qspi_dev_s *dev,
+static FAR void   *qspi_flash_alloc(FAR struct qspi_dev_s *dev,
                                    size_t buflen);

Review comment:
       Done.

##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);
-static void        qspiflash_setbits(FAR struct qspi_dev_s *dev, int nbits);
-static int         qspiflash_command(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setbits(FAR struct qspi_dev_s *dev, int nbits);
+static int         qspi_flash_command(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_cmdinfo_s *cmd);
-static int         qspiflash_memory(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_memory(FAR struct qspi_dev_s *dev,
                      FAR struct qspi_meminfo_s *mem);
-static FAR void   *qspiflash_alloc(FAR struct qspi_dev_s *dev,
+static FAR void   *qspi_flash_alloc(FAR struct qspi_dev_s *dev,
                                    size_t buflen);
-static void        qspiflash_free(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_free(FAR struct qspi_dev_s *dev,
                                   FAR void *buffer);
 
-static void qspiflash_writeword(FAR struct sim_qspiflashdev_s *priv,
+static void qspi_flash_writeword(FAR struct qspi_flashdev_s *priv,
                     uint16_t data, FAR struct qspi_cmdinfo_s *cmdinfo);

Review comment:
       Done.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [incubator-nuttx] xiaoxiang781216 commented on a change in pull request #5179: arch/sim: Move spiflash simulation to drivers/spi instead

Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 commented on a change in pull request #5179:
URL: https://github.com/apache/incubator-nuttx/pull/5179#discussion_r779531126



##########
File path: drivers/spi/qspi_flash.c
##########
@@ -178,22 +171,22 @@ struct sim_qspiflashdev_s
 
 /* QSPI methods */
 
-static int         qspiflash_lock(FAR struct qspi_dev_s *dev, bool lock);
-static uint32_t    qspiflash_setfrequency(FAR struct qspi_dev_s *dev,
+static int         qspi_flash_lock(FAR struct qspi_dev_s *dev, bool lock);
+static uint32_t    qspi_flash_setfrequency(FAR struct qspi_dev_s *dev,
                      uint32_t frequency);
-static void        qspiflash_setmode(FAR struct qspi_dev_s *dev,
+static void        qspi_flash_setmode(FAR struct qspi_dev_s *dev,
                      enum qspi_mode_e mode);

Review comment:
       Done.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org