catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-26 02:08:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

ADC: Make errata work-arounds depend on run-time detection of chip version

Browse Source
This commit is contained in:
Harald Welte
2016-03-20 15:44:52 +01:00
parent 1871c25b6d
commit 28772ebcdc
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/src_simtrace/mode_cardemu.c
View File

@@ -212,14 +212,26 @@ int card_emu_uart_update_fidi(uint8_t uart_chan, unsigned int fidi)
#ifdef DETECT_VCC_BY_ADC #ifdef DETECT_VCC_BY_ADC
static int adc_triggered = 0; static int adc_triggered = 0;
static int adc_sam3s_reva_errata = 0;
static int card_vcc_adc_init(void) static int card_vcc_adc_init(void)
{ {
uint32_t chip_arch = CHIPID->CIDR & CHIPID_CIDR_ARCH_Msk;
uint32_t chip_ver = CHIPID->CIDR & CHIPID_CIDR_VERSION_Msk;
PMC_EnablePeripheral(ID_ADC); PMC_EnablePeripheral(ID_ADC);
ADC->ADC_CR |= ADC_CR_SWRST; ADC->ADC_CR |= ADC_CR_SWRST;
/* Errata Work-Around to clear EOCx flags */ if (chip_ver == 0 &&
{ (chip_arch == CHIPID_CIDR_ARCH_SAM3SxA ||
chip_arch == CHIPID_CIDR_ARCH_SAM3SxB ||
chip_arch == CHIPID_CIDR_ARCH_SAM3SxC)) {
TRACE_INFO("Enabling Rev.A ADC Errata work-around\r\n");
adc_sam3s_reva_errata = 1;
}
if (adc_sam3s_reva_errata) {
/* Errata Work-Around to clear EOCx flags */
volatile uint32_t foo; volatile uint32_t foo;
int i; int i;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
@@ -278,7 +290,11 @@ void ADC_IrqHandler(void)
uint16_t val = ADC->ADC_CDR[6] & 0xFFF; uint16_t val = ADC->ADC_CDR[6] & 0xFFF;
cardem_inst[1].vcc_uv = adc2uv(val); cardem_inst[1].vcc_uv = adc2uv(val);
process_vcc_adc(&cardem_inst[1]); process_vcc_adc(&cardem_inst[1]);
ADC->ADC_CR |= ADC_CR_START; if (adc_sam3s_reva_errata) {
/* Errata: START doesn't start a conversion
* sequence, but only a single conversion */
ADC->ADC_CR |= ADC_CR_START;
}
} }
#endif #endif