From 3d5de3986cc98fea301ffcc88f96a4b6ce7653e9 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Thu, 18 Apr 2019 16:30:56 +0200 Subject: Improve static verbs loading Improve static verbs loading by using 'afb_api_set_verbs_v3' application_framework function. BUG-AGL: SPEC-2329 Change-Id: I3fe5397316d4a582635da637ab6a207b606c496e Signed-off-by: Jonathan Aillet --- .../4a-hal-utilities-verbs-loader.c | 50 ---------------------- .../4a-hal-utilities-verbs-loader.h | 28 ------------ lib/4a-hal-utilities/CMakeLists.txt | 3 +- 3 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.c delete mode 100644 lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.h (limited to 'lib/4a-hal-utilities') diff --git a/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.c b/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.c deleted file mode 100644 index 16c28c4..0000000 --- a/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2018 "IoT.bzh" - * Author Jonathan Aillet - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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 - -#include - -#include "4a-hal-utilities-verbs-loader.h" - -/******************************************************************************* - * Dynamic API common functions * - ******************************************************************************/ - -int HalUtlLoadVerbs(afb_api_t apiHandle, afb_verb_t *verbs) -{ - int idx, errCount = 0; - - if(! apiHandle || ! verbs) - return -1; - - for (idx = 0; verbs[idx].verb; idx++) { - errCount+= afb_api_add_verb(apiHandle, - verbs[idx].verb, - NULL, - verbs[idx].callback, - (void *) &verbs[idx], - verbs[idx].auth, - 0, - 0); - } - - return errCount; -} \ No newline at end of file diff --git a/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.h b/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.h deleted file mode 100644 index 9084595..0000000 --- a/lib/4a-hal-utilities/4a-hal-utilities-verbs-loader.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2018 "IoT.bzh" - * Author Jonathan Aillet - * - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - */ - -#ifndef _HAL_UTILITIES_VERBS_LOADER_INCLUDE_ -#define _HAL_UTILITIES_VERBS_LOADER_INCLUDE_ - -#include - -#include - -// Verb that allows to add verb to a dynamic api -int HalUtlLoadVerbs(afb_api_t apiHandle, afb_verb_t *verbs); - -#endif /* _HAL_UTILITIES_VERBS_LOADER_INCLUDE_ */ \ No newline at end of file diff --git a/lib/4a-hal-utilities/CMakeLists.txt b/lib/4a-hal-utilities/CMakeLists.txt index d90dd11..8eb2c62 100644 --- a/lib/4a-hal-utilities/CMakeLists.txt +++ b/lib/4a-hal-utilities/CMakeLists.txt @@ -24,8 +24,7 @@ PROJECT_TARGET_ADD(4a-hal-utilities) ADD_LIBRARY(${TARGET_NAME} STATIC 4a-hal-utilities-alsa-data.c 4a-hal-utilities-data.c - 4a-hal-utilities-hal-streams-handler.c - 4a-hal-utilities-verbs-loader.c) + 4a-hal-utilities-hal-streams-handler.c) # Define target includes for this target client TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} PUBLIC -- cgit 1.2.3-korg