Commit 9858bfc2 authored by Jakub Kicinski's avatar Jakub Kicinski

tools: ynl-gen: use enum names in op strmap more carefully

In preparation for supporting families which use different msg
ids to and from the kernel - make sure the ids in op strmap
are correct. The map is expected to be used mostly for notifications,
don't generate a separate map for the "to kernel" direction.
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8947e503
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
/* Enums */ /* Enums */
static const char * const fou_op_strmap[] = { static const char * const fou_op_strmap[] = {
[FOU_CMD_UNSPEC] = "unspec",
[FOU_CMD_ADD] = "add", [FOU_CMD_ADD] = "add",
[FOU_CMD_DEL] = "del", [FOU_CMD_DEL] = "del",
[FOU_CMD_GET] = "get", [FOU_CMD_GET] = "get",
......
...@@ -442,6 +442,10 @@ class SpecFamily(SpecElement): ...@@ -442,6 +442,10 @@ class SpecFamily(SpecElement):
else: else:
raise Exception("Can't parse directional ops") raise Exception("Can't parse directional ops")
if req_val == req_val_next:
req_val = None
if rsp_val == rsp_val_next:
rsp_val = None
op = self.new_operation(elem, req_val, rsp_val) op = self.new_operation(elem, req_val, rsp_val)
req_val = req_val_next req_val = req_val_next
rsp_val = rsp_val_next rsp_val = rsp_val_next
......
...@@ -1220,7 +1220,11 @@ def put_op_name(family, cw): ...@@ -1220,7 +1220,11 @@ def put_op_name(family, cw):
map_name = f'{family.name}_op_strmap' map_name = f'{family.name}_op_strmap'
cw.block_start(line=f"static const char * const {map_name}[] =") cw.block_start(line=f"static const char * const {map_name}[] =")
for op_name, op in family.msgs.items(): for op_name, op in family.msgs.items():
cw.p(f'[{op.enum_name}] = "{op_name}",') if op.rsp_value:
if op.req_value == op.rsp_value:
cw.p(f'[{op.enum_name}] = "{op_name}",')
else:
cw.p(f'[{op.rsp_value}] = "{op_name}",')
cw.block_end(line=';') cw.block_end(line=';')
cw.nl() cw.nl()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment