aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2016-08-02 11:42:20 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2016-08-02 11:42:20 +0200
commit574c9987543b2b615a8ebdeda2b35062b0730742 (patch)
treee1f35ef4c9e7fb6897c74d5ca5d68ba34dc26867
parent904f490e7d70653bb54b53d3bc7c7bead45be844 (diff)
update bindings to the new naming
Change-Id: I75692e7454ec9a863ef72c2bd35e3a8ff0f4c57d Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--bindings/audio/audio-api.c10
-rw-r--r--bindings/media/media-api.c10
-rw-r--r--bindings/radio/radio-api.c10
-rw-r--r--bindings/samples/AuthLogin.c10
-rw-r--r--bindings/samples/DemoContext.c10
-rw-r--r--bindings/samples/DemoPost.c10
-rw-r--r--bindings/samples/HelloWorld.c12
7 files changed, 36 insertions, 36 deletions
diff --git a/bindings/audio/audio-api.c b/bindings/audio/audio-api.c
index 1ba9126c..b20731f2 100644
--- a/bindings/audio/audio-api.c
+++ b/bindings/audio/audio-api.c
@@ -25,7 +25,7 @@
#include "audio-pulse.h"
#endif
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
#include <afb/afb-req-itf.h>
/* ------ BACKEND FUNCTIONS ------- */
@@ -358,7 +358,7 @@ static void ping (struct afb_req request) { /* AFB_SESSION_NONE */
afb_req_success (request, NULL, "Audio - Ping success");
}
-static const struct AFB_verb_desc_v1 verbs[] = {
+static const struct afb_verb_desc_v1 verbs[] = {
{"init" , AFB_SESSION_CHECK, init , "Audio API - init"},
{"volume" , AFB_SESSION_CHECK, volume , "Audio API - volume"},
{"channels", AFB_SESSION_CHECK, channels , "Audio API - channels"},
@@ -368,8 +368,8 @@ static const struct AFB_verb_desc_v1 verbs[] = {
{NULL}
};
-static const struct AFB_plugin pluginDesc = {
- .type = AFB_PLUGIN_VERSION_1,
+static const struct afb_binding pluginDesc = {
+ .type = AFB_BINDING_VERSION_1,
.v1 = {
.info = "Application Framework Binder - Audio plugin",
.prefix = "audio",
@@ -377,7 +377,7 @@ static const struct AFB_plugin pluginDesc = {
}
};
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
{
return &pluginDesc;
}
diff --git a/bindings/media/media-api.c b/bindings/media/media-api.c
index 578d0066..39c2e2c9 100644
--- a/bindings/media/media-api.c
+++ b/bindings/media/media-api.c
@@ -24,7 +24,7 @@
#include "media-api.h"
#include "media-rygel.h"
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
#include <afb/afb-req-itf.h>
json_object* _rygel_list (mediaCtxHandleT *);
@@ -303,7 +303,7 @@ static void ping (struct afb_req request) { /* AFB_SESSION_NONE */
}
-static const struct AFB_verb_desc_v1 verbs[]= {
+static const struct afb_verb_desc_v1 verbs[]= {
{"init" , AFB_SESSION_CHECK, init , "Media API - init" },
{"list" , AFB_SESSION_CHECK, list , "Media API - list" },
{"select" , AFB_SESSION_CHECK, selecting , "Media API - select" },
@@ -316,8 +316,8 @@ static const struct AFB_verb_desc_v1 verbs[]= {
{NULL}
};
-static const struct AFB_plugin pluginDesc = {
- .type = AFB_PLUGIN_VERSION_1,
+static const struct afb_binding pluginDesc = {
+ .type = AFB_BINDING_VERSION_1,
.v1 = {
.info = "Application Framework Binder - Media plugin",
.prefix = "media",
@@ -325,7 +325,7 @@ static const struct AFB_plugin pluginDesc = {
}
};
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
{
return &pluginDesc;
}
diff --git a/bindings/radio/radio-api.c b/bindings/radio/radio-api.c
index 7dd22b69..7b3036ed 100644
--- a/bindings/radio/radio-api.c
+++ b/bindings/radio/radio-api.c
@@ -22,7 +22,7 @@
#include "radio-api.h"
#include "radio-rtlsdr.h"
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
#include <afb/afb-req-itf.h>
/* ********************************************************
@@ -350,7 +350,7 @@ static void ping (struct afb_req request) { /* AFB_SESSION_NONE */
}
-static const struct AFB_verb_desc_v1 verbs[] = {
+static const struct afb_verb_desc_v1 verbs[] = {
{"init" , AFB_SESSION_CHECK, init , "Radio API - init"},
{"power" , AFB_SESSION_CHECK, power , "Radio API - power"},
{"mode" , AFB_SESSION_CHECK, mode , "Radio API - mode"},
@@ -361,8 +361,8 @@ static const struct AFB_verb_desc_v1 verbs[] = {
{NULL}
};
-static const struct AFB_plugin pluginDesc = {
- .type = AFB_PLUGIN_VERSION_1,
+static const struct afb_binding pluginDesc = {
+ .type = AFB_BINDING_VERSION_1,
.v1 = {
.info = "Application Framework Binder - Radio plugin",
.prefix = "radio",
@@ -370,7 +370,7 @@ static const struct AFB_plugin pluginDesc = {
}
};
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
{
return &pluginDesc;
}
diff --git a/bindings/samples/AuthLogin.c b/bindings/samples/AuthLogin.c
index ceb833e9..824efc6d 100644
--- a/bindings/samples/AuthLogin.c
+++ b/bindings/samples/AuthLogin.c
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <json-c/json.h>
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
// Dummy sample of Client Application Context
typedef struct {
@@ -105,7 +105,7 @@ static void clientGetPing (struct afb_req request) {
}
-static const struct AFB_verb_desc_v1 verbs[]= {
+static const struct afb_verb_desc_v1 verbs[]= {
{"ping" , AFB_SESSION_NONE , clientGetPing ,"Ping Rest Test Service"},
{"connect" , AFB_SESSION_LOA_EQ_0 | AFB_SESSION_RENEW, clientContextConnect,"Connect/Login Client"},
{"refresh" , AFB_SESSION_LOA_GE_1 | AFB_SESSION_RENEW, clientContextRefresh,"Refresh Client Authentication Token"},
@@ -114,8 +114,8 @@ static const struct AFB_verb_desc_v1 verbs[]= {
{NULL}
};
-static const struct AFB_plugin plugin_desc = {
- .type = AFB_PLUGIN_VERSION_1,
+static const struct afb_binding plugin_desc = {
+ .type = AFB_BINDING_VERSION_1,
.v1 = {
.info = "Application Framework Binder Authentication sample",
.prefix = "auth",
@@ -123,7 +123,7 @@ static const struct AFB_plugin plugin_desc = {
}
};
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
{
return &plugin_desc;
}
diff --git a/bindings/samples/DemoContext.c b/bindings/samples/DemoContext.c
index 243ed687..0427a4de 100644
--- a/bindings/samples/DemoContext.c
+++ b/bindings/samples/DemoContext.c
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <json-c/json.h>
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
typedef struct {
/*
@@ -121,7 +121,7 @@ static void clientCheckLOA(struct afb_req request)
// NOTE: this sample does not use session to keep test a basic as possible
// in real application most APIs should be protected with AFB_SESSION_CHECK
-static const struct AFB_verb_desc_v1 verbs[]= {
+static const struct afb_verb_desc_v1 verbs[]= {
{"create", AFB_SESSION_CREATE, myCreate , "Create a new session"},
{"action", AFB_SESSION_CHECK , myAction , "Use Session Context"},
{"close" , AFB_SESSION_CLOSE , myClose , "Free Context"},
@@ -144,8 +144,8 @@ static const struct AFB_verb_desc_v1 verbs[]= {
{NULL}
};
-static const struct AFB_plugin plugin_desc = {
- .type = AFB_PLUGIN_VERSION_1,
+static const struct afb_binding plugin_desc = {
+ .type = AFB_BINDING_VERSION_1,
.v1 = {
.info = "Sample of Client Context Usage",
.prefix = "context",
@@ -153,7 +153,7 @@ static const struct AFB_plugin plugin_desc = {
}
};
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
{
return &plugin_desc;
}
diff --git a/bindings/samples/DemoPost.c b/bindings/samples/DemoPost.c
index 69de5572..f74b7e23 100644
--- a/bindings/samples/DemoPost.c
+++ b/bindings/samples/DemoPost.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <json-c/json.h>
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
// Sample Generic Ping Debug API
@@ -76,7 +76,7 @@ static void UploadImage (struct afb_req request)
// NOTE: this sample does not use session to keep test a basic as possible
// in real application upload-xxx should be protected with AFB_SESSION_CHECK
-static const struct AFB_verb_desc_v1 verbs[]= {
+static const struct afb_verb_desc_v1 verbs[]= {
{"ping" , AFB_SESSION_NONE , getPingTest ,"Ping Rest Test Service"},
{"upload-json" , AFB_SESSION_NONE , GetJsonByPost ,"Demo for Json Buffer on Post"},
{"upload-image" , AFB_SESSION_NONE , UploadImage ,"Demo for file upload"},
@@ -85,8 +85,8 @@ static const struct AFB_verb_desc_v1 verbs[]= {
{NULL}
};
-static const struct AFB_plugin plugin_desc = {
- .type = AFB_PLUGIN_VERSION_1,
+static const struct afb_binding plugin_desc = {
+ .type = AFB_BINDING_VERSION_1,
.v1 = {
.info = "Sample with Post Upload Files",
.prefix = "post",
@@ -94,7 +94,7 @@ static const struct AFB_plugin plugin_desc = {
}
};
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
{
return &plugin_desc;
};
diff --git a/bindings/samples/HelloWorld.c b/bindings/samples/HelloWorld.c
index 15544895..48059cf5 100644
--- a/bindings/samples/HelloWorld.c
+++ b/bindings/samples/HelloWorld.c
@@ -19,9 +19,9 @@
#include <string.h>
#include <json-c/json.h>
-#include <afb/afb-plugin.h>
+#include <afb/afb-binding.h>
-const struct AFB_interface *interface;
+const struct afb_binding_interface *interface;
struct event
{
@@ -247,7 +247,7 @@ static void eventpush (struct afb_req request)
// NOTE: this sample does not use session to keep test a basic as possible
// in real application most APIs should be protected with AFB_SESSION_CHECK
-static const struct AFB_verb_desc_v1 verbs[]= {
+static const struct afb_verb_desc_v1 verbs[]= {
{"ping" , AFB_SESSION_NONE, pingSample , "Ping Application Framework"},
{"pingfail" , AFB_SESSION_NONE, pingFail , "Fails"},
{"pingnull" , AFB_SESSION_NONE, pingNull , "Return NULL"},
@@ -263,8 +263,8 @@ static const struct AFB_verb_desc_v1 verbs[]= {
{NULL}
};
-static const struct AFB_plugin plugin_desc = {
- .type = AFB_PLUGIN_VERSION_1,
+static const struct afb_binding plugin_desc = {
+ .type = AFB_BINDING_VERSION_1,
.v1 = {
.info = "Minimal Hello World Sample",
.prefix = "hello",
@@ -272,7 +272,7 @@ static const struct AFB_plugin plugin_desc = {
}
};
-const struct AFB_plugin *pluginAfbV1Register (const struct AFB_interface *itf)
+const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
{
interface = itf;
return &plugin_desc;