From baa29f1b03fc726dd4333443e6a24a6f3f71f9b6 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Thu, 13 Feb 2020 08:32:44 +0800 Subject: [PATCH] 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 --- litex/soc/doc/__init__.py | 2 +- litex/soc/integration/export.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/litex/soc/doc/__init__.py b/litex/soc/doc/__init__.py index 38c753c54..2a1274bfa 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 c91f53524..89c516ab3 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(' ') 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 = []