Merge lp:~cdwilson/python-msp430-tools/fix-legacy-input-file-processing into lp:python-msp430-tools

[Christopher Wilson]

Fix for https://bugs.launchpad.net/python-msp430-tools/+bug/929137

Please merge if the fix looks good to you.

[lp:~cdwilson/python-msp430-tools/fix-legacy-input-file-processing]

450. By Christopher Wilson on 2012-02-09

Refactor legacy BSL input file processing

[zsquareplusc (zsquareplusc)]

OK, merged.

That legacy_memory modifies the Segment instances is not nice, but I don't feel like rewriting the code where it accesses the data as this is the old BSL implementation anyway. This at least gets the tool working again :-)

review: Approve

=== modified file 'scripts/msp430-bsl-legacy.py'
--- scripts/msp430-bsl-legacy.py	2011-01-07 01:46:50 +0000
+++ scripts/msp430-bsl-legacy.py	2012-02-09 06:15:22 +0000
@@ -126,6 +126,11 @@
 erased before programming.
 """ % (sys.argv[0], VERSION))
 
+def legacy_memory(memory):
+    # msp430.legacy.bsl doesn't expect seg.data to be type bytearray
+    for segment in memory:
+        segment.data = bytes(segment.data)
+    return memory
 
 # Main:
 def main():
@@ -180,7 +185,7 @@
                 comPort = a                         # take the string and let serial driver decide
         elif o in ("-P", "--password"):
             # extract password from file
-            bslobj.passwd = memory.Memory(a).getMemrange(0xffe0, 0xffff)
+            bslobj.passwd = legacy_memory(memory.load(a)).getMemrange(0xffe0, 0xffff)
         elif o in ("-w", "--wait"):
             wait = 1
         elif o in ("-f", "--framesize"):
@@ -302,8 +307,7 @@
         elif o in ("-N", "--notimeout"):
             notimeout = 1
         elif o in ("-B", "--bsl"):
-            bslrepl = memory.Memory() # File to program
-            bslrepl.loadFile(a)
+            bslrepl = legacy_memory(memory.load(a)) # File to program
         elif o in ("-V", "--bslversion"):
             todo.append(bslobj.actionReadBSLVersion) # load replacement BSL as first item
         elif o in ("-S", "--speed"):
@@ -389,7 +393,6 @@
     sys.stderr.flush()
 
     #prepare data to download
-    bslobj.data = memory.Memory()                   # prepare downloaded data
     if filetype is not None:                        # if the filetype is given...
         if filename is None:
             raise ValueError("No filename but filetype specified")
@@ -398,16 +401,16 @@
         else:
             file = open(filename, "rb")             # or from a file
         if filetype == 0:                           # select load function
-            bslobj.data.loadIHex(file)              # intel hex
+            bslobj.data = legacy_memory(memory.load(filename, file, 'ihex')) # intel hex
         elif filetype == 1:
-            bslobj.data.loadTIText(file)            # TI's format
+            bslobj.data = legacy_memory(memory.load(filename, file, 'titext')) # TI's format
         else:
             raise ValueError("Illegal filetype specified")
     else:                                           # no filetype given...
         if filename == '-':                         # for stdin:
-            bslobj.data.loadIHex(sys.stdin)         # assume intel hex
+            bslobj.data = legacy_memory(memory.load(filename, sys.stdin, 'ihex')) # assume intel hex
         elif filename:
-            bslobj.data.loadFile(filename)          # autodetect otherwise
+            bslobj.data = legacy_memory(memory.load(filename)) # autodetect otherwise
 
     if DEBUG > 3: sys.stderr.write("File: %r" % filename)