From cbeb6172a85de1cfb3425877916464e78c529ed4 Mon Sep 17 00:00:00 2001 From: Paul Roukema Date: Fri, 26 Aug 2022 11:13:07 -0400 Subject: [PATCH] Fix "hier" mode hwif generation Signed-off-by: Paul Roukema --- src/peakrdl_regblock/hwif/generators.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/peakrdl_regblock/hwif/generators.py b/src/peakrdl_regblock/hwif/generators.py index fa48b77..2a9aea9 100644 --- a/src/peakrdl_regblock/hwif/generators.py +++ b/src/peakrdl_regblock/hwif/generators.py @@ -17,7 +17,7 @@ class InputStructGenerator_Hier(RDLFlatStructGenerator): def get_typdef_name(self, node:'Node') -> str: base = node.get_rel_path( - self.top_node.parent, + self.top_node, hier_separator="__", array_suffix="x", empty_array_suffix="x" @@ -73,13 +73,14 @@ class InputStructGenerator_Hier(RDLFlatStructGenerator): class OutputStructGenerator_Hier(RDLFlatStructGenerator): - def __init__(self, top_node: 'Node'): + def __init__(self, hwif: 'Hwif') -> None: super().__init__() - self.top_node = top_node + self.hwif = hwif + self.top_node = hwif.top_node def get_typdef_name(self, node:'Node') -> str: base = node.get_rel_path( - self.top_node.parent, + self.top_node, hier_separator="__", array_suffix="x", empty_array_suffix="x"