From a1400cecb8d8b423e83bd584e59fa817b8a243d9 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Wed, 15 Sep 2021 09:02:08 -0700 Subject: misc: api move continued Move control ping and change dependencies from vpe.api_types to memclnt.api_types Type: refactor Signed-off-by: Florin Coras Change-Id: I9f8bc442e28738c48d64d1f6794082c8c4f5725b --- src/vpp-api/vapi/vapi.c | 3 ++- src/vpp-api/vapi/vapi_c_gen.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/vpp-api/vapi') diff --git a/src/vpp-api/vapi/vapi.c b/src/vpp-api/vapi/vapi.c index ec87e7b7b72..1bd8e5bdd9f 100644 --- a/src/vpp-api/vapi/vapi.c +++ b/src/vpp-api/vapi/vapi.c @@ -31,6 +31,7 @@ #include #include +#include #include /* we need to use control pings for some stuff and because we're forced to put @@ -40,7 +41,7 @@ vapi_msg_id_t vapi_msg_id_control_ping = 0; vapi_msg_id_t vapi_msg_id_control_ping_reply = 0; DEFINE_VAPI_MSG_IDS_MEMCLNT_API_JSON; -DEFINE_VAPI_MSG_IDS_VPE_API_JSON; +DEFINE_VAPI_MSG_IDS_VLIB_API_JSON; struct { diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py index f0a284ccbc1..eacfab41555 100755 --- a/src/vpp-api/vapi/vapi_c_gen.py +++ b/src/vpp-api/vapi/vapi_c_gen.py @@ -705,12 +705,12 @@ def gen_json_unified_header(parser, logger, j, io, name): print("#ifdef __cplusplus") print("extern \"C\" {") print("#endif") - if name == "vpe.api.vapi.h": + if name == "vlib.api.vapi.h": print("") print("static inline vapi_error_e vapi_send_with_control_ping " "(vapi_ctx_t ctx, void * msg, u32 context);") else: - print("#include ") + print("#include ") print("") for m in parser.messages_by_json[j].values(): print("extern vapi_msg_id_t %s;" % m.get_msg_id_name()) @@ -737,7 +737,7 @@ def gen_json_unified_header(parser, logger, j, io, name): print("") - if name == "vpe.api.vapi.h": + if name == "vlib.api.vapi.h": print("%s" % vapi_send_with_control_ping) print("") -- cgit 1.2.3-korg