From c7c5942ac386fcfddcb77cb3c0e525d0e85063c4 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 8 Dec 2011 08:36:37 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3578
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/src/i2c.c | 54 ++++++++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

(limited to 'os/hal/src')

diff --git a/os/hal/src/i2c.c b/os/hal/src/i2c.c
index f20932ef3..ae5f9f7a8 100644
--- a/os/hal/src/i2c.c
+++ b/os/hal/src/i2c.c
@@ -133,13 +133,11 @@ void i2cStop(I2CDriver *i2cp) {
 }
 
 /**
- * @brief Sends data via the I2C bus.
- *
+ * @brief   Sends data via the I2C bus.
  * @details Function designed to realize "read-through-write" transfer
  *          paradigm. If you want transmit data without any further read,
  *          than set @b rxbytes field to 0.
- *
- * @details Number of receiving byts must be 0 or more than 1 because of stm32
+ *          Number of receiving byts must be 0 or more than 1 because of stm32
  *          hardware restrictions.
  *
  * @param[in] i2cp        pointer to the @p I2CDriver object
@@ -153,22 +151,21 @@ void i2cStop(I2CDriver *i2cp) {
  * @return                Zero if no errors, otherwise return error code.
  */
 i2cflags_t i2cMasterTransmit(I2CDriver *i2cp,
-                      uint8_t slave_addr,
-                      uint8_t *txbuf,
-                      size_t txbytes,
-                      uint8_t *rxbuf,
-                      size_t rxbytes) {
-
-  chDbgCheck((i2cp != NULL) &&\
-  		(slave_addr != 0) &&\
-  		(txbytes > 0) &&\
-  		(txbuf != NULL) &&\
-  		((rxbytes == 0) || ((rxbytes > 1) && (rxbuf != NULL))),
-  		"i2cMasterTransmit");
+                             uint8_t slave_addr,
+                             uint8_t *txbuf,
+                             size_t txbytes,
+                             uint8_t *rxbuf,
+                             size_t rxbytes) {
+
+  chDbgCheck((i2cp != NULL) && (slave_addr != 0) &&
+             (txbytes > 0) && (txbuf != NULL) &&
+             ((rxbytes == 0) || ((rxbytes > 1) && (rxbuf != NULL))),
+             "i2cMasterTransmit");
 
   i2c_lld_wait_bus_free(i2cp);
-  chDbgAssert(!(i2c_lld_bus_is_busy(i2cp)), "i2cMasterReceive(), #1", "time is out");
 
+  chDbgAssert(!(i2c_lld_bus_is_busy(i2cp)),
+              "i2cMasterReceive(), #1", "time is out");
   chDbgAssert(i2cp->id_state == I2C_READY,
               "i2cMasterTransmit(), #1", "not ready");
 
@@ -180,8 +177,8 @@ i2cflags_t i2cMasterTransmit(I2CDriver *i2cp,
 }
 
 /**
- * @brief Receives data from the I2C bus.
- * @details Number of receiving byts must be more than 1 because of stm32
+ * @brief   Receives data from the I2C bus.
+ *          Number of receiving byts must be more than 1 because of stm32
  *          hardware restrictions.
  *
  * @param[in] i2cp        pointer to the @p I2CDriver object
@@ -192,19 +189,18 @@ i2cflags_t i2cMasterTransmit(I2CDriver *i2cp,
  * @return                Zero if no errors, otherwise return error code.
  */
 i2cflags_t i2cMasterReceive(I2CDriver *i2cp,
-                      uint8_t slave_addr,
-                      uint8_t *rxbuf,
-                      size_t rxbytes){
+                            uint8_t slave_addr,
+                            uint8_t *rxbuf,
+                            size_t rxbytes){
 
-  chDbgCheck((i2cp != NULL) &&\
-  		(slave_addr != 0) &&\
-  		(rxbytes > 1) && \
-  		(rxbuf != NULL),
-      "i2cMasterReceive");
+  chDbgCheck((i2cp != NULL) && (slave_addr != 0) &&
+             (rxbytes > 1) && (rxbuf != NULL),
+             "i2cMasterReceive");
 
   i2c_lld_wait_bus_free(i2cp);
-  chDbgAssert(!(i2c_lld_bus_is_busy(i2cp)), "i2cMasterReceive(), #1", "time is out");
 
+  chDbgAssert(!(i2c_lld_bus_is_busy(i2cp)),
+              "i2cMasterReceive(), #1", "time is out");
   chDbgAssert(i2cp->id_state == I2C_READY,
               "i2cMasterReceive(), #1", "not ready");
 
@@ -253,8 +249,6 @@ i2cflags_t i2cGetAndClearFlags(I2CDriver *i2cp) {
   return mask;
 }
 
-
-
 #if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
 /**
  * @brief Gains exclusive access to the I2C bus.
-- 
cgit v1.2.3