[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/pxa27x PXA27Xdynqueue.c, 1.2, 1.3 PXA27XUSBClientM.nc, 1.5, 1.6

[Josh]

Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19336

Modified Files:
	PXA27Xdynqueue.c PXA27XUSBClientM.nc 
Log Message:
fin

Index: PXA27Xdynqueue.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x/PXA27Xdynqueue.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PXA27Xdynqueue.c	26 Aug 2005 20:23:41 -0000	1.2
--- PXA27Xdynqueue.c	2 Sep 2005 23:07:47 -0000	1.3
***************
*** 93,97 ****
     //choosing to waste space over wasting time by not always shifting
  	if(oDynQueue->index > 2 && oDynQueue->index > oDynQueue->iPhysLength / 8){
! 	   memcpy((void *)oDynQueue->ppvQueue, (void *)(oDynQueue->ppvQueue + oDynQueue->index), sizeof(void *) * oDynQueue->iLength);
  	   oDynQueue->index = 0;
  	}
--- 93,97 ----
     //choosing to waste space over wasting time by not always shifting
  	if(oDynQueue->index > 2 && oDynQueue->index > oDynQueue->iPhysLength / 8){
! 	   memmove((void *)oDynQueue->ppvQueue, (void *)(oDynQueue->ppvQueue + oDynQueue->index), sizeof(void *) * oDynQueue->iLength);
  	   oDynQueue->index = 0;
  	}
***************
*** 116,120 ****
     //choosing to waste space over wasting time by not always shifting
  	if(oDynQueue->index > 0){
! 	   memcpy((void *)oDynQueue->ppvQueue, (void *)(oDynQueue->ppvQueue + oDynQueue->index), sizeof(void *) * oDynQueue->iLength);
  	   oDynQueue->index = 0;
  	}
--- 116,120 ----
     //choosing to waste space over wasting time by not always shifting
  	if(oDynQueue->index > 0){
! 	   memmove((void *)oDynQueue->ppvQueue, (void *)(oDynQueue->ppvQueue + oDynQueue->index), sizeof(void *) * oDynQueue->iLength);
  	   oDynQueue->index = 0;
  	}
***************
*** 177,181 ****
  		oDynQueue->index--;
  	else//assumed index == 0
! 		memcpy((void *)(oDynQueue->ppvQueue + 1), (void *)oDynQueue->ppvQueue, sizeof(void *) * oDynQueue->iLength);
  	oDynQueue->ppvQueue[oDynQueue->index] = pvItem;
  }
--- 177,182 ----
  		oDynQueue->index--;
  	else//assumed index == 0
! 		memmove((void *)(oDynQueue->ppvQueue + 1), (void *)oDynQueue->ppvQueue, sizeof(void *) * oDynQueue->iLength);
! 	oDynQueue->iLength++;
  	oDynQueue->ppvQueue[oDynQueue->index] = pvItem;
  }

Index: PXA27XUSBClientM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x/PXA27XUSBClientM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PXA27XUSBClientM.nc	2 Sep 2005 16:01:39 -0000	1.5
--- PXA27XUSBClientM.nc	2 Sep 2005 23:07:47 -0000	1.6
***************
*** 714,723 ****
       case IMOTE_HID_TYPE_L_BYTE:
         if(OutStreamTemp->index != *(buff + IMOTE_HID_NI)){
! 	 //trace("Received packet has incorrect index\r\n");
  	 clearOut();
  	 free(buff);
  	 buff = NULL;
  	 _PXAREG(_udcdrb - _udcdr0 + _udccsr0) |= _UDC_bit(UDCCSRAX_PC);
! 	 post processOut();
  	 return;
         }
--- 714,723 ----
       case IMOTE_HID_TYPE_L_BYTE:
         if(OutStreamTemp->index != *(buff + IMOTE_HID_NI)){
! //	 trace("Received packet has incorrect index\r\n");
  	 clearOut();
  	 free(buff);
  	 buff = NULL;
  	 _PXAREG(_udcdrb - _udcdr0 + _udccsr0) |= _UDC_bit(UDCCSRAX_PC);
! 	 //post processOut();
  	 return;
         }
***************
*** 738,746 ****
       case IMOTE_HID_TYPE_L_SHORT:
         if(OutStreamTemp->index != ((*(buff + IMOTE_HID_NI) << 8) | *(buff + IMOTE_HID_NI + 1))){
! 	 //trace("Received packet has incorrect index\r\n");
  	 clearOut();
  	 free(buff);
  	 buff = NULL;
! 	 post processOut();
  	 return;
         }
--- 738,747 ----
       case IMOTE_HID_TYPE_L_SHORT:
         if(OutStreamTemp->index != ((*(buff + IMOTE_HID_NI) << 8) | *(buff + IMOTE_HID_NI + 1))){
! //	 trace("Received packet has incorrect index\r\n");
  	 clearOut();
  	 free(buff);
  	 buff = NULL;
! 	 _PXAREG(_udcdrb - _udcdr0 + _udccsr0) |= _UDC_bit(UDCCSRAX_PC);
! 	 //post processOut();
  	 return;
         }
***************
*** 767,771 ****
  	 buff = NULL;
  	 _PXAREG(_udcdrb - _udcdr0 + _udccsr0) |= _UDC_bit(UDCCSRAX_PC);
! 	 post processOut();
  	 return;
         }
--- 768,772 ----
  	 buff = NULL;
  	 _PXAREG(_udcdrb - _udcdr0 + _udccsr0) |= _UDC_bit(UDCCSRAX_PC);
! 	 //post processOut();
  	 return;
         }