Skip to content
Snippets Groups Projects
Commit 54b93278 authored by Rolf Bork's avatar Rolf Bork
Browse files

Minor fix for gsc18ai32 ADC module:

- Change ADC timeout in iop_adc_functions
- Remove Demand DMA mode set to BCR: Not correct for this ADC model
parent 107cf9c2
No related branches found
No related tags found
No related merge requests found
......@@ -189,9 +189,6 @@ gsc18ai32Enable( CDS_HARDWARE* pHardware )
if ( pHardware->adcType[ ii ] == GSC_18AI32SSC1M )
{
adc18Ptr = (volatile GSA_ADC_18BIT_REG*)adcPtr[ ii ];
/// Enable demand DMA mode ie auto DMA data to computer memory when
///< GSAI_THRESHOLD data points in ADC FIFO.
adc18Ptr->BCR &= ~( GSAF_DMA_DEMAND_MODE );
/// Set DMA mode and direction in PLX controller chip on module.
adcDma[ ii ]->DMA0_MODE = GSAF_DMA_MODE_NO_INTR | 0x1000;
/// Enable DMA
......
......@@ -377,6 +377,7 @@ iop_adc_read( adcInfo_t* adcinfo, int cpuClk[] )
pLocalEpics->epicsInput.bumpAdcRd = 0;
}
#endif
adc_wait_limit = MAX_ADC_WAIT_CARD_0;
}
return 0;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment