diff --git a/src/peakrdl_regblock/hwif/__init__.py b/src/peakrdl_regblock/hwif/__init__.py index 4ff95f0..1462264 100644 --- a/src/peakrdl_regblock/hwif/__init__.py +++ b/src/peakrdl_regblock/hwif/__init__.py @@ -50,7 +50,7 @@ class Hwif: def get_extra_package_params(self) -> str: - lines = [] + lines = [""] for param in self.top_node.inst.parameters: value = param.get_value() @@ -70,7 +70,7 @@ class Hwif: """ If this hwif requires a package, generate the string """ - lines = [] + lines = [""] gen_in = self._gen_in_cls(self) structs_in = gen_in.get_struct( diff --git a/src/peakrdl_regblock/package_tmpl.sv b/src/peakrdl_regblock/package_tmpl.sv index 5e71fc6..b665495 100644 --- a/src/peakrdl_regblock/package_tmpl.sv +++ b/src/peakrdl_regblock/package_tmpl.sv @@ -7,8 +7,8 @@ package {{ds.package_name}}; localparam {{ds.module_name.upper()}}_MIN_ADDR_WIDTH = {{ds.addr_width}}; localparam {{ds.module_name.upper()}}_SIZE = {{SVInt(ds.top_node.size)}}; - {{hwif.get_extra_package_params()|indent}} + {{-hwif.get_extra_package_params()|indent}} - {{hwif.get_package_contents()|indent}} + {{-hwif.get_package_contents()|indent}} endpackage {# (eof newline anchor) #} diff --git a/tests/test_pkg_params/regblock.rdl b/tests/test_pkg_params/regblock.rdl index 41660de..09b7418 100644 --- a/tests/test_pkg_params/regblock.rdl +++ b/tests/test_pkg_params/regblock.rdl @@ -5,7 +5,7 @@ addrmap top #( ) { reg reg_t { regwidth = REGWIDTH; - field {sw=rw; hw=na;} f[REGWIDTH] = 1; + field {sw=rw; hw=r;} f[REGWIDTH] = 1; }; reg_t regs[N_REGS]; };