Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-21 16:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

HAL_ChibiOS: fixed dma resolved for H7

Browse Source
This commit is contained in:
Andrew Tridgell 2019-02-19 09:50:04 +11:00
parent c5fc3d6b0f
commit 778d892fc2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ def get_sharing_priority(periph_list, priority_list):
highest = prio
return highest
def generate_DMAMUX_map(peripheral_list, noshare_list):
def generate_DMAMUX_map(peripheral_list, noshare_list, dma_exclude):
'''
generate a dma map suitable for a board with a DMAMUX
@ -106,22 +106,25 @@ def generate_DMAMUX_map(peripheral_list, noshare_list):
idsets[p] = set()
for p in peripheral_list:
if can_share(p, noshare_list):
if can_share(p, noshare_list) or p in dma_exclude:
continue
for i in range(16):
mask = (1<<i)
if available & mask != 0:
available ^= mask
available &= ~mask
dma = (i // 8) + 1
stream = i % 8
dma_map[p].append((dma,stream,0))
idsets[p].add(i)
break
if debug:
print('dma_map1: ', dma_map)
# now shareable
idx = 0
for p in peripheral_list:
if not can_share(p, noshare_list):
if not can_share(p, noshare_list) or p in dma_exclude:
continue
base = idx % 16
for i in range(16):
@ -145,7 +148,7 @@ def generate_DMAMUX_map(peripheral_list, noshare_list):
other = None
if other is not None and ii in idsets[other]:
if len(idsets[p]) >= len(idsets[other]):
if len(idsets[p]) >= len(idsets[other]) and len(idsets[other]) > 0:
continue
idsets[other].remove(ii)
dma_map[other].remove((dma,stream))
@ -190,7 +193,7 @@ def write_dma_header(f, peripheral_list, mcu_type, dma_exclude=[],
if dma_map is None:
have_DMAMUX = True
dma_map = generate_DMAMUX_map(peripheral_list, noshare_list)
dma_map = generate_DMAMUX_map(peripheral_list, noshare_list, dma_exclude)
else:
have_DMAMUX = False