diff options
| author | utzig <utzig@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-09-02 18:26:24 +0000 |
|---|---|---|
| committer | utzig <utzig@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-09-02 18:26:24 +0000 |
| commit | 13cbdd5f4a084053f0b3f07809bf2ae7e418c7d1 (patch) | |
| tree | 4055f17305c6dd5ce6aff55a0b89cee571c7a93a /os/hal/ports/AVR/i2c_lld.h | |
| parent | 56b6f21257b8e4686aa1daa3e7870f253691d452 (diff) | |
| download | ChibiOS-13cbdd5f4a084053f0b3f07809bf2ae7e418c7d1.tar.gz ChibiOS-13cbdd5f4a084053f0b3f07809bf2ae7e418c7d1.tar.bz2 ChibiOS-13cbdd5f4a084053f0b3f07809bf2ae7e418c7d1.zip | |
[AVR] I2C driver updated for chibios3/nil + fixes
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7235 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/AVR/i2c_lld.h')
| -rw-r--r-- | os/hal/ports/AVR/i2c_lld.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/os/hal/ports/AVR/i2c_lld.h b/os/hal/ports/AVR/i2c_lld.h index 6b2539d6d..c607481eb 100644 --- a/os/hal/ports/AVR/i2c_lld.h +++ b/os/hal/ports/AVR/i2c_lld.h @@ -125,14 +125,10 @@ struct I2CDriver { */
i2cflags_t errors;
#if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
-#if CH_USE_MUTEXES || defined(__DOXYGEN__)
/**
* @brief Mutex protecting the bus.
*/
- Mutex mutex;
-#elif CH_USE_SEMAPHORES
- Semaphore semaphore;
-#endif
+ mutex_t mutex;
#endif /* I2C_USE_MUTUAL_EXCLUSION */
#if defined(I2C_DRIVER_EXT_FIELDS)
I2C_DRIVER_EXT_FIELDS
@@ -141,7 +137,7 @@ struct I2CDriver { /**
* @brief Thread waiting for I/O completion.
*/
- Thread *thread;
+ thread_reference_t thread;
/**
* @brief Address of slave device.
*/
|