I2C. Merged code from trunk.

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

9 files changed, 81 insertions, 71 deletions

diff --git a/os/hal/platforms/STM8S/hal_lld.c b/os/hal/platforms/STM8S/hal_lld.c
index de32cfb44..75772a3af 100644
--- a/os/hal/platforms/STM8S/hal_lld.c
+++ b/os/hal/platforms/STM8S/hal_lld.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/hal/platforms/STM8S/hal_lld.h b/os/hal/platforms/STM8S/hal_lld.h
index 1db8a742c..a57da439a 100644
--- a/os/hal/platforms/STM8S/hal_lld.h
+++ b/os/hal/platforms/STM8S/hal_lld.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -202,7 +203,7 @@
 /**

  * @brief   CPU clock.

  * @details On the STM8SS the CPU clock can be programmed to be a fraction of

- *          the system clock.
+ *          the system clock.

  */

 #define CPUCLK                      (SYSCLK / (1 << STM8S_CPU_DIVIDER))

 

diff --git a/os/hal/platforms/STM8S/pal_lld.c b/os/hal/platforms/STM8S/pal_lld.c
index feb9c33cf..0a9b26657 100644
--- a/os/hal/platforms/STM8S/pal_lld.c
+++ b/os/hal/platforms/STM8S/pal_lld.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/hal/platforms/STM8S/pal_lld.h b/os/hal/platforms/STM8S/pal_lld.h
index 65f4584de..ef69d1379 100644
--- a/os/hal/platforms/STM8S/pal_lld.h
+++ b/os/hal/platforms/STM8S/pal_lld.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -159,7 +160,7 @@ typedef GPIO_TypeDef *ioportid_t;
  *

  * @notapi

  */

-#define pal_lld_init(config)    *IOPORTS = *(config)

+#define pal_lld_init(config) (*IOPORTS = *(config))

 

 /**

  * @brief   Reads the physical I/O port states.

@@ -199,7 +200,6 @@ typedef GPIO_TypeDef *ioportid_t;
  */

 #define pal_lld_writeport(port, bits) ((port)->ODR = (bits))

 

-

 /**

  * @brief   Pads group mode setup.

  * @details This function programs a pads group belonging to the same port

@@ -215,7 +215,7 @@ typedef GPIO_TypeDef *ioportid_t;
  * @notapi

  */

 #define pal_lld_setgroupmode(port, mask, mode)                              \

-    _pal_lld_setgroupmode(port, mask, mode)

+  _pal_lld_setgroupmode(port, mask, mode)

 

 extern ROMCONST PALConfig pal_default_config;

 

diff --git a/os/hal/platforms/STM8S/platform.dox b/os/hal/platforms/STM8S/platform.dox
index d05bb4af6..8ff654170 100644
--- a/os/hal/platforms/STM8S/platform.dox
+++ b/os/hal/platforms/STM8S/platform.dox
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -40,7 +41,7 @@
  */

 

 /**

- * @defgroup STM8S_PAL STM8S GPIO Support

+ * @defgroup STM8S_PAL STM8S PAL Support

  * @details The STM8S PAL driver uses the GPIO peripherals.

  *

  * @section stm8s_pal_1 Supported HW resources

@@ -83,26 +84,7 @@
  */

 

 /**

- * @defgroup STM8S_SPI STM8S SPI Support

- * @details The SPI driver supports the STM8S SPI peripheral in an interrupt

- *          driven implementation.

- * @note    Being the SPI a fast peripheral, much care must be taken to

- *          not saturate the CPU bandwidth with an excessive IRQ rate. The

- *          maximum transfer bit rate is likely limited by the IRQ

- *          handling.

- *

- * @section stm8s_spi_1 Supported HW resources

- * - SPI.

- * .

- * @section stm8s_spi_2 STM8S SPI driver implementation features

- * - Clock stop for reduced power usage when the driver is in stop state.

- * - Fully interrupt driven.

- * .

- * @ingroup STM8S

- */

-

-/**

- * @defgroup STM8S_SERIAL STM8S UART Support (buffered)

+ * @defgroup STM8S_SERIAL STM8S Serial Support

  * @details The STM8S Serial driver uses the UART peripherals in a

  *          buffered, interrupt driven, implementation.

  *

@@ -120,3 +102,22 @@
  * .

  * @ingroup STM8S

  */

+

+/**

+ * @defgroup STM8S_SPI STM8S SPI Support

+ * @details The SPI driver supports the STM8S SPI peripheral in an interrupt

+ *          driven implementation.

+ * @note    Being the SPI a fast peripheral, much care must be taken to

+ *          not saturate the CPU bandwidth with an excessive IRQ rate. The

+ *          maximum transfer bit rate is likely limited by the IRQ

+ *          handling.

+ *

+ * @section stm8s_spi_1 Supported HW resources

+ * - SPI.

+ * .

+ * @section stm8s_spi_2 STM8S SPI driver implementation features

+ * - Clock stop for reduced power usage when the driver is in stop state.

+ * - Fully interrupt driven.

+ * .

+ * @ingroup STM8S

+ */

