X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Fafb%2Fafb-plugin.h;h=02d53143f487d2ed789c184d7441624afbaf0267;hb=2db7c92c0b4f5840884481fa4c95facbdea63bb6;hp=2cfe6289bab4b712e501938efbda826049cf42b5;hpb=06382af9092babedbf56aa1c00b3bd7cb0b86cda;p=src%2Fapp-framework-binder.git

diff --git a/include/afb/afb-plugin.h b/include/afb/afb-plugin.h
index 2cfe6289..02d53143 100644
--- a/include/afb/afb-plugin.h
+++ b/include/afb/afb-plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,95 +17,27 @@
 
 #pragma once
 
-#include <afb/afb-req-itf.h>
-#include <afb/afb-evmgr-itf.h>
-
-/* Plugin Type */
-enum  AFB_pluginE
-{
-	AFB_PLUGIN_JSON = 123456789,
-/*	AFB_PLUGIN_JSCRIPT = 987654321, */
-	AFB_PLUGIN_RAW = 987123546
-};
-
-/* Enum for Session/Token/Authentication middleware */
-enum AFB_sessionE
-{
-	AFB_SESSION_NONE = 0,
-	AFB_SESSION_CREATE = 1,
-	AFB_SESSION_CLOSE = 2,
-	AFB_SESSION_RENEW = 4,
-	AFB_SESSION_CHECK = 8,
-	AFB_SESSION_MASK = 15
-};
-
-/* API definition */
-struct AFB_restapi
-{
-	const char *name;
-	enum AFB_sessionE session;
-	void (*callback)(struct afb_req req);
-	const char *info;
-};
-
-/* Plugin definition */
-struct AFB_plugin
-{
-	enum AFB_pluginE type;  
-	const char *info;
-	const char *prefix;
-	const struct AFB_restapi *apis;
-};
-
-/* config mode */
-enum AFB_Mode {
-	AFB_MODE_LOCAL = 0,
-	AFB_MODE_REMOTE,
-	AFB_MODE_GLOBAL
-};
-
-struct sd_event;
-struct sd_bus;
-
-struct afb_daemon_itf {
-	struct afb_evmgr (*get_evmgr)(void *closure);
-	struct sd_event *(*get_event_loop)(void *closure);
-	struct sd_bus *(*get_user_bus)(void *closure);
-	struct sd_bus *(*get_system_bus)(void *closure);
-};
-
-struct afb_daemon {
-	const struct afb_daemon_itf *itf;
-	void *closure;
-};
-
-struct AFB_interface
-{
-	int verbosity;
-	enum AFB_Mode mode;
-	struct afb_daemon daemon;
-};
-
-extern const struct AFB_plugin *pluginRegister (const struct AFB_interface *interface);
-
-static inline struct afb_evmgr afb_daemon_get_evmgr(struct afb_daemon daemon)
-{
-	return daemon.itf->get_evmgr(daemon.closure);
-}
-
-static inline struct sd_event *afb_daemon_get_event_loop(struct afb_daemon daemon)
-{
-	return daemon.itf->get_event_loop(daemon.closure);
-}
-
-static inline struct sd_bus *afb_daemon_get_user_bus(struct afb_daemon daemon)
-{
-	return daemon.itf->get_user_bus(daemon.closure);
-}
-
-static inline struct sd_bus *afb_daemon_get_system_bus(struct afb_daemon daemon)
-{
-	return daemon.itf->get_system_bus(daemon.closure);
-}
-
+#pragma GCC warning "\n\n    This header file <afb/afb-plugin.h> is OBSOLETE.\n\
+    It is provided for COMPATIBILITY ONLY.\n\n\
+    Please USE <afb/afb-binding.h> and ADAPT YOUR CODE to new names.\n"
+
+#if defined(NO_PLUGIN_VERBOSE_MACRO)
+#  define NO_BINDING_VERBOSE_MACRO
+#endif
+
+#if defined(NO_PLUGIN_FILE_LINE_INDICATION)
+#  define NO_BINDING_FILE_LINE_INDICATION
+#endif
+
+#include "afb-binding.h"
+
+#define AFB_plugin_version         afb_binding_type
+#define AFB_PLUGIN_VERSION_1       AFB_BINDING_VERSION_1
+#define AFB_plugin_desc_v1         afb_binding_desc_v1
+#define AFB_plugin                 afb_binding
+#define AFB_interface              afb_binding_interface
+#define pluginAfbV1Register        afbBindingV1Register
+#define AFB_Mode                   afb_mode
+#define AFB_session_v1             afb_session_v1
+#define AFB_verb_desc_v1           afb_verb_desc_v1