X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=firmware%2Fkingst-la%2Fsigrok-fwextract-kingst-la2016;h=ac626bc5113bee8a3c1a892f351d203d52a90eda;hp=df5f2fe36dcda59e473715a3099fb8cafe3592b4;hb=d22be723ad1e225939dd0ab1d32829aca4ccfafc;hpb=2fa09e19b21cba0959d8031be750527c71b0c541
diff --git a/firmware/kingst-la/sigrok-fwextract-kingst-la2016 b/firmware/kingst-la/sigrok-fwextract-kingst-la2016
index df5f2fe..ac626bc 100755
--- a/firmware/kingst-la/sigrok-fwextract-kingst-la2016
+++ b/firmware/kingst-la/sigrok-fwextract-kingst-la2016
@@ -18,14 +18,20 @@
## along with this program; if not, see .
##
+# This utility extracts FX2 MCU firmware and FPGA bitstream images from
+# the "KingstVIS" vendor software. The blobs are kept in Qt resources
+# sections. The script was tested with several v3.5 software versions.
+
+import argparse
import os
import sys
import re
import struct
import codecs
import importlib.util
+import zlib
-# reuse parseelf.py module from saleae-logic16:
+# Reuse the parseelf.py module from saleae-logic16.
fwdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
parseelf_py = os.path.join(fwdir, "saleae-logic16", "parseelf.py")
spec = importlib.util.spec_from_file_location("parseelf", parseelf_py)
@@ -45,7 +51,7 @@ class qt_resources(object):
s = self._elf.read_section(shdr), shdr
self._elf_sections[idx] = s
return s
-
+
def _get_elf_sym_value(self, sname):
sym = self._elf.symtab[sname]
section, shdr = self._get_elf_section(sym["st_shndx"])
@@ -55,19 +61,19 @@ class qt_resources(object):
print("warning: symbol %s should be %d bytes, but in section is only %d bytes" % (
sname, sym["st_size"], len(value)))
return value
-
- # qt resource stuff:
+
+ # Qt resource stuff.
def _get_resource_name(self, offset):
length, i = struct.unpack(">HI", self._res_names[offset:offset + 2 + 4])
offset += 2 + 4
name = self._res_names[offset:offset + 2 * length].decode("utf-16be")
return name
-
+
def _get_resource_data(self, offset):
length = struct.unpack(">I", self._res_datas[offset:offset + 4])[0]
offset += 4
return self._res_datas[offset:offset + length]
-
+
def _read_resources(self):
RCCFileInfo_Directory = 0x02
def read_table():
@@ -93,17 +99,17 @@ class qt_resources(object):
child_count, first_child = which[2:]
for i in range(child_count):
child = table[first_child + i]
- if child[1] & RCCFileInfo_Directory:
+ if child[1] & RCCFileInfo_Directory:
read_dir_entries(table, child, parents + [child[0]])
else:
country, language, data_offset = child[2:]
full_name = "/".join(parents + [child[0]])
self._resources[full_name] = data_offset
-
+
self._res_datas = self._get_elf_sym_value("_ZL16qt_resource_data")
self._res_names = self._get_elf_sym_value("_ZL16qt_resource_name")
self._res_struct = self._get_elf_sym_value("_ZL18qt_resource_struct")
-
+
self._resources = {} # res_fn -> res_offset
table = read_table()
read_dir_entries(table, table[0])
@@ -118,11 +124,11 @@ class qt_resources(object):
m = re.match(res_fn_re, key)
if m is not None:
yield key
-
+
class res_writer(object):
def __init__(self, res):
self.res = res
-
+
def _write_file(self, fn, data, decoder=None, zero_pad_to=None):
if decoder is not None:
data = decoder(data)
@@ -132,11 +138,12 @@ class res_writer(object):
data += b"\0" * (zero_pad_to - len(data))
with open(fn, "wb") as fp:
fp.write(data)
- print("saved %d bytes to %s" % (len(data), fn))
-
+ data_crc32 = zlib.crc32(data) & 0xffffffff
+ print("saved %d bytes to %s (crc32=%08x)" % (len(data), fn, data_crc32))
+
def extract(self, res_fn, out_fn, decoder=None, zero_pad_to=None):
self._write_file(out_fn, self.res.get_resource(res_fn), decoder=decoder, zero_pad_to=zero_pad_to)
-
+
def extract_re(self, res_fn_re, out_fn, decoder=None):
for res_fn in res.find_resource_names(res_fn_re):
fn = re.sub(res_fn_re, out_fn, res_fn).lower()
@@ -146,7 +153,7 @@ def decode_intel_hex(hexdata):
""" return list of (address, data)
"""
datas = []
- # assume \n or \r\n*
+ # Assume LF-only or CR-LF style end-of-line.
for line in hexdata.split(b"\n"):
line = line.strip()
if chr(line[0]) != ":": raise Exception("invalid line: %r" % line)
@@ -182,15 +189,30 @@ def intel_hex_as_blob(hexdata):
def maybe_intel_hex_as_blob(data):
if data[0] == ord(":") and max(data) < 127:
return intel_hex_as_blob(data)
- return data # keep binary data
+ return data # Keep binary data.
if __name__ == "__main__":
- if len(sys.argv) != 2:
- print("sigrok-fwextract-kingst-la2016 ")
- sys.exit()
-
- res = qt_resources(sys.argv[1])
-
+ parser = argparse.ArgumentParser(description = "KingstVIS firmware extraction")
+ parser.add_argument('executable', help = "KingstVIS executable file")
+ options = parser.parse_args()
+ exe_fn = options.executable
+
+ res = qt_resources(exe_fn)
+
writer = res_writer(res)
- writer.extract("fwfpga/LA2016A", "kingst-la2016a-fpga.bitstream", zero_pad_to=180224)
- writer.extract_re(r"fwusb/fw(.*)", r"kingst-la-\1.fw", decoder=maybe_intel_hex_as_blob)
+
+ # extract all firmware and fpga bitstreams
+ # writer.extract_re(r"fwfpga/(.*)", r"kingst-\1-fpga.bitstream")
+ # writer.extract_re(r"fwusb/fw(.*)", r"kingst-la-\1.fw", decoder=maybe_intel_hex_as_blob)
+
+ # extract fx2 mcu firmware for both the la2016 and la1016
+ # note that 0x01a2 is the usb pid for both of these devices
+ writer.extract_re("fwusb/fw01A2", "kingst-la-01a2.fw", decoder=maybe_intel_hex_as_blob)
+
+ # extract fpga bitstreams for la2016
+ # there are two bitstreams, newer hardware uses the 'a1' bitstream
+ writer.extract_re("fwfpga/LA2016(.*)", r"kingst-la2016\1-fpga.bitstream")
+
+ # extract fpga bitstreams for la1016
+ # there are two bitstreams, newer hardware uses the 'a1' bitstream
+ writer.extract_re("fwfpga/LA1016(.*)", r"kingst-la1016\1-fpga.bitstream")