From 15dd07ac161bdd4e0de60ce437b110dd91424a7f Mon Sep 17 00:00:00 2001
From: janhauer <janhauer>
Date: Fri, 20 Jun 2008 10:30:28 +0000
Subject: [PATCH] The bugfix of Apr 18 introduced a new problem that is now
 fixed.

---
 tos/chips/msp430/adc12/HplAdc12P.nc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tos/chips/msp430/adc12/HplAdc12P.nc b/tos/chips/msp430/adc12/HplAdc12P.nc
index aaee9ce5..54c9c346 100644
--- a/tos/chips/msp430/adc12/HplAdc12P.nc
+++ b/tos/chips/msp430/adc12/HplAdc12P.nc
@@ -107,9 +107,11 @@ implementation
   
   async command void HplAdc12.stopConversion(){
     // stop conversion mode immediately, conversion data is unreliable
+    uint16_t ctl1 = ADC12CTL1;
     ADC12CTL1 &= ~(CONSEQ0 | CONSEQ1);
     ADC12CTL0 &= ~(ADC12SC + ENC); 
-    ADC12CTL0 &= ~(ADC12ON); 
+    ADC12CTL0 &= ~(ADC12ON);
+    ADC12CTL1 |= (ctl1 & (CONSEQ0 | CONSEQ1));
   }
   
   async command void HplAdc12.enableConversion(){ 
-- 
2.39.2