deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more python3 fix

Browse Source
This commit is contained in:
NIIBE Yutaka
2015-08-03 19:22:02 +09:00
parent 94d6208542
commit 0fb6853fc7
8 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tool/intel_hex.py
View File

@@ -36,7 +36,7 @@ class intel_hex(object):
memory[addr] = data
prev_addr = addr
prev_data_len = len(data)
self.memory = memory
self.memory = memory
def calc_checksum(self, byte_count, offset, type_code, data):
s = byte_count
@@ -57,19 +57,19 @@ class intel_hex(object):
except:
pass
else:
raise ValueError, "data overwritten (%d)" % self.lineno
raise ValueError("data overwritten (%d)" % self.lineno)
self.memory[address] = data
def parse_line(self, line):
if line[0] != ':':
raise ValueError, "invalid line (%d)" % self.lineno
raise ValueError("invalid line (%d)" % self.lineno)
count = int(line[1:3], 16)
offset = int(line[3:7], 16)
type_code = int(line[7:9], 16)
data = binascii.unhexlify(line[9:(9+count*2)])
check_sum = int(line[(9+count*2):], 16)
if check_sum != self.calc_checksum(count, offset, type_code, data):
raise ValueError, "invalid checksum (%d)" % self.lineno
raise ValueError("invalid checksum (%d)" % self.lineno)
if type_code == 0x00:
self.add_data(count, offset, data)
return 0
@@ -77,18 +77,18 @@ class intel_hex(object):
return 1
elif type_code == 0x04:
if count != 2:
raise ValueError, "invalid count (%d): (%d) Expected 2" \
% (self.lineno, count)
raise ValueError("invalid count (%d): (%d) Expected 2" \
% (self.lineno, count))
self.address = ((ord(data[0])&0xff)<<24) + ((ord(data[1])&0xff)<<16)
return 0
elif type_code == 0x05:
if count != 4:
raise ValueError, "invalid count (%d): (%d) Expected 4" \
% (self.lineno, count)
raise ValueError("invalid count (%d): (%d) Expected 4" \
% (self.lineno, count))
self.start_address \
= ((ord(data[0])&0xff)<<24) + ((ord(data[1])&0xff)<<16) \
+ ((ord(data[2])&0xff)<<8) + ((ord(data[3])&0xff))
return 0
else:
raise ValueError, "invalid type code (%d): (%d)" \
% (self.lineno, type_code)
raise ValueError("invalid type code (%d): (%d)" \
% (self.lineno, type_code))