diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-03-10 13:00:39 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-03-10 13:00:39 +0000 |
| commit | a849378300019b9d6c030ab7af46bfda646e619e (patch) | |
| tree | df2e0a580d157db179c0dc6cd6f56e22d9974ccf /os/hal | |
| parent | f27e4f46fe7db437775838da11e125f722e81c11 (diff) | |
| download | ChibiOS-a849378300019b9d6c030ab7af46bfda646e619e.tar.gz ChibiOS-a849378300019b9d6c030ab7af46bfda646e619e.tar.bz2 ChibiOS-a849378300019b9d6c030ab7af46bfda646e619e.zip | |
Fixed bug 3205410.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2813 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/include/adc.h | 5 | ||||
| -rw-r--r-- | os/hal/src/adc.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/os/hal/include/adc.h b/os/hal/include/adc.h index 8bc013b38..b0d6d0938 100644 --- a/os/hal/include/adc.h +++ b/os/hal/include/adc.h @@ -124,9 +124,10 @@ typedef enum { */
#define _adc_wakeup_isr(adcp) { \
if ((adcp)->thread != NULL) { \
- Thread *tp = (adcp)->thread; \
- (adcp)->thread = NULL; \
+ Thread *tp; \
chSysLockFromIsr(); \
+ tp = (adcp)->thread; \
+ (adcp)->thread = NULL; \
tp->p_u.rdymsg = RDY_OK; \
chSchReadyI(tp); \
chSysUnlockFromIsr(); \
diff --git a/os/hal/src/adc.c b/os/hal/src/adc.c index 956c7837f..b70c46e1c 100644 --- a/os/hal/src/adc.c +++ b/os/hal/src/adc.c @@ -271,7 +271,7 @@ msg_t adcConvert(ADCDriver *adcp, msg_t msg;
chSysLock();
- chDbgAssert(grpp->end_cb == NULL, "adcConvert(), #1", "has callback");
+ chDbgAssert(adcp->thread == NULL, "adcConvert(), #1", "already waiting");
adcStartConversionI(adcp, grpp, samples, depth);
(adcp)->thread = chThdSelf();
chSchGoSleepS(THD_STATE_SUSPENDED);
|