[Tinyos-2-commits] CVS: tinyos-2.x/tools/tinyos/misc tos-build-deluge-image, 1.4, 1.5 tos-deluge, 1.17, 1.18

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9494/tools/tinyos/misc

Modified Files:
	tos-build-deluge-image tos-deluge 
Log Message:
Fix for Deluge T2 to properly deal with images bigger than 64K.


Index: tos-build-deluge-image
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc/tos-build-deluge-image,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tos-build-deluge-image	19 May 2008 21:25:08 -0000	1.4
--- tos-build-deluge-image	23 Apr 2009 00:44:56 -0000	1.5
***************
*** 131,138 ****
  section = []
  end_addr = None
  for line in image.split():
      #print "DEBUG:", line
      length = int(line[1:3], 16)
!     addr = int(line[3:7], 16)
      rectype = int(line[7:9], 16)
      data = []
--- 131,139 ----
  section = []
  end_addr = None
+ offset = 0
  for line in image.split():
      #print "DEBUG:", line
      length = int(line[1:3], 16)
!     addr = int(line[3:7], 16) + offset
      rectype = int(line[7:9], 16)
      data = []
***************
*** 156,159 ****
--- 157,162 ----
          section += data
          end_addr = addr + length
+     elif rectype == 0x02:
+         offset = int(line[9:9+4], 16) << 4
      elif rectype == 0x01:
          all.append((start_addr, section))

Index: tos-deluge
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tools/tinyos/misc/tos-deluge,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tos-deluge	15 Dec 2008 00:50:37 -0000	1.17
--- tos-deluge	23 Apr 2009 00:44:57 -0000	1.18
***************
*** 71,75 ****
                              [('cmd',    'int',  1),
                               ('imgNum', 'int',  1),
!                              ('offset', 'int',  2),
                               ('length', 'int',  2),
                               ('data',   'blob', None)],
--- 71,75 ----
                              [('cmd',    'int',  1),
                               ('imgNum', 'int',  1),
!                              ('offset', 'int',  4),
                               ('length', 'int',  2),
                               ('data',   'blob', None)],