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

ADC hooks renamed. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9839 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2016-10-03 10:10:58 +00:00
parent 35c88286df
commit 3e35320975
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c
View File

@ -313,9 +313,6 @@ static void adc_lld_serve_interrupt(ADCDriver *adcp, uint32_t isr) {
/* Analog watchdog error.*/ /* Analog watchdog error.*/
_adc_isr_error_code(adcp, ADC_ERR_AWD3); _adc_isr_error_code(adcp, ADC_ERR_AWD3);
} }
#if defined(STM32_ADC_IRQ_HOOK)
STM32_ADC_IRQ_HOOK
#endif
} }
} }
@ -335,25 +332,36 @@ OSAL_IRQ_HANDLER(STM32_ADC1_HANDLER) {
OSAL_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
#if STM32_ADC_DUAL_MODE #if STM32_ADC_DUAL_MODE
isr = ADC1->ISR; isr = ADC1->ISR;
isr |= ADC2->ISR; isr |= ADC2->ISR;
ADC1->ISR = isr; ADC1->ISR = isr;
ADC2->ISR = isr; ADC2->ISR = isr;
#if defined(STM32_ADC_ADC12_IRQ_HOOK)
STM32_ADC_ADC12_IRQ_HOOK
#endif
adc_lld_serve_interrupt(&ADCD1, isr); adc_lld_serve_interrupt(&ADCD1, isr);
#else /* !STM32_ADC_DUAL_MODE */ #else /* !STM32_ADC_DUAL_MODE */
#if STM32_ADC_USE_ADC1 #if STM32_ADC_USE_ADC1
isr = ADC1->ISR; isr = ADC1->ISR;
ADC1->ISR = isr; ADC1->ISR = isr;
#if defined(STM32_ADC_ADC1_IRQ_HOOK)
STM32_ADC_ADC1_IRQ_HOOK
#endif
adc_lld_serve_interrupt(&ADCD1, isr); adc_lld_serve_interrupt(&ADCD1, isr);
#endif #endif
#if STM32_ADC_USE_ADC2 #if STM32_ADC_USE_ADC2
isr = ADC2->ISR; isr = ADC2->ISR;
ADC2->ISR = isr; ADC2->ISR = isr;
#if defined(STM32_ADC_ADC2_IRQ_HOOK)
STM32_ADC_ADC2_IRQ_HOOK
#endif
adc_lld_serve_interrupt(&ADCD2, isr); adc_lld_serve_interrupt(&ADCD2, isr);
#endif #endif
#endif /* !STM32_ADC_DUAL_MODE */ #endif /* !STM32_ADC_DUAL_MODE */
OSAL_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
@ -373,7 +381,9 @@ OSAL_IRQ_HANDLER(STM32_ADC3_HANDLER) {
isr = ADC3->ISR; isr = ADC3->ISR;
ADC3->ISR = isr; ADC3->ISR = isr;
#if defined(STM32_ADC_ADC3_IRQ_HOOK)
STM32_ADC_ADC3_IRQ_HOOK
#endif
adc_lld_serve_interrupt(&ADCD3, isr); adc_lld_serve_interrupt(&ADCD3, isr);
OSAL_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();