aboutsummaryrefslogtreecommitdiffstats
path: root/Shared-Interface
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-06-01 16:58:29 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2017-06-01 16:58:29 +0200
commiteb3fb0866ea130ec0c15c868e1a5c806981195cc (patch)
tree3a9e048530389b98de9342fa4e55c7be138dba9e /Shared-Interface
parent1249980baf09368727734ed6d647852fa8ffdfa0 (diff)
Fix warnings
Change-Id: Ia1d0f054dde9468ee08d52f6e4b1b89d0ebc0ff0 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'Shared-Interface')
-rw-r--r--Shared-Interface/audio-interface.c44
-rw-r--r--Shared-Interface/audio-interface.h3
2 files changed, 1 insertions, 46 deletions
diff --git a/Shared-Interface/audio-interface.c b/Shared-Interface/audio-interface.c
index c1c4054..edaaf7f 100644
--- a/Shared-Interface/audio-interface.c
+++ b/Shared-Interface/audio-interface.c
@@ -18,8 +18,6 @@
#define _GNU_SOURCE // needed for vasprintf
#include <json-c/json.h>
-#include <afb/afb-binding.h>
-#include <afb/afb-service-itf.h>
#include <semaphore.h>
#include <string.h>
@@ -54,48 +52,6 @@ OnErrorExit:
}
-// This function should be part of Generic AGL Framework
-PUBLIC json_object* afb_service_call_sync(struct afb_service srvitf, struct afb_req request, char* api, char* verb, struct json_object* queryurl) {
- json_object* response = NULL;
- int status = 0;
- sem_t semid;
-
- // Nested procedure are allow in GNU and allow us to keep caller stack valid
-
- void callback(void *handle, int iserror, struct json_object *result) {
-
- // Process Basic Error
- if (!cbCheckResponse(request, iserror, result)) {
- status = -1;
- goto OnExitCB;
- }
-
- // Get response from object
- json_object_object_get_ex(result, "response", &response);
- if (!response) {
- afb_req_fail_f(request, "response-notfound", "No Controls return from alsa/getcontrol result=[%s]", json_object_get_string(result));
- goto OnExitCB;
- }
-
-OnExitCB:
- sem_post(&semid);
- }
-
- // Create an exclusive semaphore
- status = sem_init(&semid, 0, 0);
- if (status < 0) {
- afb_req_fail_f(request, "error:seminit", "Fail to allocate semaphore err=[%s]", strerror(status));
- goto OnExit;
- }
-
- // Call service and wait for call back to finish before moving any further
- afb_service_call(srvitf, api, verb, queryurl, callback, NULL);
- sem_wait(&semid);
-
-OnExit:
- return (response);
-}
-
PUBLIC void pingtest(struct afb_req request) {
json_object *query = afb_req_json(request);
afb_req_success(request, query, NULL);
diff --git a/Shared-Interface/audio-interface.h b/Shared-Interface/audio-interface.h
index ffefbfc..24fcfaa 100644
--- a/Shared-Interface/audio-interface.h
+++ b/Shared-Interface/audio-interface.h
@@ -23,8 +23,8 @@
#define AUDIOCOMMON_H
#include <json-c/json.h>
+#define AFB_BINDING_VERSION 1
#include <afb/afb-binding.h>
-#include <afb/afb-service-itf.h>
#ifndef PUBLIC
#define PUBLIC
@@ -61,7 +61,6 @@ typedef enum {
} halCtlsEnumT;
PUBLIC int cbCheckResponse(struct afb_req request, int iserror, struct json_object *result) ;
-PUBLIC json_object* afb_service_call_sync(struct afb_service srvitf, struct afb_req request, char* api, char* verb, struct json_object* queryurl);
PUBLIC void pingtest(struct afb_req request);
#endif /* AUDIOCOMMON_H */