andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3205410. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@2825 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-03-18 13:56:32 +00:00
parent aa6802f223
commit 0d142fc933
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/src/adc.c
View File

@ -278,7 +278,7 @@ msg_t adcConvert(ADCDriver *adcp,
msg_t msg; msg_t msg;
chSysLock(); chSysLock();
chDbgAssert(grpp->acg_endcb == NULL, "adcConvert(), #1", "has callback"); chDbgAssert(adcp->ad_thread == NULL, "adcConvert(), #1", "already waiting");
adcStartConversionI(adcp, grpp, samples, depth); adcStartConversionI(adcp, grpp, samples, depth);
(adcp)->ad_thread = chThdSelf(); (adcp)->ad_thread = chThdSelf();
chSchGoSleepS(THD_STATE_SUSPENDED); chSchGoSleepS(THD_STATE_SUSPENDED);

1
readme.txt
View File

@ -69,6 +69,7 @@
***************************************************************************** *****************************************************************************
*** 2.2.3 *** *** 2.2.3 ***
- FIX: Fixed invalid assertion in adcConvert() (bug 3205410).
- NEW: Improved preemption implementation for the Cortex-M0, now it uses - NEW: Improved preemption implementation for the Cortex-M0, now it uses
the NMI vector in order to restore the original context. The change makes the NMI vector in order to restore the original context. The change makes
IRQ handling faster and also saves some RAM/ROM space. The GCC port code IRQ handling faster and also saves some RAM/ROM space. The GCC port code