diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-05-06 15:16:15 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-05-06 15:16:15 +0000 |
| commit | 60975ca7fed0e2960bced2fe72239422f8376068 (patch) | |
| tree | 116f496bf509daccf541b8a10fc32d5dc49681a9 /os/hal/include/i2c.h | |
| parent | 4fda4dc84fcfcfa483f10a8b5043d124ad551ba0 (diff) | |
| download | ChibiOS-60975ca7fed0e2960bced2fe72239422f8376068.tar.gz ChibiOS-60975ca7fed0e2960bced2fe72239422f8376068.tar.bz2 ChibiOS-60975ca7fed0e2960bced2fe72239422f8376068.zip | |
I2C. Some fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@2922 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include/i2c.h')
| -rw-r--r-- | os/hal/include/i2c.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/os/hal/include/i2c.h b/os/hal/include/i2c.h index 39ba313fd..6e740cfa9 100644 --- a/os/hal/include/i2c.h +++ b/os/hal/include/i2c.h @@ -204,7 +204,6 @@ struct I2CSlaveConfig{ } \
}
#else /* !I2C_USE_WAIT */
-#define i2c_lld_wait_bus_free(i2cp) //TODO: remove this STUB
#define _i2c_wait_s(i2cp)
#define _i2c_wakeup_isr(i2cp)
#endif /* !I2C_USE_WAIT */
@@ -223,12 +222,12 @@ struct I2CSlaveConfig{ *
* @notapi
*/
-#define _i2c_isr_code(i2cp, i2cscfg) { \
- (i2cp)->id_state = I2C_COMPLETE; \
+#define _i2c_isr_code(i2cp, i2cscfg) { \
+ (i2cp)->id_state = I2C_COMPLETE; \
if(((i2cp)->id_slave_config)->id_callback) { \
- ((i2cp)->id_slave_config)->id_callback(i2cp, i2cscfg); \
- } \
- _i2c_wakeup_isr(i2cp); \
+ ((i2cp)->id_slave_config)->id_callback(i2cp, i2cscfg); \
+ } \
+ _i2c_wakeup_isr(i2cp); \
}
/*===========================================================================*/
|