From 13cbdd5f4a084053f0b3f07809bf2ae7e418c7d1 Mon Sep 17 00:00:00 2001 From: utzig Date: Tue, 2 Sep 2014 18:26:24 +0000 Subject: [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 --- os/hal/ports/AVR/i2c_lld.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'os/hal/ports/AVR/i2c_lld.h') 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. */ -- cgit v1.2.3