[Tinyos-beta-commits] CVS: tinyos-1.x/beta/teps/txt tep101.txt, 1.14, 1.15

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/beta/teps/txt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3048

Modified Files:
	tep101.txt 
Log Message:
cancellation


Index: tep101.txt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/teps/txt/tep101.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tep101.txt	7 Jul 2005 20:47:40 -0000	1.14
--- tep101.txt	11 Jul 2005 22:45:24 -0000	1.15
***************
*** 433,436 ****
--- 433,446 ----
  	    */	
  	   async event void dataReady(uint16_t data, bool precise);
+ 
+ 	   /**
+ 	    * Cancel an outstanding getData operation. Use with care, to
+ 	    * avoid problems with races between the dataReady event and cancel.
+ 	    * @return TRUE if a conversion was in-progress or an interrupt
+ 	    *   was pending. dataReady will not be signaled. FALSE if the
+ 	    *   conversion was already complete. dataReady will be (or has
+ 	    *   already been) signaled.
+ 	    */
+ 	   async command bool cancel();
  	 }
         
***************
*** 491,494 ****
--- 501,509 ----
         define an ATM128_ADC_PRESCALE constant which gives maximum A/D conversion
         precision (see the ATmega128 manual for details).
+ 
+        The ATm128ADCSingle interface allows cancellation of outstanding
+        conversions; the ATm128ADCMultiple does not (because it is hard to
+        tell if there will be 0 or 1 more ADC samples after cancellation
+        when using the ATmega128 free-running A/D conversion mode).
          
         Because of the possibility that samples may be imprecise after 
***************
*** 626,635 ****
  	    * Return the reference voltage to use for this channel
  	    */
! 	   command uint8_t getRefVoltage();
  
  	   /**
  	    * Return the prescaler value to use for this channel
  	    */
! 	   command uint8_t getPrescaler();
  	 }
  
--- 641,650 ----
  	    * Return the reference voltage to use for this channel
  	    */
! 	   async command uint8_t getRefVoltage();
  
  	   /**
  	    * Return the prescaler value to use for this channel
  	    */
! 	   async command uint8_t getPrescaler();
  	 }