summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Collignon <loic.collignon@iot.bzh>2018-12-18 10:54:55 +0100
committerLoïc Collignon <loic.collignon@iot.bzh>2018-12-20 18:13:14 +0100
commit57faac0038cdfd2ed2c113e7ae5a752fe5aa99a4 (patch)
treef7aeafc5080e7d9c4df04718ade34a6973146213
parentf30e1a348f35e5ba9ff2d00d8f71edf095926d17 (diff)
Moved non class member to a different file
The ahl-binding.cpp file should contain only ahl_binding_t members. Change-Id: I00508eb7e188b72bed7ae3a8abdc212c8e28949d Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
-rw-r--r--ahl-binding/CMakeLists.txt5
-rw-r--r--ahl-binding/ahl-api.cpp120
-rw-r--r--ahl-binding/ahl-api.hpp30
-rw-r--r--ahl-binding/ahl-binding.cpp103
4 files changed, 154 insertions, 104 deletions
diff --git a/ahl-binding/CMakeLists.txt b/ahl-binding/CMakeLists.txt
index 042903c..7ccf470 100644
--- a/ahl-binding/CMakeLists.txt
+++ b/ahl-binding/CMakeLists.txt
@@ -21,10 +21,11 @@ PROJECT_TARGET_ADD(audiohighlevel)
# Define project Targets
ADD_LIBRARY(${TARGET_NAME} MODULE
+ ahl-api.cpp
+ ahl-binding.cpp
config_entry.cpp
- role.cpp
interrupt.cpp
- ahl-binding.cpp
+ role.cpp
)
# Binder exposes a unique public entry point
diff --git a/ahl-binding/ahl-api.cpp b/ahl-binding/ahl-api.cpp
new file mode 100644
index 0000000..c5ade37
--- /dev/null
+++ b/ahl-binding/ahl-api.cpp
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2018 "IoT.bzh"
+ * Author Loïc Collignon <loic.collignon@iot.bzh>
+ *
+ * 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.
+ */
+
+#include "ahl-binding.hpp"
+
+/**
+ * @brief Callback invoked on new api creation.
+ * @param[in] handle Handle to the new api.
+ * @return Status code, zero if success.
+ */
+int ahl_api_create(void*, afb_api_t handle)
+{
+ return ahl_binding_t::instance().preinit(handle);
+}
+
+/**
+ * @brief Entry point for API.
+ * @param[in] handle Handle to start with for API creation.
+ * @return Status code, zero if success.
+ */
+int afbBindingEntry(afb_api_t handle)
+{
+ using namespace std::placeholders;
+ assert(handle != nullptr);
+
+ afb_api_new_api(
+ handle,
+ HL_API_NAME,
+ HL_API_INFO,
+ 1,
+ ahl_api_create,
+ nullptr
+ );
+
+ return 0;
+}
+
+/**
+ * @brief Callback invoked when API enter the init phase.
+ * @return Status code, zero if success.
+ */
+int ahl_api_init(afb_api_t)
+{
+ return ahl_binding_t::instance().init();
+}
+
+/**
+ * @brief Callback invoked when an event is received.
+ * @param[in] e Event's name.
+ * @param[in] o Event's args.
+ */
+void ahl_api_on_event(afb_api_t, const char* e, struct json_object* o)
+{
+ ahl_binding_t::instance().event(e, o);
+}
+
+/**
+ * @brief Callback invoked when a 'roles' section is found in config file.
+ * @param[in] o Config section to handle.
+ * @return Status code, zero if success.
+ */
+int ahl_api_config_roles(afb_api_t, CtlSectionT*, json_object* o)
+{
+ return ahl_binding_t::instance().parse_roles_config(o);
+}
+
+/**
+ * @brief Callback invoked when clients call the verb 'get_roles'.
+ * @param[in] req Request to handle.
+ */
+void ahl_api_get_roles(afb_req_t req)
+{
+ ahl_binding_t::instance().get_roles(req);
+}
+
+/**
+ * @brief Callback invoked when clients call the verb 'subscribe'.
+ * @param[in] req Request to handle.
+ */
+void ahl_api_subscribe(afb_req_t req)
+{
+ ahl_binding_t::instance().subscribe(req);
+}
+
+/**
+ * @brief Callback invoked when clients call the verb 'unsubscribe'.
+ * @param[in] req Request to handle.
+ */
+void ahl_api_unsubscribe(afb_req_t req)
+{
+ ahl_binding_t::instance().unsubscribe(req);
+}
+
+/**
+ * @brief Callback invoked when clients call a 'role' verb.
+ * @param[in] req Request to handle.
+ *
+ * Handle dynamic verbs based on role name ('multimedia', 'navigation', ...)
+ */
+void ahl_api_role(afb_req_t req)
+{
+ role_t* role = (role_t*)req->vcbdata;
+ assert(role != nullptr);
+
+ role->invoke(req);
+}
diff --git a/ahl-binding/ahl-api.hpp b/ahl-binding/ahl-api.hpp
new file mode 100644
index 0000000..fed48ba
--- /dev/null
+++ b/ahl-binding/ahl-api.hpp
@@ -0,0 +1,30 @@
+#pragma once
+
+/*
+ * Copyright (C) 2018 "IoT.bzh"
+ * Author Loïc Collignon <loic.collignon@iot.bzh>
+ *
+ * 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.
+ */
+
+#include "afb-binding-common.h"
+
+int ahl_api_create(void*, afb_api_t handle);
+int afbBindingEntry(afb_api_t handle);
+int ahl_api_init(afb_api_t);
+void ahl_api_on_event(afb_api_t, const char* e, struct json_object* o);
+int ahl_api_config_roles(afb_api_t, CtlSectionT*, json_object* o);
+void ahl_api_get_roles(afb_req_t req);
+void ahl_api_subscribe(afb_req_t req);
+void ahl_api_unsubscribe(afb_req_t req);
+void ahl_api_role(afb_req_t req); \ No newline at end of file
diff --git a/ahl-binding/ahl-binding.cpp b/ahl-binding/ahl-binding.cpp
index 3a16197..f3b1ae8 100644
--- a/ahl-binding/ahl-binding.cpp
+++ b/ahl-binding/ahl-binding.cpp
@@ -16,111 +16,10 @@
*/
#include <algorithm>
+#include "ahl-api.hpp"
#include "ahl-binding.hpp"
/**
- * @brief Callback invoked on new api creation.
- * @param[in] handle Handle to the new api.
- * @return Status code, zero if success.
- */
-int ahl_api_create(void*, afb_api_t handle)
-{
- return ahl_binding_t::instance().preinit(handle);
-}
-
-/**
- * @brief Entry point for API.
- * @param[in] handle Handle to start with for API creation.
- * @return Status code, zero if success.
- */
-int afbBindingEntry(afb_api_t handle)
-{
- using namespace std::placeholders;
- assert(handle != nullptr);
-
- afb_api_new_api(
- handle,
- HL_API_NAME,
- HL_API_INFO,
- 1,
- ahl_api_create,
- nullptr
- );
-
- return 0;
-}
-
-/**
- * @brief Callback invoked when API enter the init phase.
- * @return Status code, zero if success.
- */
-int ahl_api_init(afb_api_t)
-{
- return ahl_binding_t::instance().init();
-}
-
-/**
- * @brief Callback invoked when an event is received.
- * @param[in] e Event's name.
- * @param[in] o Event's args.
- */
-void ahl_api_on_event(afb_api_t, const char* e, struct json_object* o)
-{
- ahl_binding_t::instance().event(e, o);
-}
-
-/**
- * @brief Callback invoked when a 'roles' section is found in config file.
- * @param[in] o Config section to handle.
- * @return Status code, zero if success.
- */
-int ahl_api_config_roles(afb_api_t, CtlSectionT*, json_object* o)
-{
- return ahl_binding_t::instance().parse_roles_config(o);
-}
-
-/**
- * @brief Callback invoked when clients call the verb 'get_roles'.
- * @param[in] req Request to handle.
- */
-void ahl_api_get_roles(afb_req_t req)
-{
- ahl_binding_t::instance().get_roles(req);
-}
-
-/**
- * @brief Callback invoked when clients call the verb 'subscribe'.
- * @param[in] req Request to handle.
- */
-void ahl_api_subscribe(afb_req_t req)
-{
- ahl_binding_t::instance().subscribe(req);
-}
-
-/**
- * @brief Callback invoked when clients call the verb 'unsubscribe'.
- * @param[in] req Request to handle.
- */
-void ahl_api_unsubscribe(afb_req_t req)
-{
- ahl_binding_t::instance().unsubscribe(req);
-}
-
-/**
- * @brief Callback invoked when clients call a 'role' verb.
- * @param[in] req Request to handle.
- *
- * Handle dynamic verbs based on role name ('multimedia', 'navigation', ...)
- */
-void ahl_api_role(afb_req_t req)
-{
- role_t* role = (role_t*)req->vcbdata;
- assert(role != nullptr);
-
- role->invoke(req);
-}
-
-/**
* @brief Default constructor.
*/
ahl_binding_t::ahl_binding_t()