summaryrefslogtreecommitdiffstats
path: root/extras/emacs/plugin-main-skel.el
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2019-10-01 12:10:57 -0400
committerDave Barach <openvpp@barachs.net>2019-10-03 16:52:38 +0000
commit4ec6f6bc7788f3c356a022ea5fd019ca4e815747 (patch)
tree2c5fc0c053d1d7e3038fa49236b54c5a9cdaffec /extras/emacs/plugin-main-skel.el
parentd570c4d18df404cb59ef72d20d56f8e31418c8e9 (diff)
emacs: track improvements in vppapigen
Remove boilerplate which is now generated by vppapigen Type: refactor Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: I36bff1a651ac48caa969ed76d963b0a733ef5532
Diffstat (limited to 'extras/emacs/plugin-main-skel.el')
-rw-r--r--extras/emacs/plugin-main-skel.el76
1 files changed, 5 insertions, 71 deletions
diff --git a/extras/emacs/plugin-main-skel.el b/extras/emacs/plugin-main-skel.el
index 632a1329c2d..e8969c85488 100644
--- a/extras/emacs/plugin-main-skel.el
+++ b/extras/emacs/plugin-main-skel.el
@@ -49,40 +49,14 @@ nil
#include <vpp/app/version.h>
#include <stdbool.h>
-/* define message IDs */
-#include <" plugin-name "/" plugin-name "_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <" plugin-name "/" plugin-name "_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <" plugin-name "/" plugin-name "_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 <" plugin-name "/" plugin-name "_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <" plugin-name "/" plugin-name "_all_api_h.h>
-#undef vl_api_version
+#include <" plugin-name "/" plugin-name ".api_enum.h>
+#include <" plugin-name "/" plugin-name ".api_types.h>
#define REPLY_MSG_ID_BASE " main-p "->msg_id_base
#include <vlibapi/api_helper_macros.h>
" plugin-name "_main_t " plugin-name "_main;
-/* List of message types that this plugin understands */
-
-#define foreach_" plugin-name "_plugin_api_msg \\
-_(" PLUGIN-NAME "_ENABLE_DISABLE, " plugin-name "_enable_disable)
-
/* Action function shared between message handler and debug CLI */
int " plugin-name "_enable_disable (" plugin-name "_main_t * " main-p ", u32 sw_if_index,
@@ -186,59 +160,19 @@ static void vl_api_" plugin-name "_enable_disable_t_handler
REPLY_MACRO(VL_API_" PLUGIN-NAME "_ENABLE_DISABLE_REPLY);
}
-/* Set up the API message handling tables */
-static clib_error_t *
-" plugin-name "_plugin_api_hookup (vlib_main_t *vm)
-{
- " plugin-name "_main_t * " main-p " = &" plugin-name "_main;
-#define _(N,n) \\
- vl_msg_api_set_handlers((VL_API_##N + " main-p "->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_" plugin-name "_plugin_api_msg;
-#undef _
-
- return 0;
-}
-
-#define vl_msg_name_crc_list
-#include <" plugin-name "/" plugin-name "_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (" plugin-name "_main_t * " main-p ", api_main_t * am)
-{
-#define _(id,n,crc) \
- vl_msg_api_add_msg_name_crc (am, #n \"_\" #crc, id + " main-p "->msg_id_base);
- foreach_vl_msg_name_crc_" plugin-name" ;
-#undef _
-}
+/* API definitions */
+#include <" plugin-name "/" plugin-name ".api.c>
static clib_error_t * " plugin-name "_init (vlib_main_t * vm)
{
" plugin-name "_main_t * " main-p " = &" plugin-name "_main;
clib_error_t * error = 0;
- u8 * name;
" main-p "->vlib_main = vm;
" main-p "->vnet_main = vnet_get_main();
- name = format (0, \"" plugin-name "_%08x%c\", api_version, 0);
-
- /* Ask for a correctly-sized block of API message decode slots */
- " main-p "->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
- error = " plugin-name "_plugin_api_hookup (vm);
-
/* Add our API messages to the global name_crc hash table */
- setup_message_id_table (" main-p ", &api_main);
-
- vec_free(name);
+ " main-p "->msg_id_base = setup_message_id_table ();
return error;
}