[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/imote2 FlashM.nc, 1.6, 1.7

[Josh]

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

Modified Files:
	FlashM.nc 
Log Message:
if block is already clear won't erase

Index: FlashM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/FlashM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FlashM.nc	31 Aug 2005 20:45:44 -0000	1.6
--- FlashM.nc	1 Sep 2005 18:16:06 -0000	1.7
***************
*** 217,220 ****
--- 217,228 ----
      FlashPartitionState[addr / FLASH_PARTITION_SIZE] = FLASH_STATE_ERASE;
      
+     for(i = 0; i < FLASH_BLOCK_SIZE; i++){
+       uint32_t tempCheck = *(uint32_t *)(addr + i);
+       if(tempCheck != 0xFFFFFFFF)
+ 	break;
+       if(i == FLASH_BLOCK_SIZE - 1)
+ 	return SUCCESS;
+     }
+ 
      unlock(addr);
      status = eraseFlash(addr);
***************
*** 321,326 ****
      atomic{
        asm volatile(
! 		   "mov r1, %1;           	\
!                    mov r2, %2;				\
                     mov r3, %3;			\		 
  		   mov r14, PC;			\
--- 329,334 ----
      atomic{
        asm volatile(
! 		   "mov r1, %1;                 \
!                    mov r2, %2;			\
                     mov r3, %3;			\		 
  		   mov r14, PC;			\