summaryrefslogtreecommitdiffstats
path: root/4a-hal/4a-hal-controllers
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-03 19:04:35 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:51:00 +0200
commit98003ee8e4b3dd55d61e4409300ffe66c8dc9804 (patch)
tree878c75bf6e45524ff816478e244e025dd142b316 /4a-hal/4a-hal-controllers
parent718a285d131121e60ed1e619ee05e03063cf9e61 (diff)
Replace controller macro use by app fw macro use
Replace controller macro use by application framework macro use. Change-Id: Icee0855a311857ab21a4a5031c4e06ac58b8f295 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to '4a-hal/4a-hal-controllers')
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c14
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h3
2 files changed, 9 insertions, 8 deletions
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
index 77bc4b6..fa5ca4e 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
@@ -37,15 +37,15 @@ int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT
char *currentStreamName, *currentStreamCardId;
- AFB_ApiT apiHandle;
+ afb_dynapi *apiHandle;
struct HalUtlApiVerb *CtlHalDynApiStreamVerbs;
json_object *currentStreamJ;
- apiHandle = (AFB_ApiT) afb_request_get_dynapi(request);
+ apiHandle = (afb_dynapi *) afb_request_get_dynapi(request);
if(! apiHandle) {
- AFB_ReqWarning(request, "%s: Can't get current hal api handle", __func__);
+ AFB_REQUEST_WARNING(request, "%s: Can't get current hal api handle", __func__);
return -1;
}
@@ -58,7 +58,7 @@ int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT
break;
default:
currentHalStreamsData->count = 0;
- AFB_ReqWarning(request, "%s: no streams returned", __func__);
+ AFB_REQUEST_WARNING(request, "%s: no streams returned", __func__);
return -2;
}
@@ -75,11 +75,11 @@ int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT
currentStreamJ = mixerResponseJ;
if(wrap_json_unpack(currentStreamJ, "{s:s}", "uid", &currentStreamName)) {
- AFB_ReqWarning(request, "%s: can't find name in current stream object", __func__);
+ AFB_REQUEST_WARNING(request, "%s: can't find name in current stream object", __func__);
err -= 10;
}
else if(wrap_json_unpack(currentStreamJ, "{s:s}", "alsa", &currentStreamCardId)) {
- AFB_ReqWarning(request, "%s: can't find card id in current stream object", __func__);
+ AFB_REQUEST_WARNING(request, "%s: can't find card id in current stream object", __func__);
err -= 1000;
}
else {
@@ -93,7 +93,7 @@ int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT
}
if(HalUtlLoadVerbs(apiHandle, CtlHalDynApiStreamVerbs)) {
- AFB_ReqWarning(request, "%s: error while creating verbs for streams", __func__);
+ AFB_REQUEST_WARNING(request, "%s: error while creating verbs for streams", __func__);
err -= 100000;
}
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h
index 9ad486d..f06b649 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h
@@ -24,6 +24,7 @@
#include "../4a-hal-utilities/4a-hal-utilities-data.h"
-int HalCtlsHandleMixerAttachResponse(AFB_ReqT request, struct CtlHalStreamsDataT *currentHalStreamsData, json_object *MixerResponseJ);
+// HAL controllers handle mixer response function
+int HalCtlsHandleMixerAttachResponse(afb_request *request, struct CtlHalStreamsDataT *currentHalStreamsData, json_object *MixerResponseJ);
#endif /* _HAL_CTLS_SOFTMIXER_LINK_INCLUDE_ */ \ No newline at end of file