zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1338 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2009-11-28 18:52:32 +00:00
parent 5af98ce005
commit eb2bcc41f2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/platforms/STM32/adc_lld.c
View File

@ -60,6 +60,8 @@ CH_IRQ_HANDLER(Vector6C) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
isr = DMA1->ISR; isr = DMA1->ISR;
DMA1->IFCR |= DMA_IFCR_CGIF1 | DMA_IFCR_CTCIF1 |
DMA_IFCR_CHTIF1 | DMA_IFCR_CTEIF1;
if ((isr & DMA_ISR_HTIF1) != 0) { if ((isr & DMA_ISR_HTIF1) != 0) {
/* Half transfer processing.*/ /* Half transfer processing.*/
if (ADCD1.ad_callback != NULL) { if (ADCD1.ad_callback != NULL) {
@ -74,7 +76,9 @@ CH_IRQ_HANDLER(Vector6C) {
adc_lld_stop_conversion(&ADCD1); adc_lld_stop_conversion(&ADCD1);
ADCD1.ad_grpp = NULL; ADCD1.ad_grpp = NULL;
ADCD1.ad_state = ADC_READY; ADCD1.ad_state = ADC_READY;
chSysLockFromIsr();
chSemResetI(&ADCD1.ad_sem, 0); chSemResetI(&ADCD1.ad_sem, 0);
chSysUnlockFromIsr();
} }
/* Callback handling.*/ /* Callback handling.*/
if (ADCD1.ad_callback != NULL) { if (ADCD1.ad_callback != NULL) {
@ -84,7 +88,7 @@ CH_IRQ_HANDLER(Vector6C) {
ADCD1.ad_callback(ADCD1.ad_samples + half, half); ADCD1.ad_callback(ADCD1.ad_samples + half, half);
} }
else { else {
/* Invokes the callback passing the while buffer.*/ /* Invokes the callback passing the whole buffer.*/
ADCD1.ad_callback(ADCD1.ad_samples, ADCD1.ad_depth); ADCD1.ad_callback(ADCD1.ad_samples, ADCD1.ad_depth);
} }
} }
@ -93,8 +97,6 @@ CH_IRQ_HANDLER(Vector6C) {
/* DMA error processing.*/ /* DMA error processing.*/
STM32_ADC1_DMA_ERROR_HOOK(); STM32_ADC1_DMA_ERROR_HOOK();
} }
DMA1->IFCR |= DMA_IFCR_CGIF1 | DMA_IFCR_CTCIF1 |
DMA_IFCR_CHTIF1 | DMA_IFCR_CTEIF1;
CH_IRQ_EPILOGUE(); CH_IRQ_EPILOGUE();
} }