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

[Josh]

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

Modified Files:
	FlashM.nc 
Log Message:
because i like checking stuff in so much
(various fixes)

Index: FlashM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/FlashM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FlashM.nc	18 Aug 2005 21:10:28 -0000	1.2
--- FlashM.nc	18 Aug 2005 22:08:35 -0000	1.3
***************
*** 270,274 ****
    }
    
!   uint32_t CFIQuery(){
      uint32_t result, retval = 0;
      uint16_t query;
--- 270,274 ----
    }
    
!   uint32_t CFIQuery()  __attribute__((noinline)){
      uint32_t result, retval = 0;
      uint16_t query;
***************
*** 302,306 ****
    }
    
!   uint16_t unlock(uint32_t addr){
      //addr <<= 1;
      addr = (addr / FLASH_BLOCK_SIZE) * FLASH_BLOCK_SIZE;
--- 302,306 ----
    }
    
!   uint16_t unlock(uint32_t addr)  __attribute__((noinline)){
      //addr <<= 1;
      addr = (addr / FLASH_BLOCK_SIZE) * FLASH_BLOCK_SIZE;
***************
*** 328,332 ****
    }
    
!   uint16_t lock(uint32_t addr){
      //addr <<= 1;
      asm volatile(
--- 328,332 ----
    }
    
!   uint16_t lock(uint32_t addr) __attribute__ ((noinline)){
      //addr <<= 1;
      asm volatile(
***************
*** 351,356 ****
      return SUCCESS;
    }
!   
!   uint16_t programBuffer(uint32_t addr, uint16_t data[], uint8_t datalen){
      uint16_t status;
      //addr <<= 1;
--- 351,356 ----
      return SUCCESS;
    }
! 
!   uint16_t programBuffer(uint32_t addr, uint16_t data[], uint8_t datalen)   __attribute__((noinline)){
      uint16_t status;
      //addr <<= 1;
***************
*** 399,403 ****
    }
    
!   uint16_t programWord(uint32_t addr, uint16_t data){
      uint16_t status;
      //addr <<= 1;
--- 399,403 ----
    }
    
!   uint16_t programWord(uint32_t addr, uint16_t data)  __attribute__((noinline)){
      uint16_t status;
      //addr <<= 1;
***************
*** 435,439 ****
    }
    
!   uint16_t eraseFlash(uint32_t addr){
      uint16_t status;
      //addr <<= 1;
--- 435,439 ----
    }
    
!   uint16_t eraseFlash(uint32_t addr)  __attribute__((noinline)){
      uint16_t status;
      //addr <<= 1;
***************
*** 470,474 ****
    }
    
!   uint16_t getSR(uint32_t addr){
      uint16_t result;    
      //addr <<= 1; cut?
--- 470,474 ----
    }
    
!   uint16_t getSR(uint32_t addr)  __attribute__((noinline)){
      uint16_t result;    
      //addr <<= 1; cut?