summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-05-26 23:25:56 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:51:00 +0200
commit6461482c417cff509531e278e89f4c2310ac6007 (patch)
treeec8d9bddef7bfafacc1e5b1dc3d2cf28293d0f15
parent48566a4a32585d80e9f5f09be7e10b075d9d1e27 (diff)
Parse config to get streams 'halmap' controls
Parse controller config to get 'halmap' controls, these controls are inside 'halmap' section of controller configuration file. Change-Id: I71fb8494927cf05d9751a69fede4b7622921c6c2 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c2
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c9
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-cb.h1
3 files changed, 9 insertions, 3 deletions
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c
index c215f50..982c4e6 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-api-loader.c
@@ -45,7 +45,7 @@ static CtlSectionT ctrlSections[] =
{.key="onload" , .loadCB= OnloadConfig},
{.key="controls", .loadCB= ControlConfig},
{.key="events" , .loadCB= EventConfig},
- // TODO JAI: create a new section parser to get 'halmap' and store them into hal structure
+ {.key="halmap", .loadCB= HalCtlsHalMapConfig},
{.key="halmixer", .loadCB= HalCtlsHalMixerConfig},
{.key=NULL}
};
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c
index 9e74f8c..860de62 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c
@@ -110,13 +110,18 @@ int HalCtlsHalMixerConfig(afb_dynapi *apiHandle, CtlSectionT *section, json_obje
return 0;
}
-// TODO JAI: create a new section parser to get 'halmap' and store them into hal structure
+// TODO JAI : to implement
+int HalCtlsHalMapConfig(afb_dynapi *apiHandle, CtlSectionT *section, json_object *StreamControlsJ)
+{
+ AFB_DYNAPI_WARNING(apiHandle, "JAI :%s not implemented yet", __func__);
+
+ return 0;
+}
/*******************************************************************************
* HAL controllers verbs functions *
******************************************************************************/
-// TODO JAI : to implement
void HalCtlsActionOnStream(afb_request *request)
{
int verbToCallSize;
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.h b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.h
index 648c4df..8238c37 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.h
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.h
@@ -30,6 +30,7 @@
// HAL controllers sections parsing functions
int HalCtlsHalMixerConfig(afb_dynapi *apiHandle, CtlSectionT *section, json_object *MixerJ);
+int HalCtlsHalMapConfig(afb_dynapi *apiHandle, CtlSectionT *section, json_object *StreamControlsJ);
// HAL controllers verbs functions
void HalCtlsActionOnStream(afb_request *request);