dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added interrupt disable protection, and enable interrupts early in the ISR.

Browse Source
This commit is contained in:
skarg
2010-12-10 23:14:43 +00:00
parent 794e2ea9d4
commit f5829ea483
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/bdk-atxx4-mstp/adc.c
+9
View File
@@ -66,6 +66,7 @@ ISR(ADC_vect)
value = ADCL; value = ADCL;
value |= (ADCH << 8); value |= (ADCH << 8);
Sample_Result[index] = value; Sample_Result[index] = value;
__enable_interrupt();
/* clear the mux */ /* clear the mux */
BITMASK_CLEAR(ADMUX, ((1<<MUX2)|(1<<MUX1)|(1<<MUX0))); BITMASK_CLEAR(ADMUX, ((1<<MUX2)|(1<<MUX1)|(1<<MUX0)));
/* find the next channel */ /* find the next channel */
@@ -105,10 +106,14 @@ uint8_t adc_result_8bit(
uint8_t index) /* 0..7 = ADC0..ADC7, respectively */ uint8_t index) /* 0..7 = ADC0..ADC7, respectively */
{ {
uint8_t result = 0; uint8_t result = 0;
uint8_t sreg;
if (index < ADC_CHANNELS_MAX) { if (index < ADC_CHANNELS_MAX) {
adc_enable(index); adc_enable(index);
sreg = SREG;
__disable_interrupt();
result = (uint8_t)(Sample_Result[index]>>2); result = (uint8_t)(Sample_Result[index]>>2);
SREG = sreg;
} }
return result; return result;
@@ -118,10 +123,14 @@ uint16_t adc_result_10bit(
uint8_t index) /* 0..7 = ADC0..ADC7, respectively */ uint8_t index) /* 0..7 = ADC0..ADC7, respectively */
{ {
uint16_t result = 0; uint16_t result = 0;
uint8_t sreg;
if (index < ADC_CHANNELS_MAX) { if (index < ADC_CHANNELS_MAX) {
adc_enable(index); adc_enable(index);
sreg = SREG;
__disable_interrupt();
result = Sample_Result[index]; result = Sample_Result[index];
SREG = sreg;
} }
return result; return result;