CVS: jtag/funclets eraseFlash.S,1.5,1.6 eraseFlashSegment.S,1.2,1.3 progFlash.S,1.3,1.4

Chris Liechti <[email protected]>
Newsgroups gmane.comp.hardware.texas-instruments.msp430.gcc.cvs
Message-ID <[email protected]>
Update of /cvsroot/mspgcc/jtag/funclets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30485/jtag/funclets

Modified Files:
	eraseFlash.S eraseFlashSegment.S progFlash.S 
Log Message:
fix clock setting bug introduced by last commit

Index: eraseFlash.S
===================================================================
RCS file: /cvsroot/mspgcc/jtag/funclets/eraseFlash.S,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- eraseFlash.S	27 Dec 2005 13:37:11 -0000	1.5
+++ eraseFlash.S	28 Dec 2005 18:20:10 -0000	1.6
@@ -24,7 +24,7 @@
 main:   mov     #WDTPW|WDTHOLD, &WDTCTL ; Disable Watchdog.
         dint                            ; Disable interrupts.
         mov     srinit, r2              ; Initialize status register (Possibly disable FLL+).
-        mov     #FWKEY|44, &FCTL2       ; Source = MCLK, DIV = 5.
+        mov     #FWKEY|0x44, &FCTL2     ; Source = MCLK, DIV = 5.
         mov     #FWKEY, &FCTL3          ; Clear bits.
         mov     #19, r9                 ; Bug requires additional erase cycles.
 .LAgain:mov     type, &FCTL1            ; Load FCTL1 value. MUST CONTAIN PASSWORD.

Index: eraseFlashSegment.S
===================================================================
RCS file: /cvsroot/mspgcc/jtag/funclets/eraseFlashSegment.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- eraseFlashSegment.S	27 Dec 2005 13:37:11 -0000	1.2
+++ eraseFlashSegment.S	28 Dec 2005 18:20:13 -0000	1.3
@@ -26,7 +26,7 @@
 main:   mov     #WDTPW|WDTHOLD, &WDTCTL ; Disable Watchdog.
         dint                            ; Disable interrupts.
         mov     srinit, r2              ; Initialize status register (Possibly disable FLL+).
-        mov     #FWKEY|44, &FCTL2       ; Source = MCLK, DIV = 5.
+        mov     #FWKEY|0x44, &FCTL2     ; Source = MCLK, DIV = 5.
         mov     #FWKEY, &FCTL3          ; Clear bits.
         mov     #1, r9                  ; just one loop suffices for segment erase
 

Index: progFlash.S
===================================================================
RCS file: /cvsroot/mspgcc/jtag/funclets/progFlash.S,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- progFlash.S	27 Dec 2005 13:37:11 -0000	1.3
+++ progFlash.S	28 Dec 2005 18:20:13 -0000	1.4
@@ -22,7 +22,7 @@
         dint                            ; Disable interrupts.
         mov     srinit, r2              ; Initialize status register (Possibly disable FLL+).
         mov     #0xffff, &CCR0          ; CCR is used as return value -> error
-        mov     #FWKEY|44, &FCTL2       ; Source = MCLK, DIV = 5.
+        mov     #FWKEY|0x44, &FCTL2     ; Source = MCLK, DIV = 5.
         mov     #FWKEY, &FCTL3          ; Clear bits.
         mov     addr, r9                ; Address to program.
         mov     length, r8              ; Length to program.



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.