[paparazzi-commits] [5152] commiting a mostly working but still broken version before making drastic changes

[antoine drouin]

Revision: 5152
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5152
Author:   poine
Date:     2010-07-26 03:23:57 +0000 (Mon, 26 Jul 2010)
Log Message:
-----------
commiting a mostly working but still broken version before making drastic 
changes

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/stm32/i2c_hw.c
    paparazzi3/trunk/sw/airborne/stm32/i2c_hw.h

Modified: paparazzi3/trunk/sw/airborne/stm32/i2c_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/stm32/i2c_hw.c 2010-07-25 20:00:39 UTC (rev 
5151)
+++ paparazzi3/trunk/sw/airborne/stm32/i2c_hw.c 2010-07-26 03:23:57 UTC (rev 
5152)
@@ -355,6 +355,7 @@
        if (i2c2.finished)
          *i2c2.finished = TRUE;
        i2c2.status = I2CComplete;
+       I2c2StopHandler();
       }
       else {
        i2c2.transaction = I2CTransRx;
@@ -387,10 +388,11 @@
       I2C_GenerateSTOP(I2C2, ENABLE);       /* Send I2C2 STOP Condition       
*/
     }
     else if (i2c2.index == i2c2.len_r) {
+      I2C_ITConfig(I2C2, I2C_IT_EVT, DISABLE);
       if (i2c2.finished)
        *i2c2.finished = TRUE;
       i2c2.status = I2CComplete;
-      I2C_ITConfig(I2C2, I2C_IT_EVT, DISABLE);
+      I2c2StopHandler();
     }
     break;
     

Modified: paparazzi3/trunk/sw/airborne/stm32/i2c_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/stm32/i2c_hw.h 2010-07-25 20:00:39 UTC (rev 
5151)
+++ paparazzi3/trunk/sw/airborne/stm32/i2c_hw.h 2010-07-26 03:23:57 UTC (rev 
5152)
@@ -61,6 +61,19 @@
 
 #ifdef USE_I2C2
 
+/* 
+   This is a hook for a caller module to provide
+   code to be called in the interrupt handler
+   at the end of a transfert 
+*/
+#ifdef I2C2_STOP_HANDLER
+#include I2C2_STOP_HANDLER_HEADER
+#define I2c2StopHandler() I2C2_STOP_HANDLER()
+#else 
+#define I2c2StopHandler() {}
+#endif /* I2C2_STOP_HANDLER */
+
+
 extern void i2c2_hw_init(void);
 extern void i2c2_ev_irq_handler(void);
 extern void i2c2_er_irq_handler(void);