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

More python3 fixes

Browse Source
This commit is contained in:
NIIBE Yutaka
2015-08-03 16:44:38 +09:00
parent eb62609c86
commit 94d6208542
5 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tool/gnuk_token.py
View File

@@ -114,7 +114,7 @@ class gnuk_token(object):
def mem_info(self):
mem = self.__devhandle.controlMsg(requestType = 0xc0, request = 0,
value = 0, index = 0, buffer = 8,
buffer = 8, value = 0, index = 0,
timeout = 10)
start = ((mem[3]*256 + mem[2])*256 + mem[1])*256 + mem[0]
end = ((mem[7]*256 + mem[6])*256 + mem[5])*256 + mem[4]
@@ -123,7 +123,7 @@ class gnuk_token(object):
def download(self, start, data, verbose=False):
addr = start
addr_end = (start + len(data)) & 0xffffff00
i = (addr - 0x20000000) / 0x100
i = int((addr - 0x20000000) / 0x100)
j = 0
print("start %08x" % addr)
print("end %08x" % addr_end)
@@ -131,9 +131,8 @@ class gnuk_token(object):
if verbose:
print("# %08x: %d : %d" % (addr, i, 256))
self.__devhandle.controlMsg(requestType = 0x40, request = 1,
value = i, index = 0,
buffer = data[j*256:j*256+256],
timeout = 10)
value = i, index = 0, timeout = 10)
i = i+1
j = j+1
addr = addr + 256
@@ -142,15 +141,14 @@ class gnuk_token(object):
if verbose:
print("# %08x: %d : %d" % (addr, i, residue))
self.__devhandle.controlMsg(requestType = 0x40, request = 1,
value = i, index = 0,
buffer = data[j*256:],
timeout = 10)
value = i, index = 0, timeout = 10)
def execute(self, last_addr):
i = (last_addr - 0x20000000) / 0x100
i = int((last_addr - 0x20000000) / 0x100)
o = (last_addr - 0x20000000) % 0x100
self.__devhandle.controlMsg(requestType = 0x40, request = 2,
value = i, index = o, buffer = None,
buffer = None, value = i, index = o,
timeout = 10)
def icc_get_result(self):
@@ -484,7 +482,7 @@ class regnual(object):
def mem_info(self):
mem = self.__devhandle.controlMsg(requestType = 0xc0, request = 0,
value = 0, index = 0, buffer = 8,
buffer = 8, value = 0, index = 0,
timeout = 10000)
start = ((mem[3]*256 + mem[2])*256 + mem[1])*256 + mem[0]
end = ((mem[7]*256 + mem[6])*256 + mem[5])*256 + mem[4]
@@ -493,7 +491,7 @@ class regnual(object):
def download(self, start, data, verbose=False):
addr = start
addr_end = (start + len(data)) & 0xffffff00
i = (addr - 0x08000000) / 0x100
i = int((addr - 0x08000000) / 0x100)
j = 0
print("start %08x" % addr)
print("end %08x" % addr_end)
@@ -501,23 +499,21 @@ class regnual(object):
if verbose:
print("# %08x: %d: %d : %d" % (addr, i, j, 256))
self.__devhandle.controlMsg(requestType = 0x40, request = 1,
value = 0, index = 0,
buffer = data[j*256:j*256+256],
timeout = 10000)
value = 0, index = 0, timeout = 10000)
crc32code = crc32(data[j*256:j*256+256])
res = self.__devhandle.controlMsg(requestType = 0xc0, request = 2,
value = 0, index = 0, buffer = 4,
buffer = 4, value = 0, index = 0,
timeout = 10000)
r_value = ((res[3]*256 + res[2])*256 + res[1])*256 + res[0]
if (crc32code ^ r_value) != 0xffffffff:
print("failure")
self.__devhandle.controlMsg(requestType = 0x40, request = 3,
value = i, index = 0,
buffer = None,
timeout = 10000)
value = i, index = 0, timeout = 10000)
time.sleep(0.010)
res = self.__devhandle.controlMsg(requestType = 0xc0, request = 2,
value = 0, index = 0, buffer = 4,
buffer = 4, value = 0, index = 0,
timeout = 10000)
r_value = ((res[3]*256 + res[2])*256 + res[1])*256 + res[0]
if r_value == 0:
@@ -530,23 +526,21 @@ class regnual(object):
if verbose:
print("# %08x: %d : %d" % (addr, i, residue))
self.__devhandle.controlMsg(requestType = 0x40, request = 1,
value = 0, index = 0,
buffer = data[j*256:],
timeout = 10000)
crc32code = crc32(data[j*256:].ljust(256,chr(255)))
value = 0, index = 0, timeout = 10000)
crc32code = crc32(data[j*256:].ljust(256,b'\xff'))
res = self.__devhandle.controlMsg(requestType = 0xc0, request = 2,
value = 0, index = 0, buffer = 4,
buffer = 4, value = 0, index = 0,
timeout = 10000)
r_value = ((res[3]*256 + res[2])*256 + res[1])*256 + res[0]
if (crc32code ^ r_value) != 0xffffffff:
print("failure")
self.__devhandle.controlMsg(requestType = 0x40, request = 3,
value = i, index = 0,
buffer = None,
timeout = 10000)
value = i, index = 0, timeout = 10000)
time.sleep(0.010)
res = self.__devhandle.controlMsg(requestType = 0xc0, request = 2,
value = 0, index = 0, buffer = 4,
buffer = 4, value = 0, index = 0,
timeout = 10000)
r_value = ((res[3]*256 + res[2])*256 + res[1])*256 + res[0]
if r_value == 0:
@@ -554,11 +548,11 @@ class regnual(object):
def protect(self):
self.__devhandle.controlMsg(requestType = 0x40, request = 4,
value = 0, index = 0, buffer = None,
buffer = None, value = 0, index = 0,
timeout = 10000)
time.sleep(0.100)
res = self.__devhandle.controlMsg(requestType = 0xc0, request = 2,
value = 0, index = 0, buffer = 4,
buffer = 4, value = 0, index = 0,
timeout = 10000)
r_value = ((res[3]*256 + res[2])*256 + res[1])*256 + res[0]
if r_value == 0:
@@ -566,7 +560,7 @@ class regnual(object):
def finish(self):
self.__devhandle.controlMsg(requestType = 0x40, request = 5,
value = 0, index = 0, buffer = None,
buffer = None, value = 0, index = 0,
timeout = 10000)
def reset_device(self):