git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6011 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
49d71a01ab
commit
cb5416a660
|
@ -167,12 +167,12 @@ struct ADCDriver {
|
||||||
Thread *thread;
|
Thread *thread;
|
||||||
#endif
|
#endif
|
||||||
#if ADC_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
|
#if ADC_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
|
||||||
#if CH_USE_MUTEXES || defined(__DOXYGEN__)
|
#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
|
||||||
/**
|
/**
|
||||||
* @brief Mutex protecting the peripheral.
|
* @brief Mutex protecting the peripheral.
|
||||||
*/
|
*/
|
||||||
Mutex mutex;
|
Mutex mutex;
|
||||||
#elif CH_USE_SEMAPHORES
|
#elif CH_CFG_USE_SEMAPHORES
|
||||||
Semaphore semaphore;
|
Semaphore semaphore;
|
||||||
#endif
|
#endif
|
||||||
#endif /* ADC_USE_MUTUAL_EXCLUSION */
|
#endif /* ADC_USE_MUTUAL_EXCLUSION */
|
||||||
|
|
|
@ -102,12 +102,12 @@ struct I2CDriver {
|
||||||
*/
|
*/
|
||||||
i2cflags_t errors;
|
i2cflags_t errors;
|
||||||
#if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
|
#if I2C_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
|
||||||
#if CH_USE_MUTEXES || defined(__DOXYGEN__)
|
#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
|
||||||
/**
|
/**
|
||||||
* @brief Mutex protecting the bus.
|
* @brief Mutex protecting the bus.
|
||||||
*/
|
*/
|
||||||
Mutex mutex;
|
Mutex mutex;
|
||||||
#elif CH_USE_SEMAPHORES
|
#elif CH_CFG_USE_SEMAPHORES
|
||||||
Semaphore semaphore;
|
Semaphore semaphore;
|
||||||
#endif
|
#endif
|
||||||
#endif /* I2C_USE_MUTUAL_EXCLUSION */
|
#endif /* I2C_USE_MUTUAL_EXCLUSION */
|
||||||
|
|
|
@ -103,12 +103,12 @@ struct SPIDriver {
|
||||||
Thread *thread;
|
Thread *thread;
|
||||||
#endif /* SPI_USE_WAIT */
|
#endif /* SPI_USE_WAIT */
|
||||||
#if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
|
#if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)
|
||||||
#if CH_USE_MUTEXES || defined(__DOXYGEN__)
|
#if CH_CFG_USE_MUTEXES || defined(__DOXYGEN__)
|
||||||
/**
|
/**
|
||||||
* @brief Mutex protecting the bus.
|
* @brief Mutex protecting the bus.
|
||||||
*/
|
*/
|
||||||
Mutex mutex;
|
Mutex mutex;
|
||||||
#elif CH_USE_SEMAPHORES
|
#elif CH_CFG_USE_SEMAPHORES
|
||||||
Semaphore semaphore;
|
Semaphore semaphore;
|
||||||
#endif
|
#endif
|
||||||
#endif /* SPI_USE_MUTUAL_EXCLUSION */
|
#endif /* SPI_USE_MUTUAL_EXCLUSION */
|
||||||
|
|
|
@ -188,7 +188,6 @@ ROMCONST struct testcase testsem2 = {
|
||||||
sem2_execute
|
sem2_execute
|
||||||
};
|
};
|
||||||
|
|
||||||
#if CH_CFG_USE_SEMSW || defined(__DOXYGEN__)
|
|
||||||
/**
|
/**
|
||||||
* @page test_sem_003 Atomic signal-wait test
|
* @page test_sem_003 Atomic signal-wait test
|
||||||
*
|
*
|
||||||
|
@ -232,7 +231,6 @@ ROMCONST struct testcase testsem3 = {
|
||||||
NULL,
|
NULL,
|
||||||
sem3_execute
|
sem3_execute
|
||||||
};
|
};
|
||||||
#endif /* CH_CFG_USE_SEMSW */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @page test_sem_004 Binary Wait and Signal
|
* @page test_sem_004 Binary Wait and Signal
|
||||||
|
@ -293,9 +291,7 @@ ROMCONST struct testcase * ROMCONST patternsem[] = {
|
||||||
#if CH_CFG_USE_SEMAPHORES || defined(__DOXYGEN__)
|
#if CH_CFG_USE_SEMAPHORES || defined(__DOXYGEN__)
|
||||||
&testsem1,
|
&testsem1,
|
||||||
&testsem2,
|
&testsem2,
|
||||||
#if CH_CFG_USE_SEMSW || defined(__DOXYGEN__)
|
|
||||||
&testsem3,
|
&testsem3,
|
||||||
#endif
|
|
||||||
&testsem4,
|
&testsem4,
|
||||||
#endif
|
#endif
|
||||||
NULL
|
NULL
|
||||||
|
|
Loading…
Reference in New Issue