Flash driver works.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9454 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 60 insertions, 13 deletions

diff --git a/os/ex/Micron/n25q128.c b/os/ex/Micron/n25q128.c
index 57ff6df5e..b6a00170a 100644
--- a/os/ex/Micron/n25q128.c
+++ b/os/ex/Micron/n25q128.c
@@ -110,10 +110,10 @@ static flash_error_t flash_poll_status(N25Q128Driver *devp) {
 #endif
     /* Read status command.*/
     spiSelect(spip);
-    flash_send_cmd(devp, N25Q128_CMD_READ_STATUS_REGISTER);
+    flash_send_cmd(devp, N25Q128_CMD_READ_FLAG_STATUS_REGISTER);
     spiReceive(spip, 1, &sts);
     spiUnselect(spip);
-  } while ((sts & N25Q128_STS_BUSY) != 0U);
+  } while ((sts & N25Q128_STS_BUSY) == 0U);
 
   /* Checking for errors.*/
   if ((sts & N25Q128_STS_ALL_ERRORS) != 0U) {
@@ -202,7 +202,6 @@ static flash_error_t erase_sectors(void *instance,
     spiUnselect(spip);
     (void) spiPolledExchange(spip, 0xFF);   /* One frame delay.*/
 
-
     /* Sub-sector erase command.*/
     spiSelect(spip);
     flash_send_cmd_addr(devp, N25Q128_CMD_SUBSECTOR_ERASE, addr);
@@ -362,7 +361,7 @@ static flash_error_t read(void *instance, flash_address_t addr,
  *
  * @init
  */
-void n15q128ObjectInit(N25Q128Driver *devp) {
+void n25q128ObjectInit(N25Q128Driver *devp) {
 
   osalDbgCheck(devp != NULL);
 
@@ -379,15 +378,28 @@ void n15q128ObjectInit(N25Q128Driver *devp) {
  *
  * @api
  */
-void n15q128Start(N25Q128Driver *devp, const N25Q128Config *config) {
+void n25q128Start(N25Q128Driver *devp, const N25Q128Config *config) {
 
   osalDbgCheck((devp != NULL) && (config != NULL));
   osalDbgAssert(devp->state != FLASH_UNINIT, "invalid state");
 
   if (devp->state == FLASH_STOP) {
-#if N25Q128_SHARED_SPI == FALSE
+    SPIDriver *spip = config->spip;
+
+    devp->config = config;
     spiStart(devp->config->spip, devp->config->spicfg);
-#endif
+
+    /* Reset Enable command.*/
+    spiSelect(spip);
+    flash_send_cmd(devp, N25Q128_CMD_RESET_ENABLE);
+    spiUnselect(spip);
+
+    (void) spiPolledExchange(spip, 0xFF);   /* One frame delay.*/
+
+    /* Reset Memory command.*/
+    spiSelect(spip);
+    flash_send_cmd(devp, N25Q128_CMD_RESET_MEMORY);
+    spiUnselect(spip);
     devp->state = FLASH_READY;
   }
 } 
@@ -399,7 +411,7 @@ void n15q128Start(N25Q128Driver *devp, const N25Q128Config *config) {
  *
  * @api
  */
-void n15q128Stop(N25Q128Driver *devp) {
+void n25q128Stop(N25Q128Driver *devp) {
   SPIDriver *spip = devp->config->spip;
 
   osalDbgCheck(devp != NULL);
@@ -411,6 +423,7 @@ void n15q128Stop(N25Q128Driver *devp) {
 #endif
 
     spiStop(spip);
+    devp->config = NULL;
     devp->state = FLASH_STOP;
 
 #if N25Q128_SHARED_SPI == TRUE
@@ -419,4 +432,37 @@ void n15q128Stop(N25Q128Driver *devp) {
   }
 }
 
+/**
+ * @brief   Reads the device identifier.
+ *
+ * @param[in] devp      pointer to the @p N25Q128Driver object
+ * @param[in] rp        pointer to the read buffer
+ * @param[in] n         number of bytes to read (1..17)
+ *
+ * @api
+ */
+void n25q128ReadId(N25Q128Driver *devp, uint8_t *rp, size_t n) {
+  SPIDriver *spip = devp->config->spip;
+
+  osalDbgCheck((devp != NULL) && (rp != NULL) && (n > 0U) && (n <= 17U));
+  osalDbgAssert(devp->state == FLASH_READY, "invalid state");
+
+#if N25Q128_SHARED_SPI == TRUE
+  spiAcquireBus(spip);
+  spiStart(spip, devp->config->spicfg);
+#endif
+  devp->state = FLASH_ACTIVE;
+
+  /* Read Id command.*/
+  spiSelect(spip);
+  flash_send_cmd(devp, N25Q128_CMD_READ_ID);
+  spiReceive(spip, n, rp);
+  spiUnselect(spip);
+
+  devp->state = FLASH_READY;
+#if N25Q128_SHARED_SPI == TRUE
+  spiReleaseBus(spip);
+#endif
+}
+
 /** @} */
diff --git a/os/ex/Micron/n25q128.h b/os/ex/Micron/n25q128.h
index b86cfefc7..bcd1ff97b 100644
--- a/os/ex/Micron/n25q128.h
+++ b/os/ex/Micron/n25q128.h
@@ -189,9 +189,10 @@ typedef struct {
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void n15q128ObjectInit(N25Q128Driver *devp);
-  void n15q128Start(N25Q128Driver *devp, const N25Q128Config *config);
-  void n15q128Stop(N25Q128Driver *devp);
+  void n25q128ObjectInit(N25Q128Driver *devp);
+  void n25q128Start(N25Q128Driver *devp, const N25Q128Config *config);
+  void n25q128Stop(N25Q128Driver *devp);
+  void n25q128ReadId(N25Q128Driver *devp, uint8_t *rp, size_t n);
 #ifdef __cplusplus
 }
 #endif
diff --git a/os/hal/lib/peripherals/flash/hal_flash.h b/os/hal/lib/peripherals/flash/hal_flash.h
index 3544b328f..722326607 100644
--- a/os/hal/lib/peripherals/flash/hal_flash.h
+++ b/os/hal/lib/peripherals/flash/hal_flash.h
@@ -255,7 +255,7 @@ typedef struct {
  *

  * @api

  */

-#define flashProgram(ip)                                                    \

+#define flashProgram(ip, addr, pp, n)                                       \

   (ip)->vmt_baseflash->program(ip, addr, pp, n)

 

 /**

@@ -269,7 +269,7 @@ typedef struct {
  *

  * @api

  */

-#define flashRead(ip)                                                       \

+#define flashRead(ip, addr, rp, n)                                          \

   (ip)->vmt_baseflash->read(ip, addr, rp, n)

 

 /** @} */