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

1 files changed, 16 insertions, 15 deletions

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;

 };

 

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