[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/atm128/adc AdcStreamP.nc, 1.10, 1.11

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/adc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32495/adc

Modified Files:
	AdcStreamP.nc 
Log Message:
deputy-fixes

Index: AdcStreamP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/atm128/adc/AdcStreamP.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AdcStreamP.nc	23 Jun 2008 20:25:15 -0000	1.10
--- AdcStreamP.nc	23 Jun 2008 22:44:27 -0000	1.11
***************
*** 73,77 ****
    struct list_entry_t *bufferQueue[NSTREAM];
    struct list_entry_t * ONE_NOK * bufferQueueEnd[NSTREAM];
!   uint16_t * ONE_NOK lastBuffer, lastCount;
  
    norace uint16_t count;
--- 73,77 ----
    struct list_entry_t *bufferQueue[NSTREAM];
    struct list_entry_t * ONE_NOK * bufferQueueEnd[NSTREAM];
!   uint16_t * COUNT_NOK(lastCount) lastBuffer, lastCount;
  
    norace uint16_t count;
***************
*** 209,212 ****
--- 209,213 ----
  	    if (!bufferQueue[client])
  	      bufferQueueEnd[client] = &bufferQueue[client];
+ 	    pos = buffer = NULL;
  	    count = entry->count;
              tmp_count = count;
***************
*** 229,233 ****
        {
  	*pos++ = data;
! 	if (!--count)
  	  {
  	    atomic
--- 230,234 ----
        {
  	*pos++ = data;
! 	if (pos == buffer + count)
  	  {
  	    atomic
***************
*** 242,247 ****
  		else
  		  {
  		    lastBuffer = buffer;
- 		    lastCount = pos - buffer;
  		  }
  	      }
--- 243,248 ----
  		else
  		  {
+ 		    lastCount = count;
  		    lastBuffer = buffer;
  		  }
  	      }