M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

remote_csr: interpret length as CSR size, not number of bus words

This commit is contained in:
Sebastien Bourdeauducq 2017-08-31 13:34:48 +08:00
parent 0a5904bbaa
commit 9edff2c520
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
artiq/gateware/remote_csr.py
View File

@ -21,6 +21,7 @@ def _get_csr_data(csv_file):
def get_remote_csr_regions(offset, csv_file): def get_remote_csr_regions(offset, csv_file):
busword = 32
regions = [] regions = []
for region_name, csrs_info in _get_csr_data(csv_file).items(): for region_name, csrs_info in _get_csr_data(csv_file).items():
csrs_info = sorted(csrs_info, key=itemgetter(1)) csrs_info = sorted(csrs_info, key=itemgetter(1))
@ -30,11 +31,12 @@ def get_remote_csr_regions(offset, csv_file):
for csr_name, address, length, ro in csrs_info: for csr_name, address, length, ro in csrs_info:
if address != next_address: if address != next_address:
raise ValueError("CSRs are not contiguous") raise ValueError("CSRs are not contiguous")
next_address += 4*length nr = (length + busword - 1)//busword
next_address += nr*busword//8
if ro: if ro:
csr = CSRStatus(32*length, name=csr_name) csr = CSRStatus(length, name=csr_name)
else: else:
csr = CSRStorage(32*length, name=csr_name) csr = CSRStorage(length, name=csr_name)
csrs.append(csr) csrs.append(csr)
regions.append((region_name, offset + origin, 32, csrs)) regions.append((region_name, offset + origin, busword, csrs))
return regions return regions