diff --git a/os/hal/platforms/STM8S/serial_lld.c b/os/hal/platforms/STM8S/serial_lld.c
index d5bdb96f0..50a389ab4 100644
--- a/os/hal/platforms/STM8S/serial_lld.c
+++ b/os/hal/platforms/STM8S/serial_lld.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -266,7 +267,7 @@ CH_IRQ_HANDLER(18) {
 /**

  * @brief   IRQ 20 service routine.

  *

- * @isr
+ * @isr

  */

 CH_IRQ_HANDLER(20) {

   msg_t b;

diff --git a/os/hal/platforms/STM8S/serial_lld.h b/os/hal/platforms/STM8S/serial_lld.h
index 96ac08896..fa8777bd5 100644
--- a/os/hal/platforms/STM8S/serial_lld.h
+++ b/os/hal/platforms/STM8S/serial_lld.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/hal/platforms/STM8S/spi_lld.c b/os/hal/platforms/STM8S/spi_lld.c
index c950f0bd4..57e459d80 100644
--- a/os/hal/platforms/STM8S/spi_lld.c
+++ b/os/hal/platforms/STM8S/spi_lld.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -70,12 +71,12 @@ CH_IRQ_HANDLER(10) {
      handle the case where a frame arrives immediately after reading the

      DR register.*/

   while ((SPI->SR & SPI_SR_RXNE) != 0) {

-    if (SPID1.spd_rxptr != NULL)

-       *SPID1.spd_rxptr++ = SPI->DR;

+    if (SPID1.rxptr != NULL)

+       *SPID1.rxptr++ = SPI->DR;

     else

       (void)SPI->DR;

-    if (--SPID1.spd_rxcnt == 0) {

-      chDbgAssert(SPID1.spd_txcnt == 0,

+    if (--SPID1.rxcnt == 0) {

+      chDbgAssert(SPID1.txcnt == 0,

                   "IRQ10, #1", "counter out of synch");

       /* Stops all the IRQ sources.*/

       SPI->ICR = 0;

@@ -89,8 +90,8 @@ CH_IRQ_HANDLER(10) {
   }

   /* Loading the DR register.*/

   if ((SPI->SR & SPI_SR_TXE) != 0) {

-    if (SPID1.spd_txptr != NULL)

-      SPI->DR = *SPID1.spd_txptr++;

+    if (SPID1.txptr != NULL)

+      SPI->DR = *SPID1.txptr++;

     else

       SPI->DR = 0xFF;

   }

@@ -129,8 +130,10 @@ void spi_lld_start(SPIDriver *spip) {
   CLK->PCKENR1 |= CLK_PCKENR1_SPI;              /* PCKEN11, clock source.   */

 

   /* Configuration.*/

-  SPI->CR2 = 0;

-  SPI->CR1 = spip->spd_config->spc_cr1 | SPI_CR1_MSTR | SPI_CR1_SPE;

+  SPI->CR1  = 0;

+  SPI->CR1  = spip->config->cr1 | SPI_CR1_MSTR;

+  SPI->CR2  = SPI_CR2_SSI | SPI_CR2_SSM;

+  SPI->CR1 |= SPI_CR1_SPE;

 }

 

 /**

@@ -162,7 +165,7 @@ void spi_lld_stop(SPIDriver *spip) {
  */

 void spi_lld_select(SPIDriver *spip) {

 

-  palClearPad(spip->spd_config->spc_ssport, spip->spd_config->spc_sspad);

+  palClearPad(spip->config->ssport, spip->config->sspad);

 }

 

 /**

@@ -175,7 +178,7 @@ void spi_lld_select(SPIDriver *spip) {
  */

 void spi_lld_unselect(SPIDriver *spip) {

 

-  palSetPad(spip->spd_config->spc_ssport, spip->spd_config->spc_sspad);

+  palSetPad(spip->config->ssport, spip->config->sspad);

 }

 

 /**

@@ -191,9 +194,9 @@ void spi_lld_unselect(SPIDriver *spip) {
  */

 void spi_lld_ignore(SPIDriver *spip, size_t n) {

 

-  spip->spd_rxptr = NULL;

-  spip->spd_txptr = NULL;

-  spip->spd_rxcnt = spip->spd_txcnt = n;

+  spip->rxptr = NULL;

+  spip->txptr = NULL;

+  spip->rxcnt = spip->txcnt = n;

   SPI->ICR = SPI_ICR_TXEI | SPI_ICR_RXEI | SPI_ICR_ERRIE;

 }

 

@@ -215,9 +218,9 @@ void spi_lld_ignore(SPIDriver *spip, size_t n) {
 void spi_lld_exchange(SPIDriver *spip, size_t n,

                       const void *txbuf, void *rxbuf) {

 

-  spip->spd_rxptr = rxbuf;

-  spip->spd_txptr = txbuf;

-  spip->spd_rxcnt = spip->spd_txcnt = n;

+  spip->rxptr = rxbuf;

+  spip->txptr = txbuf;

+  spip->rxcnt = spip->txcnt = n;

   SPI->ICR = SPI_ICR_TXEI | SPI_ICR_RXEI | SPI_ICR_ERRIE;

 }

 

@@ -236,9 +239,9 @@ void spi_lld_exchange(SPIDriver *spip, size_t n,
  */

 void spi_lld_send(SPIDriver *spip, size_t n, const void *txbuf) {

 

-  spip->spd_rxptr = NULL;

-  spip->spd_txptr = txbuf;

-  spip->spd_rxcnt = spip->spd_txcnt = n;

+  spip->rxptr = NULL;

+  spip->txptr = txbuf;

+  spip->rxcnt = spip->txcnt = n;

   SPI->ICR = SPI_ICR_TXEI | SPI_ICR_RXEI | SPI_ICR_ERRIE;

 }

 

@@ -257,9 +260,9 @@ void spi_lld_send(SPIDriver *spip, size_t n, const void *txbuf) {
  */

 void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {

 

-  spip->spd_rxptr = rxbuf;

-  spip->spd_txptr = NULL;

-  spip->spd_rxcnt = spip->spd_txcnt = n;

+  spip->rxptr = rxbuf;

+  spip->txptr = NULL;

+  spip->rxcnt = spip->txcnt = n;

   SPI->ICR = SPI_ICR_TXEI | SPI_ICR_RXEI | SPI_ICR_ERRIE;

 }

 

diff --git a/os/hal/platforms/STM8S/spi_lld.h b/os/hal/platforms/STM8S/spi_lld.h
index 1f665d01a..48af021b0 100644
--- a/os/hal/platforms/STM8S/spi_lld.h
+++ b/os/hal/platforms/STM8S/spi_lld.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -87,20 +88,20 @@ typedef struct {
   /**

    * @brief Operation complete callback or @p NULL.

    */

-  spicallback_t         spc_endcb;

+  spicallback_t         end_cb;

   /* End of the mandatory fields.*/

   /**

    * @brief The chip select line port.

    */

-  ioportid_t            spc_ssport;

+  ioportid_t            ssport;

   /**

    * @brief The chip select line pad number.

    */

-  uint16_t              spc_sspad;

+  uint16_t              sspad;

   /**

    * @brief SPI initialization data.

    */

-  uint8_t               spc_cr1;

+  uint8_t               cr1;

 } SPIConfig;

 

 /**

@@ -110,25 +111,25 @@ struct SPIDriver {
   /**

    * @brief Driver state.

    */

-  spistate_t            spd_state;

+  spistate_t            state;

   /**

    * @brief Current configuration data.

    */

-  const SPIConfig       *spd_config;

+  const SPIConfig       *config;

 #if SPI_USE_WAIT || defined(__DOXYGEN__)

   /**

    * @brief Waiting thread.

    */

-  Thread                *spd_thread;

+  Thread                *thread;

 #endif /* SPI_USE_WAIT */

 #if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)

 #if CH_USE_MUTEXES || defined(__DOXYGEN__)

   /**

    * @brief Mutex protecting the bus.

    */

-  Mutex                 spd_mutex;

+  Mutex                 mutex;

 #elif CH_USE_SEMAPHORES

-  Semaphore             spd_semaphore;

+  Semaphore             semaphore;

 #endif

 #endif /* SPI_USE_MUTUAL_EXCLUSION */

 #if defined(SPI_DRIVER_EXT_FIELDS)

@@ -136,21 +137,21 @@ struct SPIDriver {
 #endif

   /* End of the mandatory fields.*/

   /**

-   * @brief Number of bytes yet to be received.
+   * @brief Number of bytes yet to be received.

    */

-  uint16_t              spd_rxcnt;

+  uint16_t              rxcnt;

   /**

    * @brief Receive pointer or @p NULL.

    */

-  uint8_t               *spd_rxptr;

+  uint8_t               *rxptr;

   /**

    * @brief Number of bytes yet to be transmitted.

    */

-  uint16_t              spd_txcnt;

+  uint16_t              txcnt;

   /**

    * @brief Transmit pointer or @p NULL.

    */

-  const uint8_t         *spd_txptr;

+  const uint8_t         *txptr;

 };

 

 /*===========================================================================*/