doc: fix regression with new irq manager

Previously, we were accessing the `soc.soc_interrupt_map` property in order to be able to enumerate the interrupts. This has been subsumed into a more general `irq` object that manages the interrupts. Use `soc.irq.locs` instead of `soc.soc_interrupt_map` as the authority on interrupts for both doc and export. This fixes #385. Signed-off-by: Sean Cross <[email protected]>
enjoy-digital · Feb 13, 2020 · baa29f1 · baa29f1
1 parent 1620f9c
commit baa29f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/litex/soc/doc/__init__.py b/litex/soc/doc/__init__.py
@@ -70,7 +70,7 @@ def generate_docs(soc, base_dir, project_name="LiteX SoC Project",
 
     # Gather all interrupts so we can easily map IRQ numbers to CSR sections
     interrupts = {}
-    for csr, irq in sorted(soc.soc_interrupt_map.items()):
+    for csr, irq in sorted(soc.irq.locs.items()):
         interrupts[csr] = irq
 
     # Convert each CSR region into a DocumentedCSRRegion.

diff --git a/litex/soc/integration/export.py b/litex/soc/integration/export.py
@@ -333,7 +333,7 @@ def print_svd_register(csr, csr_address, description, length, svd):
         svd.append('                </register>')
 
     interrupts = {}
-    for csr, irq in sorted(soc.soc_interrupt_map.items()):
+    for csr, irq in sorted(soc.irq.locs.items()):
         interrupts[csr] = irq
 
     documented_regions = []