aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HAL_ChibiOS: fixed hwdef DMA resolver dependency on python2/python3

Browse Source 
we need to use sorted keys in dictionaries to ensure we end up with
the same DMA mapping when using py2 and py3

fixes #15534
This commit is contained in:
Andrew Tridgell 2020-10-08 08:46:48 +11:00
parent 50cff80c6e
commit 5024261e2e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -1691,7 +1691,7 @@ def write_board_validate_macro(f):
check_string = output
validate_dict[check_name] = check_string
# Finally create check conditional
for check_name in validate_dict:
for check_name in sorted(validate_dict.keys()):
validate_string += "!" + validate_dict[check_name] + "?" + "\"" + check_name + "\"" + ":"
validate_string += "nullptr"
f.write('#define HAL_VALIDATE_BOARD (%s)\n\n' % validate_string)
@ -2343,8 +2343,8 @@ def write_alt_config(f):
#define HAL_PIN_ALT_CONFIG { \\
''')
for alt in altmap.keys():
for pp in altmap[alt].keys():
for alt in sorted(altmap.keys()):
for pp in sorted(altmap[alt].keys()):
p = altmap[alt][pp]
f.write(" { %u, %s, PAL_LINE(GPIO%s,%uU), %s, %u}, /* %s */ \\\n" % (alt, p.pal_modeline(), p.port, p.pin, p.periph_type(), p.periph_instance(), str(p)))
f.write('}\n\n')

8
libraries/AP_HAL_ChibiOS/hwdef/scripts/dma_resolver.py
View File

@ -15,7 +15,7 @@ def check_possibility(periph, dma_stream, curr_dict, dma_map, check_list, cannot
global ignore_list
if debug:
print('............ Checking ', periph, dma_stream, 'without', cannot_use_stream)
for other_periph in curr_dict:
for other_periph in sorted(curr_dict.keys()):
if other_periph != periph:
if curr_dict[other_periph] == dma_stream:
if other_periph in forbidden_map[periph]:
@ -240,7 +240,7 @@ def generate_DMAMUX_map(peripheral_list, noshare_list, dma_exclude, stream_ofs):
# static allocation is in stm32h7_mcuconf.h
map2 = generate_DMAMUX_map_mask(dmamux2_peripherals, 0xff, noshare_list, dma_exclude, stream_ofs)
# translate entries from map2 to "DMA controller 3", which is used for BDMA
for p in map2.keys():
for p in sorted(map2.keys()):
streams = []
for (controller,stream) in map2[p]:
streams.append((3,stream))
@ -374,7 +374,7 @@ def write_dma_header(f, peripheral_list, mcu_type, dma_exclude=[],
# now look for shared DMA possibilities
stream_assign = {}
for k in curr_dict.keys():
for k in sorted(curr_dict.keys()):
p = curr_dict[k]
if not p in stream_assign:
stream_assign[p] = [k]
@ -471,7 +471,7 @@ def write_dma_header(f, peripheral_list, mcu_type, dma_exclude=[],
f.write("#define %-30s STM32_DMA_STREAM_ID(%u, %u)%s\n" %
(chibios_dma_define_name(chkey)+'STREAM', dma_controller,
curr_dict[key][1], shared))
for streamchan in dma_map[key]:
for streamchan in sorted(dma_map[key]):
if stream == (streamchan[0], streamchan[1]):
if have_DMAMUX:
chan = dmamux_channel(key)