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

5 files changed, 257 insertions, 18 deletions

diff --git a/os/io/platforms/STM32/spi_lld.c b/os/io/platforms/STM32/spi_lld.c
new file mode 100644
index 000000000..4ef99e1ed
--- /dev/null
+++ b/os/io/platforms/STM32/spi_lld.c
@@ -0,0 +1,86 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+ * @file templates/spi_lld.c

+ * @brief SPI Driver subsystem low level driver source template

+ * @addtogroup SPI_LLD

+ * @{

+ */

+

+#include <ch.h>

+#include <spi.h>

+

+/**

+ * @brief Low level SPI driver initialization.
+ */

+void spi_lld_init(void) {

+

+}

+

+/**

+ * @brief Low level SPI bus setup.

+ *
+ * @param[in] spip pointer to the @p SPIDriver object

+ */

+void spi_lld_setup(SPIDriver *spip) {

+

+}

+

+/**

+ * @brief Asserts the chip select signal and prepares for transfers.

+ *

+ * @param[in] spip pointer to the @p SPIDriver object

+ */

+void spi_lld_select(SPIDriver *spip) {

+

+}

+

+/**

+ * @brief De-asserts the chip select signal.

+ * @details The previously selected peripheral is unselected.

+ *

+ * @param[in] spip pointer to the @p SPIDriver object

+ */

+void spi_lld_unselect(SPIDriver *spip) {

+

+}

+

+/**

+ * @brief Exchanges data on the SPI bus.

+ * @details This function performs a simultaneous transmit/receive operation.

+ *

+ * @param[in] spip pointer to the @p SPIDriver object

+ * @param n number of words to be exchanged

+ * @param rxbuf the pointer to the receive buffer, if @p NULL is specified then

+ *              the input data is discarded.

+ *              Note that the buffer is organized as an uint8_t array for

+ *              data sizes below or equal to 8 bits else it is organized as

+ *              an uint16_t array.

+ * @param txbuf the pointer to the transmit buffer, if @p NULL is specified all

+ *              ones are transmitted.

+ *              Note that the buffer is organized as an uint8_t array for

+ *              data sizes below or equal to 8 bits else it is organized as

+ *              an uint16_t array.

+ */

+void spi_lld_exchange(SPIDriver *spip, size_t n, void *rxbuf, void *txbuf) {

+

+}

+

+/** @} */

diff --git a/os/io/platforms/STM32/spi_lld.h b/os/io/platforms/STM32/spi_lld.h
new file mode 100644
index 000000000..26a70d0a4
--- /dev/null
+++ b/os/io/platforms/STM32/spi_lld.h
@@ -0,0 +1,112 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2007 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+ * @file templates/spi_lld.h

+ * @brief SPI Driver subsystem low level driver header template

+ * @addtogroup SPI_LLD

+ * @{

+ */

+

+#ifndef _SPI_LLD_H_

+#define _SPI_LLD_H_

+

+/*===========================================================================*/

+/* Driver pre-compile time settings.                                         */

+/*===========================================================================*/

+

+/**

+ * @brief Enables the mutual exclusion APIs on the SPI bus.
+ */

+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

+#define SPI_USE_MUTUAL_EXCLUSION    TRUE

+#endif

+

+#if SPI_USE_MUTUAL_EXCLUSION && !CH_USE_MUTEXES && !CH_USE_SEMAPHORES

+#error "SPI_USE_MUTUAL_EXCLUSION requires CH_USE_MUTEXES and/or CH_USE_SEMAPHORES"

+#endif

+

+/*===========================================================================*/

+/* Driver data structures and types.                                         */

+/*===========================================================================*/

+

+/**

+ * @brief Driver state machine possible states.
+ */

+typedef enum {

+  SPI_UNINIT = 0,//!< SPI_UNINIT

+  SPI_IDLE = 1,  //!< SPI_IDLE

+  SPI_ACTIVE = 2 //!< SPI_ACTIVE

+} spistate_t;

+

+/**

+ * @brief Driver configuration structure.
+ */

+typedef struct {

+  /**

+   * @brief Clock pulses to be generated after initialization.

+   */

+  cnt_t                 spc_clkpulses;

+  /* End of the mandatory fields.*/

+} SPIConfig;

+

+/**

+ * @brief Structure representing a MAC driver.

+ */

+typedef struct {

+  /**

+   * @brief Driver state.
+   */

+  spistate_t            spd_state;

+#if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)

+#if CH_USE_MUTEXES || defined(__DOXYGEN__)

+  /**

+   * @brief Mutex protecting the bus.

+   */

+  Mutex                 spd_mutex;

+#elif CH_USE_SEMAPHORES

+  Semaphore             spd_semaphore;

+#endif

+#endif /* SPI_USE_MUTUAL_EXCLUSION */

+  /**

+   * Current configuration data.

+   */

+  const SPIConfig       *spd_config;

+  /* End of the mandatory fields.*/

+} SPIDriver;

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void spi_lld_init(void);

+  void spi_lld_setup(SPIDriver *spip);

+  void spi_lld_select(SPIDriver *spip);

+  void spi_lld_unselect(SPIDriver *spip);

+  void spi_lld_exchange(SPIDriver *spip, size_t n, void *rxbuf, void *txbuf);

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* _SPI_LLD_H_ */

+

+/** @} */

diff --git a/os/io/spi.c b/os/io/spi.c
index 7060c693d..2ea8f8909 100644
--- a/os/io/spi.c
+++ b/os/io/spi.c
@@ -27,17 +27,6 @@
 #include <ch.h>

 #include <spi.h>

 

-/*

- * The following macros are used to enforce a correct sequence of operations

- * when the OS asserts are enabled. The overhead is removed when not in debug

- * mode.
- */

-#ifdef CH_DBG_ENABLE_ASSERTS

-#define SPI_SET_STATE(spip, sts) (spip)->spd_state = (sts)

-#else

-#define SPI_SET_STATE(spip, sts)

-#endif

-

 /**

  * @brief SPI Driver initialization.

  */

@@ -53,7 +42,7 @@ void spiInit(void) {
  */

 void spiObjectInit(SPIDriver *spip) {

 

-  SPI_SET_STATE(spip, SPI_IDLE);

+  spip->spd_state = SPI_IDLE;

 #if CH_USE_MUTEXES

   chMtxInit(&spip->spd_mutex);

 #elif CH_USE_SEMAPHORES

@@ -80,10 +69,8 @@ void spiSetup(SPIDriver *spip, const SPIConfig *config) {
 

 /**

  * @brief Asserts the chip select signal and prepares for transfers.

- * @details The SPI bus is configured and a peripheral selected.

  *
  * @param[in] spip pointer to the @p SPIDriver object

- * @param config pointer to the @p SPIConfig object
  */

 void spiSelect(SPIDriver *spip) {

 

@@ -94,7 +81,7 @@ void spiSelect(SPIDriver *spip) {
               "not idle");

 

   spi_lld_select(spip);

-  SPI_SET_STATE(spip, SPI_ACTIVE);

+  spip->spd_state = SPI_ACTIVE;

   chSysUnlock();

 }

 

@@ -113,7 +100,7 @@ void spiUnselect(SPIDriver *spip) {
               "not locked");

 

   spi_lld_unselect(spip);

-  SPI_SET_STATE(spip, SPI_IDLE);

+  spip->spd_state = SPI_IDLE;

   chSysUnlock();

 }

 

@@ -174,6 +161,7 @@ void spiAcquireBus(SPIDriver *spip) {
 void spiReleaseBus(SPIDriver *spip) {

 

 #if CH_USE_MUTEXES

+  (void)spip;

   chMtxUnlock();

 #elif CH_USE_SEMAPHORES

   chSemSignal(&spip->spd_semaphore);

diff --git a/os/io/templates/spi_lld.c b/os/io/templates/spi_lld.c
index 172edbc07..4ef99e1ed 100644
--- a/os/io/templates/spi_lld.c
+++ b/os/io/templates/spi_lld.c
@@ -27,5 +27,60 @@
 #include <ch.h>

 #include <spi.h>

 

+/**

+ * @brief Low level SPI driver initialization.
+ */

+void spi_lld_init(void) {

+

+}

+

+/**

+ * @brief Low level SPI bus setup.

+ *
+ * @param[in] spip pointer to the @p SPIDriver object

+ */

+void spi_lld_setup(SPIDriver *spip) {

+

+}

+

+/**

+ * @brief Asserts the chip select signal and prepares for transfers.

+ *

+ * @param[in] spip pointer to the @p SPIDriver object

+ */

+void spi_lld_select(SPIDriver *spip) {

+

+}

+

+/**

+ * @brief De-asserts the chip select signal.

+ * @details The previously selected peripheral is unselected.

+ *

+ * @param[in] spip pointer to the @p SPIDriver object

+ */

+void spi_lld_unselect(SPIDriver *spip) {

+

+}

+

+/**

+ * @brief Exchanges data on the SPI bus.

+ * @details This function performs a simultaneous transmit/receive operation.

+ *

+ * @param[in] spip pointer to the @p SPIDriver object

+ * @param n number of words to be exchanged

+ * @param rxbuf the pointer to the receive buffer, if @p NULL is specified then

+ *              the input data is discarded.

+ *              Note that the buffer is organized as an uint8_t array for

+ *              data sizes below or equal to 8 bits else it is organized as

+ *              an uint16_t array.

+ * @param txbuf the pointer to the transmit buffer, if @p NULL is specified all

+ *              ones are transmitted.

+ *              Note that the buffer is organized as an uint8_t array for

+ *              data sizes below or equal to 8 bits else it is organized as

+ *              an uint16_t array.

+ */

+void spi_lld_exchange(SPIDriver *spip, size_t n, void *rxbuf, void *txbuf) {

+

+}

 

 /** @} */

diff --git a/os/io/templates/spi_lld.h b/os/io/templates/spi_lld.h
index 8b17ace1a..26a70d0a4 100644
--- a/os/io/templates/spi_lld.h
+++ b/os/io/templates/spi_lld.h
@@ -70,12 +70,10 @@ typedef struct {
  * @brief Structure representing a MAC driver.

  */

 typedef struct {

-#if CH_DBG_ENABLE_ASSERTS || defined(__DOXYGEN__)

   /**

    * @brief Driver state.
    */

   spistate_t            spd_state;

-#endif /* CH_DBG_ENABLE_ASSERTS */

 #if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)

 #if CH_USE_MUTEXES || defined(__DOXYGEN__)

   /**