[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/imote2 HPLUSBClientC.nc, 1.1, 1.2 HPLUSBClientGPIOM.nc, 1.2, 1.3 TrickleC.nc, 1.1, 1.2 TrickleM.nc, 1.1, 1.2

[Josh]

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

Modified Files:
	HPLUSBClientC.nc HPLUSBClientGPIOM.nc TrickleC.nc TrickleM.nc 
Log Message:
update

Index: HPLUSBClientC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/HPLUSBClientC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HPLUSBClientC.nc	18 Aug 2005 20:42:12 -0000	1.1
--- HPLUSBClientC.nc	1 Sep 2005 18:12:54 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  configuration HPLUSBClientC {
    provides{
+     interface StdControl as Control;
      interface SendVarLenPacket;
      interface SendJTPacket;
***************
*** 20,23 ****
--- 21,25 ----
      PXA27XUSBClientC;
    
+   Control = PXA27XUSBClientC;
    SendVarLenPacket = PXA27XUSBClientC;
    SendJTPacket = PXA27XUSBClientC;

Index: HPLUSBClientGPIOM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/HPLUSBClientGPIOM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HPLUSBClientGPIOM.nc	18 Aug 2005 21:10:28 -0000	1.2
--- HPLUSBClientGPIOM.nc	1 Sep 2005 18:12:54 -0000	1.3
***************
*** 14,17 ****
--- 14,22 ----
    }
    
+   async command result_t HPLUSBClientGPIO.stop(){
+     _GPCR(USBC_GPIOX_EN) |= _GPIO_bit(USBC_GPIOX_EN);
+     return SUCCESS;
+   }
+   
    async command result_t HPLUSBClientGPIO.checkConnection(){
      if(isFlagged(_GPLR(USBC_GPION_DET), _GPIO_bit(USBC_GPION_DET)))

Index: TrickleC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/TrickleC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrickleC.nc	31 Aug 2005 00:41:25 -0000	1.1
--- TrickleC.nc	1 Sep 2005 18:12:54 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
    Control = TrickleM;
    
+   TrickleM.USBControl -> HPLUSBClientC.Control;
    TrickleM.ReceiveBData -> HPLUSBClientC;
    TrickleM.SendJTPacket -> HPLUSBClientC;

Index: TrickleM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/TrickleM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrickleM.nc	31 Aug 2005 00:41:25 -0000	1.1
--- TrickleM.nc	1 Sep 2005 18:12:54 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
      interface ReceiveBData;
      interface SendJTPacket;
+     interface StdControl as USBControl;
    }
  }
***************
*** 73,81 ****
      if(i == 0){
        for(j = 0; j < numBytesRead * (n + 1); j += FLASH_BLOCK_SIZE)
! 	call Flash.erase(startWriteAddr + j);
        lastWriteAddr = startWriteAddr;
      }
  
!     call Flash.write(lastWriteAddr, buffer, numBytesRead, FLASH_NORMAL);
      
      lastWriteAddr += numBytesRead;
--- 74,82 ----
      if(i == 0){
        for(j = 0; j < numBytesRead * (n + 1); j += FLASH_BLOCK_SIZE)
! 	;//call Flash.erase(startWriteAddr + j);
        lastWriteAddr = startWriteAddr;
      }
  
!     //call Flash.write(lastWriteAddr, buffer, numBytesRead);
      
      lastWriteAddr += numBytesRead;
***************
*** 106,110 ****
      rebootBinary = (uint8_t *)malloc(binSize);
      memcpy(rebootBinary, __Binary_Mover, binSize);
! 
      asm volatile(
  		 "mov r0,%0;  \
--- 107,111 ----
      rebootBinary = (uint8_t *)malloc(binSize);
      memcpy(rebootBinary, __Binary_Mover, binSize);
!     call USBControl.stop();
      asm volatile(
  		 "mov r0,%0;  \