Diff: targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c

Revision:

216:577900467c9e

Parent:

197:36a724675865

Child:

227:7bd0639b8911

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c	Tue May 27 08:30:06 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F302R8/i2c_api.c	Tue May 27 10:00:08 2014 +0100
@@ -124,13 +124,13 @@
         switch (hz) {
             case 100000:
                 tim = 0x60302730; // Standard mode
-            break;
+                break;
             case 200000:
                 tim = 0x00C07AB3; // Fast Mode
-            break;
+                break;
             case 400000:
                 tim = 0x00C0216C; // Fast Mode
-            break;
+                break;
             case 1000000:
                 tim = 0x00900B22; // Fast Mode Plus
                 // Enable the Fast Mode Plus capability
@@ -140,13 +140,12 @@
                 if (obj->i2c == I2C_2) {
                     SYSCFG_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus_I2C2, ENABLE);
                 }
-            break;
+                break;
             default:
                 error("Only 100kHz, 200kHz, 400kHz and 1MHz I2C frequencies are supported.");
-            break;
+                break;
         }
-    }
-    else if (SystemCoreClock == 72000000) {
+    } else if (SystemCoreClock == 72000000) {
         switch (hz) {
             case 100000:
                 tim = 0x10C08DCF; // Standard mode
@@ -171,8 +170,7 @@
                 error("Only 100kHz, 200kHz, 400kHz and 1MHz I2C frequencies are supported.");
                 break;
         }
-    }
-    else {
+    } else {
         error("System clock setting is not supported.");
     }
 
@@ -235,12 +233,12 @@
     }
 
     timeout = FLAG_TIMEOUT;
-    while(!I2C_GetFlagStatus(i2c, I2C_FLAG_TC)) {
+    while (!I2C_GetFlagStatus(i2c, I2C_FLAG_TC)) {
         timeout--;
         if (timeout == 0) return 0;
     }
-        
-    if(stop) i2c_stop(obj);
+
+    if (stop) i2c_stop(obj);
 
     return length;
 }
@@ -262,12 +260,12 @@
     }
 
     timeout = FLAG_TIMEOUT;
-    while(!I2C_GetFlagStatus(i2c, I2C_FLAG_TC)) {
+    while (!I2C_GetFlagStatus(i2c, I2C_FLAG_TC)) {
         timeout--;
         if (timeout == 0) return 0;
     }
-        
-    if(stop) i2c_stop(obj);
+
+    if (stop) i2c_stop(obj);
 
     return count;
 }
@@ -331,8 +329,8 @@
     uint16_t tmpreg;
 
     // reset own address enable
-    i2c->OAR1 &=~ I2C_OAR1_OA1EN;
-  
+    i2c->OAR1 &= ~ I2C_OAR1_OA1EN;
+
     // Get the old register value
     tmpreg = i2c->OAR1;
     // Reset address bits
@@ -356,16 +354,15 @@
 int i2c_slave_receive(i2c_t *obj) {
     I2C_TypeDef *i2c = (I2C_TypeDef *)(obj->i2c);
     int event = NoData;
-  
-    if(I2C_GetFlagStatus(i2c, I2C_ISR_BUSY) == SET) {
-        if(I2C_GetFlagStatus(i2c, I2C_ISR_ADDR) == SET) {
-        // Check direction
+
+    if (I2C_GetFlagStatus(i2c, I2C_ISR_BUSY) == SET) {
+        if (I2C_GetFlagStatus(i2c, I2C_ISR_ADDR) == SET) {
+            // Check direction
             if (I2C_GetFlagStatus(i2c, I2C_ISR_DIR) == SET) {
                 event = ReadAddressed;
-            }
-            else event = WriteAddressed;
-        // Clear adress match flag to generate an acknowledge
-        i2c->ICR |= I2C_ICR_ADDRCF;
+            } else event = WriteAddressed;
+            // Clear adress match flag to generate an acknowledge
+            i2c->ICR |= I2C_ICR_ADDRCF;
         }
     }
     return event;