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

[Josh]

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

Modified Files:
	flash.s 
Log Message:
fin

Index: flash.s
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/flash.s,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** flash.s	2 Sep 2005 16:02:01 -0000	1.2
--- flash.s	2 Sep 2005 21:39:59 -0000	1.3
***************
*** 33,39 ****
  
  __Flash_Erase:
! .func __Flash_Erase @r0 = status
! 					@r1 = addr
! 	STMFD R13!, {R4 - R5, LR}
  	ldr r4,=0x0					@Flash Base Addr
  	ldr r5,=FLASH_CLEARSTATUS
--- 33,41 ----
  
  __Flash_Erase:
! .func __Flash_Erase @r0 (return) = status
! 					@r0 = addr (move to r1)
! 					
! 	STMFD R13!, {R1, R4 - R5, LR} @I'm being conservative and saving registers R1-R3 which might not be necessary with function calls
! 	mov r1,r0
  	ldr r4,=0x0					@Flash Base Addr
  	ldr r5,=FLASH_CLEARSTATUS
***************
*** 52,56 ****
  	strh r5,[r1]				@Set Block back to normal read mode
  	ldrh r5,[r1]
! 	LDMFD R13!, {R4 - R5, PC}
  	__Flash_Erase_true_end:
  	nop;
--- 54,58 ----
  	strh r5,[r1]				@Set Block back to normal read mode
  	ldrh r5,[r1]
! 	LDMFD R13!, {R1, R4 - R5, PC}
  	__Flash_Erase_true_end:
  	nop;
***************
*** 58,65 ****
  
  __Flash_Program_Word:
! .func __Flash_Program_Word	@r0 = status
! 							@r1 = addr
! 							@r2 = dataword
! 	STMFD R13!, {R4 - R5, LR}
  	ldr r4,=0x0					@Flash Base Addr
  	ldr r5,=FLASH_CLEARSTATUS
--- 60,70 ----
  
  __Flash_Program_Word:
! .func __Flash_Program_Word	@r0 (return) = status
! 							@r0 (move to r1) = addr
! 							@r1 (move to r2) = dataword
! 							
! 	STMFD R13!, {R1 - R2, R4 - R5, LR} @I'm being conservative and saving registers R1-R3 which might not be necessary with function calls
! 	mov r2,r1
! 	mov r1,r0	
  	ldr r4,=0x0					@Flash Base Addr
  	ldr r5,=FLASH_CLEARSTATUS
***************
*** 77,81 ****
  	strh r5,[r1]				@Set Block back to normal read mode
  	ldrh r5,[r1]
! 	LDMFD R13!, {R4 - R5, PC}
  	__Flash_Program_Word_true_end:
  	nop;
--- 82,86 ----
  	strh r5,[r1]				@Set Block back to normal read mode
  	ldrh r5,[r1]
! 	LDMFD R13!, {R1 - R2, R4 - R5, PC}
  	__Flash_Program_Word_true_end:
  	nop;
***************
*** 83,92 ****
  
  __Flash_Program_Buffer:
! .func __Flash_Program_Buffer	@r0 = status
! 								@r1 = addr
! 								@r2 = data
! 								@r3 = datalen
  					 
! 	STMFD R13!, {R1 - R12, LR}
  	ldr r4,=0x0					@Flash Base Addr
  	ldr r5,=FLASH_CLEARSTATUS
--- 88,100 ----
  
  __Flash_Program_Buffer:
! .func __Flash_Program_Buffer	@r0 (return) = status
! 								@r0 (move to r1) = addr
! 								@r1 (move to r2) = datadata
! 								@r2 (move to r3) = datalen
  					 
! 	STMFD R13!, {R1 - R12, LR} @I'm being conservative and saving registers R1-R3 which might not be necessary with function calls
! 	mov r3,r2
! 	mov r2,r1
! 	mov r1,r0
  	ldr r4,=0x0					@Flash Base Addr
  	ldr r5,=FLASH_CLEARSTATUS