aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/avf/avf_api.c
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-09-25 17:33:46 +0200
committerOle Trøan <otroan@employees.org>2019-09-27 09:07:27 +0000
commit74af6f081f2360eca7578f04c8ecff617e911b53 (patch)
tree1e863b5b5a090389a47e62c4580b6a6dfb44dbe3 /src/plugins/avf/avf_api.c
parent7eef62b6736a96ab0e4ffe0363c0fb5ba55841b8 (diff)
avf: remote api boilerplate
Type: refactor Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: Iafa1c0d0c1195f88b1a55f0341459c3278c3b2e6 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/plugins/avf/avf_api.c')
-rw-r--r--src/plugins/avf/avf_api.c66
1 files changed, 4 insertions, 62 deletions
diff --git a/src/plugins/avf/avf_api.c b/src/plugins/avf/avf_api.c
index e9c7f49e2e5..1ddc45f2348 100644
--- a/src/plugins/avf/avf_api.c
+++ b/src/plugins/avf/avf_api.c
@@ -26,35 +26,11 @@
#include <vlibmemory/api.h>
/* define message IDs */
-#include <avf/avf_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <avf/avf_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <avf/avf_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <avf/avf_all_api_h.h>
-#undef vl_printfun
-
-/* get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <avf/avf_all_api_h.h>
-#undef vl_api_version
+#include <avf/avf.api_enum.h>
+#include <avf/avf.api_types.h>
#include <vlibapi/api_helper_macros.h>
-#define foreach_avf_plugin_api_msg \
-_(AVF_CREATE, avf_create) \
-_(AVF_DELETE, avf_delete)
-
static void
vl_api_avf_create_t_handler (vl_api_avf_create_t * mp)
{
@@ -111,49 +87,15 @@ reply:
REPLY_MACRO (VL_API_AVF_DELETE_REPLY + am->msg_id_base);
}
-#define vl_msg_name_crc_list
-#include <avf/avf_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (avf_main_t * avm, api_main_t * am)
-{
-#define _(id,n,crc) \
- vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + avm->msg_id_base);
- foreach_vl_msg_name_crc_avf;
-#undef _
-}
-
/* set tup the API message handling tables */
+#include <avf/avf.api.c>
static clib_error_t *
avf_plugin_api_hookup (vlib_main_t * vm)
{
avf_main_t *avm = &avf_main;
- api_main_t *am = &api_main;
- u8 *name;
-
- /* construct the API name */
- name = format (0, "avf_%08x%c", api_version, 0);
/* ask for a correctly-sized block of API message decode slots */
- avm->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + avm->msg_id_base), \
- #n, \
- vl_api_##n##_t_handler, \
- vl_noop_handler, \
- vl_api_##n##_t_endian, \
- vl_api_##n##_t_print, \
- sizeof(vl_api_##n##_t), 1);
- foreach_avf_plugin_api_msg;
-#undef _
-
- /* set up the (msg_name, crc, message-id) table */
- setup_message_id_table (avm, am);
-
- vec_free (name);
+ avm->msg_id_base = setup_message_id_table ();
return 0;
}