[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/imote2/test/TestFlash TestFlashM.nc, 1.1, 1.2

[Lama Nachman]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/TestFlash
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25389

Modified Files:
	TestFlashM.nc 
Log Message:
Updated the file to use the new trace interface


Index: TestFlashM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/imote2/test/TestFlash/TestFlashM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestFlashM.nc	2 Sep 2005 22:22:35 -0000	1.1
--- TestFlashM.nc	10 Oct 2006 22:40:40 -0000	1.2
***************
*** 125,129 ****
      
      result = call Flash.erase(0x200000);
!     trace("eraseFlash returned %d\r\n",result);
      return BLUSH_SUCCESS_DONE;
    }
--- 125,129 ----
      
      result = call Flash.erase(0x200000);
!     trace(DBG_USR1, "eraseFlash returned %d\r\n",result);
      return BLUSH_SUCCESS_DONE;
    }
***************
*** 144,152 ****
      for (i=0; i<32768; i++){
        if(*address != 0xFFFFFFFF){
! 	trace("verifyErase failed at address %#x\r\n",(uint32_t)address);
  	return BLUSH_SUCCESS_DONE;
        }
      }
!     trace("verifyErase succeeded!\r\n");
      return BLUSH_SUCCESS_DONE;
    }
--- 144,152 ----
      for (i=0; i<32768; i++){
        if(*address != 0xFFFFFFFF){
! 	trace(DBG_USR1, "verifyErase failed at address %#x\r\n",(uint32_t)address);
  	return BLUSH_SUCCESS_DONE;
        }
      }
!     trace(DBG_USR1, "verifyErase succeeded!\r\n");
      return BLUSH_SUCCESS_DONE;
    }
***************
*** 175,179 ****
      offset=i;
      result = call Flash.write(0x200000,dataBuffer,UARTBUFFERLEN);
!     trace("writeFlash returned %d\r\n",result);
      return BLUSH_SUCCESS_DONE;
    }
--- 175,179 ----
      offset=i;
      result = call Flash.write(0x200000,dataBuffer,UARTBUFFERLEN);
!     trace(DBG_USR1, "writeFlash returned %d\r\n",result);
      return BLUSH_SUCCESS_DONE;
    }
***************
*** 194,203 ****
      for (i=0; i<UARTBUFFERLEN; i++){
        if(address[i] != dataBuffer[i]){
! 	trace("verifyWrite failed at address %#x\r\n",
  		(uint32_t)address);
  	return BLUSH_SUCCESS_DONE;
        }
      }
!     trace("verifyWrite succeeded!\r\n");
      return BLUSH_SUCCESS_DONE;
    }
--- 194,203 ----
      for (i=0; i<UARTBUFFERLEN; i++){
        if(address[i] != dataBuffer[i]){
! 	trace(DBG_USR1, "verifyWrite failed at address %#x\r\n",
  		(uint32_t)address);
  	return BLUSH_SUCCESS_DONE;
        }
      }
!     trace(DBG_USR1, "verifyWrite succeeded!\r\n");
      return BLUSH_SUCCESS_DONE;
    }
***************
*** 217,224 ****
      if(stressTestEnable){
        stressTestCount = 0;
!       trace("StessTest Enabled\r\n");
      }
      else{
!       trace("StessTest Disabled\r\n");
      }
      return BLUSH_SUCCESS_DONE;
--- 217,224 ----
      if(stressTestEnable){
        stressTestCount = 0;
!       trace(DBG_USR1, "StessTest Enabled\r\n");
      }
      else{
!       trace(DBG_USR1, "StessTest Disabled\r\n");
      }
      return BLUSH_SUCCESS_DONE;