From 40cbe3a95219b914f6c6bba0f905068ea758e646 Mon Sep 17 00:00:00 2001 From: Ilia Sergachev Date: Sun, 2 Jun 2019 20:48:08 +0200 Subject: [PATCH 1/2] fix interrupt_name --- litex/soc/integration/soc_core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/litex/soc/integration/soc_core.py b/litex/soc/integration/soc_core.py index cbd1fb548..949bd0434 100644 --- a/litex/soc/integration/soc_core.py +++ b/litex/soc/integration/soc_core.py @@ -361,7 +361,7 @@ class SoCCore(Module): # check that interrupt_id is in range if interrupt_id is not None and interrupt_id >= 32: raise ValueError("{} Interrupt ID out of range ({}, max=31)".format( - interrupt_namename, interrupt_id)) + interrupt_name, interrupt_id)) # interrupt_id not provided: allocate interrupt to the first available id if interrupt_id is None: @@ -369,7 +369,7 @@ class SoCCore(Module): if n not in self.soc_interrupt_map.values(): self.soc_interrupt_map.update({interrupt_name: n}) return - raise ValueError("No more space to allocate {} interrupt".format(name)) + raise ValueError("No more space to allocate {} interrupt".format(interrupt_name)) # interrupt_id provided: check that interrupt_id is not already used and add interrupt else: for _name, _id in self.soc_interrupt_map.items(): From db890736ea8d58435698c4c1af27c6c7236a48e3 Mon Sep 17 00:00:00 2001 From: Ilia Sergachev Date: Sun, 2 Jun 2019 20:56:02 +0200 Subject: [PATCH 2/2] fix csr_name in add_csr() --- litex/soc/integration/soc_core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/litex/soc/integration/soc_core.py b/litex/soc/integration/soc_core.py index 949bd0434..86b0100ae 100644 --- a/litex/soc/integration/soc_core.py +++ b/litex/soc/integration/soc_core.py @@ -397,7 +397,7 @@ class SoCCore(Module): if n not in self.soc_csr_map.values(): self.soc_csr_map.update({csr_name: n}) return - raise ValueError("No more space to allocate {} csr".format(name)) + raise ValueError("No more space to allocate {} csr".format(csr_name)) # csr_id provided: check that csr_id is not already used and add csr else: for _name, _id in self.soc_csr_map.items():