From: Sean Cross <sean@xobs.io>
Date: Thu, 13 Feb 2020 00:32:44 +0000 (+0800)
Subject: doc: fix regression with new irq manager
X-Git-Tag: 24jan2021_ls180~671
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=baa29f1b03fc726dd4333443e6a24a6f3f71f9b6;p=litex.git

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 38c753c5..2a1274bf 100644
--- 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 c91f5352..89c516ab 100644
--- 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 = []