summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2018-07-19 18:17:41 -0700
committerMatt Ranostay <matt.ranostay@konsulko.com>2018-07-19 19:37:17 -0700
commit20a526ca4e2d3f7dab07394910fa0fa97f1ed5f4 (patch)
treee62e6755924220e64d512f0b8b4e753d15c33f43
parent5bbeefd55419897a2a2ce0c8069b8750374ef290 (diff)
Change-Id: Iaab6e18dbfdd9366e0533a82f07789b94380b12d Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--binding/afm-gps-binding.c18
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake2
3 files changed, 10 insertions, 10 deletions
diff --git a/binding/afm-gps-binding.c b/binding/afm-gps-binding.c
index 2ceb13f..d09765a 100644
--- a/binding/afm-gps-binding.c
+++ b/binding/afm-gps-binding.c
@@ -28,11 +28,11 @@
#include <sys/signal.h>
#include <sys/time.h>
-#define AFB_BINDING_VERSION 2
+#define AFB_BINDING_VERSION 3
#include <afb/afb-binding.h>
static struct gps_data_t data;
-static struct afb_event location_event;
+static afb_event_t location_event;
static pthread_t thread;
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -125,7 +125,7 @@ static json_object *populate_json_data(json_object *jresp)
return jresp;
}
-static void get_data(struct afb_req request)
+static void get_data(afb_req_t request)
{
json_object *jresp = NULL;
pthread_mutex_lock(&mutex);
@@ -163,7 +163,7 @@ static json_object *gps_recording_state(json_object *jresp)
return jresp;
}
-static void record(struct afb_req request)
+static void record(afb_req_t request)
{
json_object *jresp = NULL;
const char *value = afb_req_value(request, "state");
@@ -229,7 +229,7 @@ static void record(struct afb_req request)
}
-static void subscribe(struct afb_req request)
+static void subscribe(afb_req_t request)
{
const char *value = afb_req_value(request, "value");
@@ -242,7 +242,7 @@ static void subscribe(struct afb_req request)
afb_req_fail(request, "failed", "Invalid event");
}
-static void unsubscribe(struct afb_req request)
+static void unsubscribe(afb_req_t request)
{
const char *value = afb_req_value(request, "value");
@@ -372,7 +372,7 @@ static int replay_init()
* Test to see if in demo mode first, then enable if not enable gpsd
*/
-static int init()
+static int init(afb_api_t api)
{
int ret;
location_event = afb_daemon_make_event("location");
@@ -387,7 +387,7 @@ static int init()
return 0;
}
-static const struct afb_verb_v2 binding_verbs[] = {
+static const struct afb_verb_v3 binding_verbs[] = {
{ .verb = "location", .callback = get_data, .info = "Get GNSS data" },
{ .verb = "record", .callback = record, .info = "Record GPS data" },
{ .verb = "subscribe", .callback = subscribe, .info = "Subscribe to GNSS events" },
@@ -398,7 +398,7 @@ static const struct afb_verb_v2 binding_verbs[] = {
/*
* binder API description
*/
-const struct afb_binding_v2 afbBindingV2 = {
+const struct afb_binding_v3 afbBindingV3 = {
.api = "gps",
.specification = "GNSS/GPS API",
.verbs = binding_verbs,
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject 6e1a3c37e94f42f5307fd1fa749823b2d160a56
+Subproject f94e45e8a48e16e3001cb55c4f8c3c0a2a2c9e2
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 2bfd53c..d4ba867 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -42,7 +42,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
+set(CMAKE_BUILD_TYPE "RELEASE")
# Kernel selection if needed. You can choose between a
# mandatory version to impose a minimal version.