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 <sean@xobs.io>

diff --git a/litex/soc/doc/__init__.py b/litex/soc/doc/__init__.py
index 38c753c541fedb22eb8998e18c2dc389b0e9cd81..2a1274bfabe34f1d4c67ba5bfc79f00eaa6cde4e 100644 (file)
--- 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
index c91f535240ebf67cf44263ccd5935fc665fadd7a..89c516ab3a5c09fc96bb5c236fb10d88be2e1161 100644 (file)
--- a/litex/soc/integration/export.py
+++ b/litex/soc/integration/export.py
@@ -333,7 +333,7 @@ def get_svd(soc, vendor="litex", name="soc", description=None):
         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 = []