aboutsummaryrefslogtreecommitdiffstats
path: root/4a-hal
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-11 02:01:09 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:52:51 +0200
commit07c3ecba73584c0e106de5434d6a2689a74215bf (patch)
tree6c5d2bd29a54c6a317e03a495604f97672f8a51f /4a-hal
parent757c9b407938b65b1e31ccc62217910d4f942dcb (diff)
Rename files handling call/response of mixer
Rename files handling call/response of mixer. Change-Id: I070f109e2f0249b74548ae7dc7b84793926cb261 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to '4a-hal')
-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.c2
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c (renamed from 4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c)7
-rw-r--r--4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h (renamed from 4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h)0
-rw-r--r--4a-hal/CMakeLists.txt2
5 files changed, 8 insertions, 5 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 de82ec4..e7a4825 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
@@ -31,7 +31,7 @@
#include "4a-hal-controllers-api-loader.h"
#include "4a-hal-controllers-alsacore-link.h"
#include "4a-hal-controllers-cb.h"
-#include "4a-hal-controllers-mixer-handler.h"
+#include "4a-hal-controllers-mixer-link.h"
// Default api to print log when apihandle not available
AFB_ApiT AFB_default;
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 bf676bb..57bc079 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-cb.c
@@ -28,7 +28,7 @@
#include "4a-hal-controllers-cb.h"
#include "4a-hal-controllers-alsacore-link.h"
-#include "4a-hal-controllers-mixer-handler.h"
+#include "4a-hal-controllers-mixer-link.h"
#include "4a-hal-controllers-value-handler.h"
/*******************************************************************************
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c
index ffb1bf2..600b119 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.c
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.c
@@ -29,7 +29,7 @@
#include "../4a-hal-manager/4a-hal-manager.h"
-#include "4a-hal-controllers-mixer-handler.h"
+#include "4a-hal-controllers-mixer-link.h"
#include "4a-hal-controllers-cb.h"
/*******************************************************************************
@@ -100,7 +100,10 @@ int HalCtlsHandleMixerData(AFB_ApiT apiHandle, struct CtlHalMixerDataT *currentM
(void *) &currentMixerDataT->data[idx],
NULL,
0)) {
- AFB_ApiError(apiHandle, "%s: error while creating verbs for stream : '%s'", __func__, currentMixerDataT->data[idx].verb);
+ AFB_ApiError(apiHandle,
+ "%s: error while creating verbs for stream : '%s'",
+ __func__,
+ currentMixerDataT->data[idx].verb);
err += (int) MIXER_ERROR_STREAM_VERB_NOT_CREATED;
}
}
diff --git a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h
index 9218ed4..9218ed4 100644
--- a/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-handler.h
+++ b/4a-hal/4a-hal-controllers/4a-hal-controllers-mixer-link.h
diff --git a/4a-hal/CMakeLists.txt b/4a-hal/CMakeLists.txt
index ded6c8c..2968f23 100644
--- a/4a-hal/CMakeLists.txt
+++ b/4a-hal/CMakeLists.txt
@@ -32,7 +32,7 @@ PROJECT_TARGET_ADD(4a-hal)
${TARGET_NAME}-controllers/${TARGET_NAME}-controllers-alsacore-link.c
${TARGET_NAME}-controllers/${TARGET_NAME}-controllers-api-loader.c
${TARGET_NAME}-controllers/${TARGET_NAME}-controllers-cb.c
- ${TARGET_NAME}-controllers/${TARGET_NAME}-controllers-mixer-handler.c
+ ${TARGET_NAME}-controllers/${TARGET_NAME}-controllers-mixer-link.c
${TARGET_NAME}-controllers/${TARGET_NAME}-controllers-value-handler.c
)