From 0cdde1845d6775cde50668ded358f346930eab37 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 15 May 2016 08:34:54 +0000
Subject: QSPI driver worked on a simple test case.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9484 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/src/hal.c      |  3 +++
 os/hal/src/hal_qspi.c | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'os/hal/src')

diff --git a/os/hal/src/hal.c b/os/hal/src/hal.c
index 04cd0b2c5..583702bdc 100644
--- a/os/hal/src/hal.c
+++ b/os/hal/src/hal.c
@@ -94,6 +94,9 @@ void halInit(void) {
 #if (HAL_USE_PWM == TRUE) || defined(__DOXYGEN__)
   pwmInit();
 #endif
+#if (HAL_USE_QSPI == TRUE) || defined(__DOXYGEN__)
+  qspiInit();
+#endif
 #if (HAL_USE_SERIAL == TRUE) || defined(__DOXYGEN__)
   sdInit();
 #endif
diff --git a/os/hal/src/hal_qspi.c b/os/hal/src/hal_qspi.c
index 6fdb0c3a0..240e1b93e 100644
--- a/os/hal/src/hal_qspi.c
+++ b/os/hal/src/hal_qspi.c
@@ -137,7 +137,7 @@ void qspiStartCommand(QSPIDriver *qspip, const qspi_command_t *cmdp) {
 
   osalSysLock();
   osalDbgAssert(qspip->state == QSPI_READY, "not ready");
-  qspiStartCommandI(qspip, cmd);
+  qspiStartCommandI(qspip, cmdp);
   osalSysUnlock();
 }
 
@@ -160,7 +160,7 @@ void qspiStartSend(QSPIDriver *qspip, const qspi_command_t *cmdp,
 
   osalSysLock();
   osalDbgAssert(qspip->state == QSPI_READY, "not ready");
-  qspiStartSendI(qspip, cmd, n, txbuf);
+  qspiStartSendI(qspip, cmdp, n, txbuf);
   osalSysUnlock();
 }
 
@@ -183,7 +183,7 @@ void qspiStartReceive(QSPIDriver *qspip, const qspi_command_t *cmdp,
 
   osalSysLock();
   osalDbgAssert(qspip->state == QSPI_READY, "not ready");
-  qspiStartReceiveI(qspip, cmd, n, rxbuf);
+  qspiStartReceiveI(qspip, cmdp, n, rxbuf);
   osalSysUnlock();
 }
 
@@ -196,7 +196,7 @@ void qspiStartReceive(QSPIDriver *qspip, const qspi_command_t *cmdp,
  *          without callbacks (@p end_cb = @p NULL).
  *
  * @param[in] qspip     pointer to the @p QSPIDriver object
- * @param[in] cmd       pointer to the command descriptor
+ * @param[in] cmdp      pointer to the command descriptor
  *
  * @api
  */
@@ -207,7 +207,7 @@ void qspiCommand(QSPIDriver *qspip, const qspi_command_t *cmdp) {
   osalSysLock();
   osalDbgAssert(qspip->state == QSPI_READY, "not ready");
   osalDbgAssert(qspip->config->end_cb == NULL, "has callback");
-  qspiStartCommandI(qspip, cmd, n, txbuf);
+  qspiStartCommandI(qspip, cmdp);
   (void) osalThreadSuspendS(&qspip->thread);
   osalSysUnlock();
 }
@@ -220,7 +220,7 @@ void qspiCommand(QSPIDriver *qspip, const qspi_command_t *cmdp) {
  *          without callbacks (@p end_cb = @p NULL).
  *
  * @param[in] qspip     pointer to the @p QSPIDriver object
- * @param[in] cmd       pointer to the command descriptor
+ * @param[in] cmdp      pointer to the command descriptor
  * @param[in] n         number of bytes to send
  * @param[in] txbuf     the pointer to the transmit buffer
  *
@@ -235,7 +235,7 @@ void qspiSend(QSPIDriver *qspip, const qspi_command_t *cmdp,
   osalSysLock();
   osalDbgAssert(qspip->state == QSPI_READY, "not ready");
   osalDbgAssert(qspip->config->end_cb == NULL, "has callback");
-  qspiStartSendI(qspip, cmd, n, txbuf);
+  qspiStartSendI(qspip, cmdp, n, txbuf);
   (void) osalThreadSuspendS(&qspip->thread);
   osalSysUnlock();
 }
@@ -248,7 +248,7 @@ void qspiSend(QSPIDriver *qspip, const qspi_command_t *cmdp,
  *          without callbacks (@p end_cb = @p NULL).
  *
  * @param[in] qspip     pointer to the @p QSPIDriver object
- * @param[in] cmd       pointer to the command descriptor
+ * @param[in] cmdp      pointer to the command descriptor
  * @param[in] n         number of bytes to send
  * @param[out] rxbuf    the pointer to the receive buffer
  *
@@ -263,7 +263,7 @@ void qspiReceive(QSPIDriver *qspip, const qspi_command_t *cmdp,
   osalSysLock();
   osalDbgAssert(qspip->state == QSPI_READY, "not ready");
   osalDbgAssert(qspip->config->end_cb == NULL, "has callback");
-  qspiStartReceiveI(qspip, cmd, n, rxbuf);
+  qspiStartReceiveI(qspip, cmdp, n, rxbuf);
   (void) osalThreadSuspendS(&qspip->thread);
   osalSysUnlock();
 }
-- 
cgit v1.2.3