mirror/qca-swiss-army-knife
1
0
Fork 0
mirror of https://github.com/qca/qca-swiss-army-knife.git synced 2026-01-27 17:07:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/alimon/qca-swiss-army-knife

Browse source
This commit is contained in:
Kalle Valo 2020-05-20 17:33:15 +03:00
commit 8c813ad8b8
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tools/scripts/ath10k/ath10k-bdencoder
View file

@ -72,6 +72,8 @@ def add_ie(buf, offset, id, value):
struct.pack_into('<B', padding, i, PADDING_MAGIC)
fmt = '<2i%ds%ds' % (len(value), padding_len)
if not isinstance(value, bytes):
value = value.encode()
struct.pack_into(fmt, buf, offset, id, len(value), value, padding.raw)
offset = offset + TYPE_LENGTH_SIZE + len(value) + padding_len
@ -276,7 +278,7 @@ class BoardContainer:
self = BoardContainer()
if not os.path.exists(filename):
print 'mapping file %s not found' % (filename)
print('mapping file %s not found' % (filename))
return
f = open(filename, 'r')
@ -302,7 +304,7 @@ class BoardContainer:
# TODO: Find a better way to report problems,
# maybe return a list of strings? Or use an
# exception?
print 'Warning: duplicate board name: %s' % (name.name)
print('Warning: duplicate board name: %s' % (name.name))
return
allnames.append(name)
@ -319,7 +321,7 @@ class BoardContainer:
struct.pack_into('<B', padding, i, PADDING_MAGIC)
fmt = '<%ds%ds' % (len(signature), pad_len)
struct.pack_into(fmt, buf, offset, signature, padding.raw)
struct.pack_into(fmt, buf, offset, signature.encode(), padding.raw)
offset += length
# make sure ATH10K_BOARD_SIGNATURE_LEN is correct
@ -344,7 +346,7 @@ class BoardContainer:
(signature, null) = struct.unpack_from(fmt, buf, offset)
if signature != ATH10K_BOARD_SIGNATURE or null != 0:
print "invalid signature found in %s" % name
print("invalid signature found in %s" % name)
return 1
offset += ATH10K_BOARD_SIGNATURE_LEN
@ -358,9 +360,9 @@ class BoardContainer:
offset += TYPE_LENGTH_SIZE
if offset + ie_len > buf_len:
print 'Error: Buffer too short (%d + %d > %d)' % (offset,
print('Error: Buffer too short (%d + %d > %d)' % (offset,
ie_len,
buf_len)
buf_len))
return 1
# FIXME: create separate ExtenderBoard() class and
@ -383,7 +385,7 @@ class BoardContainer:
self.validate()
print "board binary file '%s' is created" % name
print("board binary file '%s' is created" % name)
def get_bin(self):
buf = ctypes.create_string_buffer(MAX_BUF_LEN)
@ -447,14 +449,14 @@ def cmd_extract(args):
f.write(board.data.data)
f.close()
print "%s created size: %d" % (filename, len(board.data.data))
print("%s created size: %d" % (filename, len(board.data.data)))
filename = DEFAULT_JSON_FILE
f = open(filename, 'w')
f.write(json.dumps(mapping, indent=4))
f.close()
print "%s created" % (filename)
print("%s created" % (filename))
def cmd_info(args):
@ -462,7 +464,7 @@ def cmd_info(args):
cont = BoardContainer().open(filename)
print cont.get_summary()
print(cont.get_summary())
def cmd_diff(args):
@ -473,7 +475,7 @@ def cmd_diff(args):
filename1 = args.diffstat[0]
filename2 = args.diffstat[1]
print diff_boardfiles(filename1, filename2, args.diff)
print(diff_boardfiles(filename1, filename2, args.diff))
def diff_boardfiles(filename1, filename2, diff):
@ -501,10 +503,10 @@ def diff_boardfiles(filename1, filename2, diff):
if e.returncode == 1:
output = e.output
else:
print 'Failed to run wdiff: %d\n%s' % (e.returncode, e.output)
print('Failed to run wdiff: %d\n%s' % (e.returncode, e.output))
return 1
except OSError as e:
print 'Failed to run wdiff: %s' % (e)
print('Failed to run wdiff: %s' % (e))
return 1
result += '%s\n' % (output)
@ -568,7 +570,7 @@ def cmd_create(args):
def cmd_add_board(args):
if len(args.add_board) < 3:
print 'error: --add-board requires 3 or more arguments, only %d given' % (len(args.add_board))
print('error: --add-board requires 3 or more arguments, only %d given' % (len(args.add_board)))
sys.exit(1)
board_filename = args.add_board[0]
@ -587,7 +589,7 @@ def cmd_add_board(args):
container.add_board(new_data, new_names)
container.write(board_filename)
print diff_boardfiles(temp_pathname, board_filename, False)
print(diff_boardfiles(temp_pathname, board_filename, False))
os.remove(temp_pathname)