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

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

This commit is contained in:
gdisirio 2013-11-15 09:58:41 +00:00
parent 1d3984c7a3
commit 3078f768b0
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
os/hal/platforms/SPC5xx/ADC_v1/adc_lld.c
View File

@ -195,6 +195,7 @@ static void adc_lld_serve_interrupt(ADCDriver *adcp, uint32_t isr) {
#if !defined(SPC5_ADC0_WD_HANDLER) #if !defined(SPC5_ADC0_WD_HANDLER)
#error "SPC5_ADC0_WD_HANDLER not defined" #error "SPC5_ADC0_WD_HANDLER not defined"
#endif #endif
/** /**
* @brief ADC0 Watch Dog interrupt handler. * @brief ADC0 Watch Dog interrupt handler.
* @note It is assumed that the various sources are only activated if the * @note It is assumed that the various sources are only activated if the
@ -207,8 +208,9 @@ OSAL_IRQ_HANDLER(SPC5_ADC0_WD_HANDLER) {
uint32_t isr; uint32_t isr;
OSAL_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
isr = ADCD1.adc_tagp->WTISR.R;
isr = ADCD1.adc_tagp->WTISR.R;
ADCD1.adc_tagp->WTISR.R = isr;
adc_lld_serve_interrupt(&ADCD1, isr); adc_lld_serve_interrupt(&ADCD1, isr);
OSAL_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
@ -233,7 +235,7 @@ OSAL_IRQ_HANDLER(SPC5_ADC1_WD_HANDLER) {
OSAL_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
isr = ADCD2.adc_tagp->WTISR.R; isr = ADCD2.adc_tagp->WTISR.R;
ADCD2.adc_tagp->WTISR.R = isr;
adc_lld_serve_interrupt(&ADCD2, isr); adc_lld_serve_interrupt(&ADCD2, isr);
OSAL_IRQ_EPILOGUE(); OSAL_IRQ_EPILOGUE();
@ -325,7 +327,11 @@ void adc_lld_start(ADCDriver *adcp) {
/* Sets ADC Normal Mode.*/ /* Sets ADC Normal Mode.*/
adcp->adc_tagp->MCR.B.PWDN = 0; adcp->adc_tagp->MCR.B.PWDN = 0;
/* Power up delay.*/
/* TODO: add a delay of 5uS.*/
/* Sets analog clock.*/ /* Sets analog clock.*/
/* TODO: make it a static option, move in adc_lld_init().*/
if (adcp->config->clock == HALF_PERIPHERAL_SET_CLOCK_FREQUENCY) { if (adcp->config->clock == HALF_PERIPHERAL_SET_CLOCK_FREQUENCY) {
adcp->adc_tagp->MCR.B.ADCLKSEL = 0; adcp->adc_tagp->MCR.B.ADCLKSEL = 0;
} else if (adcp->config->clock == PERIPHERAL_SET_CLOCK_FREQUENCY) { } else if (adcp->config->clock == PERIPHERAL_SET_CLOCK_FREQUENCY) {
@ -353,6 +359,8 @@ void adc_lld_stop(ADCDriver *adcp) {
edmaChannelRelease(adcp->adc_dma_channel); edmaChannelRelease(adcp->adc_dma_channel);
/* Clears thresholds’ values and deactives watchdog threshold interrupts.*/ /* Clears thresholds’ values and deactives watchdog threshold interrupts.*/
/* TODO: make the number of WD registers a parameter in the registry, modify
the configuration structure.*/
if (adcp->grpp->wtimr != 0) { if (adcp->grpp->wtimr != 0) {
adcp->adc_tagp->TRC[0].R = 0; adcp->adc_tagp->TRC[0].R = 0;
adcp->adc_tagp->TRC[1].R = 0; adcp->adc_tagp->TRC[1].R = 0;
@ -402,12 +410,9 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
//osalDbgAssert(adcp->grpp->num_channels*2 >= adcp->depth, //osalDbgAssert(adcp->grpp->num_channels*2 >= adcp->depth,
// "adc_lld_start_conversion(), #1", "too many elements"); // "adc_lld_start_conversion(), #1", "too many elements");
/* Active DMA.*/
adcp->adc_tagp->DMAE.R = ADC_DMAE_DMAEN;
/* Setting up DMA TCD parameters.*/ /* Setting up DMA TCD parameters.*/
edmaChannelSetup(adcp->adc_dma_channel, /* channel. */ edmaChannelSetup(adcp->adc_dma_channel, /* channel. */
adcp->adc_tagp->CDR[adcp->grpp->init_channel].B.CDATA, /* src. */ ((uint8_t *)adcp->adc_tagp->CDR[adcp->grpp->init_channel].R) + 2, /* src. */
adcp->samples, /* dst. */ adcp->samples, /* dst. */
4, /* soff, advance by four. */ 4, /* soff, advance by four. */
2, /* doff, advance by two. */ 2, /* doff, advance by two. */
@ -423,6 +428,11 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
EDMA_TCD_MODE_DREQ | EDMA_TCD_MODE_INT_END | EDMA_TCD_MODE_DREQ | EDMA_TCD_MODE_INT_END |
((adcp->depth > 1) ? EDMA_TCD_MODE_INT_HALF: 0)); /* mode. */ ((adcp->depth > 1) ? EDMA_TCD_MODE_INT_HALF: 0)); /* mode. */
/* Active DMA.*/
adcp->adc_tagp->DMAE.R = ADC_DMAE_DMAEN;
/* TODO: make the number of WD registers a parameter in the registry, modify
the configuration structure.*/
/* Sets thresholds’ values and active watchdog threshold interrupts if any.*/ /* Sets thresholds’ values and active watchdog threshold interrupts if any.*/
if (adcp->grpp->wtimr != 0) { if (adcp->grpp->wtimr != 0) {
adcp->adc_tagp->TRC[0].R = adcp->grpp->trcr[0]; adcp->adc_tagp->TRC[0].R = adcp->grpp->trcr[0];
@ -436,6 +446,8 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
adcp->adc_tagp->WTIMR.R = adcp->grpp->wtimr; adcp->adc_tagp->WTIMR.R = adcp->grpp->wtimr;
} }
/* mask = ((1 << nchannels) - 1) << firstchannel.*/
/* TODO: Make the channels a mash in the configuration and just assign it.*/
/* Active ADC channels for the conversion and sets the ADC DMA channels.*/ /* Active ADC channels for the conversion and sets the ADC DMA channels.*/
for (i = adcp->grpp->init_channel; i <= adcp->grpp->final_channel; i++) { for (i = adcp->grpp->init_channel; i <= adcp->grpp->final_channel; i++) {
adcp->adc_tagp->NCMR[0].R |= 1U << i; adcp->adc_tagp->NCMR[0].R |= 1U << i;