X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=plugins%2Fradio%2Fradio-api.c;h=b2a22902abaeb62ec9f40c1df93d37964d33a3cf;hb=3d28e7d00cd8641bf600d47ed0e3e7e57cb5b439;hp=c6e4b905a226eb3936a761b57f43ece2517596e7;hpb=1205c90cccd3144bab24b4b5fd8dcbf0d0e6b570;p=src%2Fapp-framework-binder.git
diff --git a/plugins/radio/radio-api.c b/plugins/radio/radio-api.c
index c6e4b905..b2a22902 100644
--- a/plugins/radio/radio-api.c
+++ b/plugins/radio/radio-api.c
@@ -2,21 +2,27 @@
* Copyright (C) 2015 "IoT.bzh"
* Author "Manuel Bachmann"
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
+#define _GNU_SOURCE
+#include
+
#include "radio-api.h"
+#include "radio-rtlsdr.h"
+
+#include "afb-plugin.h"
+#include "afb-req-itf.h"
/* ********************************************************
@@ -60,7 +66,7 @@ STATIC radioCtxHandleT* initRadioCtx () {
ctx = malloc (sizeof(radioCtxHandleT));
ctx->radio = NULL;
- ctx->idx = -1;
+ //ctx->idx = -1;
ctx->mode = FM;
ctx->freq = 100.0;
ctx->mute = 0;
@@ -71,7 +77,7 @@ STATIC radioCtxHandleT* initRadioCtx () {
/* reserve a radio device for requesting client, power it on */
STATIC AFB_error reserveRadio (pluginHandleT *handle, radioCtxHandleT *ctx) {
- int idx;
+ unsigned int idx;
/* loop on all devices, find an unused one */
for (idx = 0; idx < _radio_dev_count(); idx++) {
@@ -112,7 +118,7 @@ STATIC AFB_error releaseRadio (pluginHandleT *handle, radioCtxHandleT *ctx) {
/* clean client context */
ctx->radio = NULL;
- ctx->idx = -1;
+ //ctx->idx = -1;
return AFB_SUCCESS;
}
@@ -127,24 +133,24 @@ STATIC void freeRadio (void *context) {
/* ------ PUBLIC PLUGIN FUNCTIONS --------- */
-STATIC json_object* init (AFB_request *request) { /* AFB_SESSION_CHECK */
+STATIC void init (struct afb_req request) { /* AFB_SESSION_CHECK */
json_object *jresp;
/* create a private client context */
- if (!request->context)
- request->context = initRadioCtx();
+ if (!request.context)
+ request.context = initRadioCtx();
jresp = json_object_new_object();
json_object_object_add(jresp, "info", json_object_new_string ("Radio initialized"));
- return jresp;
+ afb_req_success (request, jresp, "Radio - Initialized");
}
-STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */
+STATIC void power (struct afb_req request) { /* AFB_SESSION_CHECK */
pluginHandleT *handle = the_radio;
- radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
- const char *value = getQueryValue (request, "value");
+ radioCtxHandleT *ctx = (radioCtxHandleT*)request.context;
+ const char *value = afb_req_argument (request, "value");
json_object *jresp;
/* no "?value=" parameter : return current state */
@@ -159,8 +165,9 @@ STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */
else if ( atoi(value) == 1 || !strcasecmp(value, "true") ) {
if (!ctx->radio) {
if (reserveRadio (handle, ctx) == AFB_FAIL) {
- request->errcode = MHD_HTTP_SERVICE_UNAVAILABLE;
- return (jsonNewMessage (AFB_FAIL, "No more radio devices available"));
+ //request->errcode = MHD_HTTP_SERVICE_UNAVAILABLE;
+ afb_req_fail (request, "failed", "No more radio devices available");
+ return;
}
}
jresp = json_object_new_object();
@@ -171,8 +178,9 @@ STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */
else if ( atoi(value) == 0 || !strcasecmp(value, "false") ) {
if (ctx->radio) {
if (releaseRadio (handle, ctx) == AFB_FAIL) {
- request->errcode = MHD_HTTP_SERVICE_UNAVAILABLE;
- return (jsonNewMessage (AFB_FAIL, "Unable to release radio device"));
+ //request->errcode = MHD_HTTP_SERVICE_UNAVAILABLE;
+ afb_req_fail (request, "failed", "Unable to release radio device");
+ return;
}
}
jresp = json_object_new_object();
@@ -181,13 +189,13 @@ STATIC json_object* power (AFB_request *request) { /* AFB_SESSION_CHECK */
else
jresp = NULL;
- return jresp;
+ afb_req_success (request, jresp, "Radio - Power set");
}
-STATIC json_object* mode (AFB_request *request) { /* AFB_SESSION_CHECK */
+STATIC void mode (struct afb_req request) { /* AFB_SESSION_CHECK */
- radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
- const char *value = getQueryValue (request, "value");
+ radioCtxHandleT *ctx = (radioCtxHandleT*)request.context;
+ const char *value = afb_req_argument (request, "value");
json_object *jresp = json_object_new_object();
/* no "?value=" parameter : return current state */
@@ -210,14 +218,14 @@ STATIC json_object* mode (AFB_request *request) { /* AFB_SESSION_CHECK */
_radio_set_mode (ctx->idx, ctx->mode);
json_object_object_add (jresp, "mode", json_object_new_string ("FM"));
}
-
- return jresp;
+
+ afb_req_success (request, jresp, "Radio - Mode set");
}
-STATIC json_object* freq (AFB_request *request) { /* AFB_SESSION_CHECK */
+STATIC void freq (struct afb_req request) { /* AFB_SESSION_CHECK */
- radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
- const char *value = getQueryValue (request, "value");
+ radioCtxHandleT *ctx = (radioCtxHandleT*)request.context;
+ const char *value = afb_req_argument (request, "value");
json_object *jresp = json_object_new_object();
double freq;
char freq_str[256];
@@ -237,16 +245,16 @@ STATIC json_object* freq (AFB_request *request) { /* AFB_SESSION_CHECK */
snprintf (freq_str, sizeof(freq_str), "%f", ctx->freq);
json_object_object_add (jresp, "freq", json_object_new_string (freq_str));
}
-
- return jresp;
+
+ afb_req_success (request, jresp, "Radio - Frequency Set");
}
-STATIC json_object* mute (AFB_request *request) { /* AFB_SESSION_CHECK */
+STATIC void mute (struct afb_req request) { /* AFB_SESSION_CHECK */
- radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
- const char *value = getQueryValue (request, "value");
+ radioCtxHandleT *ctx = (radioCtxHandleT*)request.context;
+ const char *value = afb_req_argument (request, "value");
json_object *jresp = json_object_new_object();
- char *mute_str;
+ //char *mute_str;
/* no "?value=" parameter : return current state */
if (!value || !ctx->radio) {
@@ -268,14 +276,14 @@ STATIC json_object* mute (AFB_request *request) { /* AFB_SESSION_CHECK */
_radio_set_mute (ctx->idx, ctx->mute);
json_object_object_add (jresp, "mute", json_object_new_string ("off"));
}
-
- return jresp;
+
+ afb_req_success (request, jresp, "Radio - Mute set");
}
-STATIC json_object* play (AFB_request *request) { /* AFB_SESSION_CHECK */
+STATIC void play (struct afb_req request) { /* AFB_SESSION_CHECK */
- radioCtxHandleT *ctx = (radioCtxHandleT*)request->context;
- const char *value = getQueryValue (request, "value");
+ radioCtxHandleT *ctx = (radioCtxHandleT*)request.context;
+ const char *value = afb_req_argument (request, "value");
json_object *jresp = json_object_new_object();
/* no "?value=" parameter : return current state */
@@ -301,34 +309,30 @@ STATIC json_object* play (AFB_request *request) { /* AFB_SESSION_CHECK */
json_object_object_add (jresp, "play", json_object_new_string ("off"));
}
- return jresp;
+ afb_req_success (request, jresp, "Radio - Play succeeded");
}
-STATIC json_object* ping (AFB_request *request) { /* AFB_SESSION_NONE */
- return jsonNewMessage(AFB_SUCCESS, "Ping Binder Daemon - Radio API");
+STATIC void ping (struct afb_req request) { /* AFB_SESSION_NONE */
+ afb_req_success (request, NULL, "Radio - Ping succeeded");
}
-STATIC AFB_restapi pluginApis[]= {
- {"init" , AFB_SESSION_CHECK, (AFB_apiCB)init , "Radio API - init"},
- {"power" , AFB_SESSION_CHECK, (AFB_apiCB)power , "Radio API - power"},
- {"mode" , AFB_SESSION_CHECK, (AFB_apiCB)mode , "Radio API - mode"},
- {"freq" , AFB_SESSION_CHECK, (AFB_apiCB)freq , "Radio API - freq"},
- {"mute" , AFB_SESSION_CHECK, (AFB_apiCB)mute , "Radio API - mute"},
- {"play" , AFB_SESSION_CHECK, (AFB_apiCB)play , "Radio API - play"},
- {"ping" , AFB_SESSION_NONE, (AFB_apiCB)ping , "Radio API - ping"},
+STATIC const struct AFB_restapi pluginApis[]= {
+ {"init" , AFB_SESSION_CHECK, init , "Radio API - init"},
+ {"power" , AFB_SESSION_CHECK, power , "Radio API - power"},
+ {"mode" , AFB_SESSION_CHECK, mode , "Radio API - mode"},
+ {"freq" , AFB_SESSION_CHECK, freq , "Radio API - freq"},
+ {"mute" , AFB_SESSION_CHECK, mute , "Radio API - mute"},
+ {"play" , AFB_SESSION_CHECK, play , "Radio API - play"},
+ {"ping" , AFB_SESSION_NONE, ping , "Radio API - ping"},
{NULL}
};
-PUBLIC AFB_plugin* pluginRegister () {
- AFB_plugin *plugin = malloc (sizeof(AFB_plugin));
- plugin->type = AFB_PLUGIN_JSON;
- plugin->info = "Application Framework Binder - Radio plugin";
- plugin->prefix = "radio";
- plugin->apis = pluginApis;
-
- plugin->freeCtxCB = (AFB_freeCtxCB)freeRadio;
-
- the_radio = initRadioPlugin();
- return plugin;
+STATIC const struct AFB_plugin plug_desc = {
+ .type = AFB_PLUGIN_JSON,
+ .info = "Application Framework Binder - Radio plugin",
+ .prefix = "radio",
+ .apis = pluginApis,
+ //plugin->freeCtxCB = (AFB_freeCtxCB)freeRadio;
+ //the_radio = initRadioPlugin();
};