Skip to content

Commit 79e20df

Browse files
Forgot these
Signed-off-by: James Ball <jameball@qti.qualcomm.com>
1 parent 118e618 commit 79e20df

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

schemas/params-schema.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,14 @@
182182
"required": ["width-parameter"]
183183
}
184184
}
185+
},
186+
{
187+
"if": {
188+
"required": ["func-of-field-name"]
189+
},
190+
"then": {
191+
"required": ["func-of-reg-name"]
192+
}
185193
}
186194
],
187195
"additionalProperties": false

tests/params/expected/test-params.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,6 +1535,7 @@
15351535
"chapter_name": "Two",
15361536
"category": "WARL",
15371537
"type": "LegalEnum",
1538+
"func-of-reg-name": "foo",
15381539
"func-of-field-name": "GHI",
15391540
"impl-defs": [
15401541
{

tools/create_params.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,8 +635,11 @@ def csr_id(field_name: Optional[str] = None) -> str:
635635

636636
if parameter_name is not None:
637637
out_entry["width-parameter"] = parameter_name
638-
if func_of_reg_name is not None:
639-
out_entry["func-of-reg-name"] = func_of_reg_name
638+
effective_func_of_reg_name = func_of_reg_name
639+
if effective_func_of_reg_name is None and func_of_field_name is not None:
640+
effective_func_of_reg_name = name
641+
if effective_func_of_reg_name is not None:
642+
out_entry["func-of-reg-name"] = effective_func_of_reg_name
640643
if func_of_field_name is not None:
641644
out_entry["func-of-field-name"] = func_of_field_name
642645

0 commit comments

Comments
 (0)