aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--afb-source/ctl-apidef.h118
-rw-r--r--ctl-binding/CMakeLists.txt (renamed from afb-source/CMakeLists.txt)9
-rw-r--r--ctl-plugin/CMakeLists.txt1
-rw-r--r--nbproject/configurations.xml20
4 files changed, 8 insertions, 140 deletions
diff --git a/afb-source/ctl-apidef.h b/afb-source/ctl-apidef.h
deleted file mode 100644
index 5738f64..0000000
--- a/afb-source/ctl-apidef.h
+++ /dev/null
@@ -1,118 +0,0 @@
-
-static const char _afb_description_v2_aaaa[] =
- "{\"openapi\":\"3.0.0\",\"$schema\":\"http:iot.bzh/download/openapi/schem"
- "a-3.0/default-schema.json\",\"info\":{\"description\":\"\",\"title\":\"c"
- "ontroler\",\"version\":\"1.0\",\"x-binding-c-generator\":{\"api\":\"aaaa"
- "\",\"version\":2,\"prefix\":\"ctlapi_\",\"postfix\":\"\",\"start\":null,"
- "\"onevent\":\"DispatchOneEvent\",\"init\":\"CtlBindingInit\",\"scope\":\""
- "\",\"private\":false}},\"servers\":[{\"url\":\"ws://{host}:{port}/api/po"
- "lctl\",\"description\":\"Unicens2 API.\",\"variables\":{\"host\":{\"defa"
- "ult\":\"localhost\"},\"port\":{\"default\":\"1234\"}},\"x-afb-events\":["
- "{\"$ref\":\"#/components/schemas/afb-event\"}]}],\"components\":{\"schem"
- "as\":{\"afb-reply\":{\"$ref\":\"#/components/schemas/afb-reply-v2\"},\"a"
- "fb-event\":{\"$ref\":\"#/components/schemas/afb-event-v2\"},\"afb-reply-"
- "v2\":{\"title\":\"Generic response.\",\"type\":\"object\",\"required\":["
- "\"jtype\",\"request\"],\"properties\":{\"jtype\":{\"type\":\"string\",\""
- "const\":\"afb-reply\"},\"request\":{\"type\":\"object\",\"required\":[\""
- "status\"],\"properties\":{\"status\":{\"type\":\"string\"},\"info\":{\"t"
- "ype\":\"string\"},\"token\":{\"type\":\"string\"},\"uuid\":{\"type\":\"s"
- "tring\"},\"reqid\":{\"type\":\"string\"}}},\"response\":{\"type\":\"obje"
- "ct\"}}},\"afb-event-v2\":{\"type\":\"object\",\"required\":[\"jtype\",\""
- "event\"],\"properties\":{\"jtype\":{\"type\":\"string\",\"const\":\"afb-"
- "event\"},\"event\":{\"type\":\"string\"},\"data\":{\"type\":\"object\"}}"
- "}},\"x-permissions\":{\"control\":{\"permission\":\"urn:AGL:permission:a"
- "udio:public:control\"},\"dispatch\":{\"permission\":\"urn:AGL:permission"
- ":audio:public:dispatch\"},\"request\":{\"permission\":\"urn:AGL:permissi"
- "on:audio:public:request\"},\"debug\":{\"permission\":\"urn:AGL:permissio"
- "n:audio:public:debug\"}},\"responses\":{\"200\":{\"description\":\"A com"
- "plex object array response\",\"content\":{\"application/json\":{\"schema"
- "\":{\"$ref\":\"#/components/schemas/afb-reply\"}}}}}},\"paths\":{\"/ping"
- "\":{\"description\":\"Ping Binding\",\"get\":{\"x-permissions\":{\"$ref\""
- ":\"#/components/x-permissions/control\"},\"parameters\":[{\"in\":\"query"
- "\",\"name\":\"args\",\"required\":false,\"schema\":{\"type\":\"json\"}}]"
- ",\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}}}},\"/"
- "subscribe\":{\"description\":\"Subcribe Audio Agent Policy Control End\""
- ",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/contr"
- "ol\"},\"parameters\":[{\"in\":\"query\",\"name\":\"event_patern\",\"requ"
- "ired\":true,\"schema\":{\"type\":\"string\"}}],\"responses\":{\"200\":{\""
- "$ref\":\"#/components/responses/200\"}}}},\"/dispatch\":{\"description\""
- ":\"Request Access to Navigation Audio Channel.\",\"get\":{\"x-permission"
- "s\":{\"$ref\":\"#/components/x-permissions/dispatch\"},\"parameters\":[{"
- "\"in\":\"query\",\"name\":\"zone\",\"required\":false,\"schema\":{\"type"
- "\":\"string\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/respons"
- "es/200\"}}}},\"/request\":{\"description\":\"Execute LUA string script.\""
- ",\"get\":{\"x-permissions\":{\"$ref\":\"#/components/x-permissions/reque"
- "st\"},\"parameters\":[{\"in\":\"query\",\"name\":\"func\",\"required\":t"
- "rue,\"schema\":{\"type\":\"string\"}},{\"in\":\"query\",\"name\":\"args\""
- ",\"required\":false,\"schema\":{\"type\":\"array\"}}],\"responses\":{\"2"
- "00\":{\"$ref\":\"#/components/responses/200\"}}}},\"/debuglua\":{\"descr"
- "iption\":\"Execute LUA string script.\",\"get\":{\"x-permissions\":{\"$r"
- "ef\":\"#/components/x-permissions/debug\"},\"parameters\":[{\"in\":\"que"
- "ry\",\"name\":\"filename\",\"required\":true,\"schema\":{\"type\":\"stri"
- "ng\"}}],\"responses\":{\"200\":{\"$ref\":\"#/components/responses/200\"}"
- "}}}}}"
-;
-
-static const struct afb_auth _afb_auths_v2_aaaa[] = {
- { .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:control" },
- { .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:dispatch" },
- { .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:request" },
- { .type = afb_auth_Permission, .text = "urn:AGL:permission:audio:public:debug" }
-};
-
- void ctlapi_ping(struct afb_req req);
- void ctlapi_subscribe(struct afb_req req);
- void ctlapi_dispatch(struct afb_req req);
- void ctlapi_request(struct afb_req req);
- void ctlapi_debuglua(struct afb_req req);
-
-static const struct afb_verb_v2 _afb_verbs_v2_aaaa[] = {
- {
- .verb = "ping",
- .callback = ctlapi_ping,
- .auth = &_afb_auths_v2_aaaa[0],
- .info = NULL,
- .session = AFB_SESSION_NONE_V2
- },
- {
- .verb = "subscribe",
- .callback = ctlapi_subscribe,
- .auth = &_afb_auths_v2_aaaa[0],
- .info = NULL,
- .session = AFB_SESSION_NONE_V2
- },
- {
- .verb = "dispatch",
- .callback = ctlapi_dispatch,
- .auth = &_afb_auths_v2_aaaa[1],
- .info = NULL,
- .session = AFB_SESSION_NONE_V2
- },
- {
- .verb = "request",
- .callback = ctlapi_request,
- .auth = &_afb_auths_v2_aaaa[2],
- .info = NULL,
- .session = AFB_SESSION_NONE_V2
- },
- {
- .verb = "debuglua",
- .callback = ctlapi_debuglua,
- .auth = &_afb_auths_v2_aaaa[3],
- .info = NULL,
- .session = AFB_SESSION_NONE_V2
- },
- { .verb = NULL }
-};
-
-const struct afb_binding_v2 afbBindingV2 = {
- .api = "aaaa",
- .specification = _afb_description_v2_aaaa,
- .info = NULL,
- .verbs = _afb_verbs_v2_aaaa,
- .preinit = NULL,
- .init = CtlBindingInit,
- .onevent = DispatchOneEvent,
- .noconcurrency = 0
-};
-
diff --git a/afb-source/CMakeLists.txt b/ctl-binding/CMakeLists.txt
index 40469dc..9000f25 100644
--- a/afb-source/CMakeLists.txt
+++ b/ctl-binding/CMakeLists.txt
@@ -28,7 +28,7 @@ else(CONTROL_SUPPORT_LUA)
endif(CONTROL_SUPPORT_LUA)
# Add target to project dependency list
-PROJECT_TARGET_ADD(controller)
+PROJECT_TARGET_ADD(afb-controller)
# Define project Targets
ADD_LIBRARY(${TARGET_NAME} MODULE ctl-binding.c ctl-timer.c ctl-dispatch.c ${CTL_LUA_SOURCE})
@@ -36,7 +36,7 @@ PROJECT_TARGET_ADD(controller)
SET_OPENAPI_FILENAME("ctl-apidef")
# Binder exposes a unique public entry point
SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
- PREFIX "afb-"
+ PREFIX ""
LABELS "BINDINGV2"
LINK_FLAGS ${BINDINGS_LINK_FLAG}
OUTPUT_NAME ${TARGET_NAME}
@@ -47,3 +47,8 @@ PROJECT_TARGET_ADD(controller)
${link_libraries}
)
+ # Define target includes for this target client
+ TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
+ PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+
diff --git a/ctl-plugin/CMakeLists.txt b/ctl-plugin/CMakeLists.txt
index d89e67d..fb2009f 100644
--- a/ctl-plugin/CMakeLists.txt
+++ b/ctl-plugin/CMakeLists.txt
@@ -43,6 +43,7 @@ PROJECT_TARGET_ADD(audio-plugin-sample)
# Library dependencies (include updates automatically)
TARGET_LINK_LIBRARIES(${TARGET_NAME}
afb-utilities
+ afb-controller
${link_libraries}
)
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 71d6f6a..c894fc0 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -30,9 +30,6 @@
<in>feature_tests.cxx</in>
</df>
</df>
- <df name="ctl-plugin">
- <in>ctl-plugin-sample.c</in>
- </df>
</df>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
@@ -102,7 +99,6 @@
<Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/AGL-AppFW/afb-controller/build:/home/fulup/opt/Controller-binding/lib/controller-plugins:/usr/lib/afb/controller-plugins/ctlplug"</Elem>
<Elem>CONTROL_SUPPORT_LUA</Elem>
<Elem>CTL_PLUGIN_MAGIC=2468013579</Elem>
- <Elem>NATIVE_LINUX</Elem>
<Elem>control_afb_EXPORTS</Elem>
</preprocessorList>
</cTool>
@@ -208,10 +204,6 @@
</item>
<item path="build/CMakeFiles/feature_tests.cxx" ex="false" tool="1" flavor2="4">
</item>
- <item path="ctl-plugin/ctl-plugin-sample.c" ex="false" tool="0" flavor2="3">
- <cTool flags="1">
- </cTool>
- </item>
<folder path="0/build">
<cTool>
<incDir>
@@ -219,18 +211,6 @@
</incDir>
</cTool>
</folder>
- <folder path="0/ctl-plugin">
- <cTool>
- <incDir>
- <pElem>../../../opt/include/afb</pElem>
- <pElem>ctl-plugin</pElem>
- <pElem>/usr/include/json-c</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>afb-source</pElem>
- <pElem>build/ctl-plugin</pElem>
- </incDir>
- </cTool>
- </folder>
</conf>
</confs>
</configurationDescriptor>