[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/imote2 FlashM.nc, 1.1, 1.2 HPLUSBClientGPIOM.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-serv31350

Modified Files:
	FlashM.nc HPLUSBClientGPIOM.nc 
Log Message:
no message

Index: FlashM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/FlashM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FlashM.nc	18 Aug 2005 20:42:12 -0000	1.1
--- FlashM.nc	18 Aug 2005 21:10:28 -0000	1.2
***************
*** 128,132 ****
      uint32_t tempBlock = 0x01fc0000, i;
      uint16_t status;
-     uint8_t error = 0;
      uint8_t blocklen;
      uint32_t blockAddr = (addr / FLASH_BLOCK_SIZE) * FLASH_BLOCK_SIZE;
--- 128,131 ----
***************
*** 276,293 ****
      uint8_t i;
      
!     for(i = 0; i < 3; i++){   
        query = i + 0x10;
        query = query << 1;
        asm volatile(
  		   "ldr r1,=FLASH_CFIQUERY;        \
!   	            ldr r2,=FLASH_READARRAY;	   \
! 		    ldr r3,=0x0;		   \
! 		    ldr r4,=FLASH_CLEARSTATUS;	   \
! 		    b _goCFIQueryCacheLine;	   \
  		   .align 5;			   \
  		   _goCFIQueryCacheLine:	   \
                     strh r4,[r3];		   \
  	           strh r1,[r3];		   \
! 		   ldrh %0,[r3, %1];		   \
  		   strh r2,[r3];		   \
  		   ldrh r2,[r3];		   \
--- 275,292 ----
      uint8_t i;
      
!     for(i = 0; i < 3; i++){
        query = i + 0x10;
        query = query << 1;
        asm volatile(
  		   "ldr r1,=FLASH_CFIQUERY;        \
!   	           ldr r2,=FLASH_READARRAY;	   \
! 		   ldr r3,=0x0;			   \
! 		   ldr r4,=FLASH_CLEARSTATUS;	   \
! 		   b _goCFIQueryCacheLine;	   \
  		   .align 5;			   \
  		   _goCFIQueryCacheLine:	   \
                     strh r4,[r3];		   \
  	           strh r1,[r3];		   \
!  		   ldrh %0,[r3, %1];		   \
  		   strh r2,[r3];		   \
  		   ldrh r2,[r3];		   \

Index: HPLUSBClientGPIOM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/HPLUSBClientGPIOM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HPLUSBClientGPIOM.nc	18 Aug 2005 20:42:12 -0000	1.1
--- HPLUSBClientGPIOM.nc	18 Aug 2005 21:10:28 -0000	1.2
***************
*** 5,14 ****
  }
  implementation{
!  
    async command result_t HPLUSBClientGPIO.init(){
      _GPDR(USBC_GPION_DET) &= ~_GPIO_bit(USBC_GPION_DET); 
      
      _GPDR(USBC_GPIOX_EN) |= _GPIO_bit(USBC_GPIOX_EN);
!     _GPSR(USBC_GPIOX_EN) |= _GPIO_bit(USBC_GPIOX_EN);    
    }
    
--- 5,15 ----
  }
  implementation{
!   
    async command result_t HPLUSBClientGPIO.init(){
      _GPDR(USBC_GPION_DET) &= ~_GPIO_bit(USBC_GPION_DET); 
      
      _GPDR(USBC_GPIOX_EN) |= _GPIO_bit(USBC_GPIOX_EN);
!     _GPSR(USBC_GPIOX_EN) |= _GPIO_bit(USBC_GPIOX_EN);
!     return SUCCESS;
    }
    
***************
*** 16,19 ****
--- 17,22 ----
      if(isFlagged(_GPLR(USBC_GPION_DET), _GPIO_bit(USBC_GPION_DET)))
        return SUCCESS;
+     else
+       return FAIL;
    }
  }