X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Flow-can-hat.hpp;h=e748c9604b092f1bb456bef60085a09aaf66f60a;hb=9e23caa4c56259044604c38f107f7c637001b846;hp=6ecad23aaf0b183ec3dc091f5a7ca879377467f8;hpb=38f9b3de40b1d1d8e9ed5db0fee40bdaa763d577;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/binding/low-can-hat.hpp b/low-can-binding/binding/low-can-hat.hpp
index 6ecad23a..e748c960 100644
--- a/low-can-binding/binding/low-can-hat.hpp
+++ b/low-can-binding/binding/low-can-hat.hpp
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 #pragma once
 
 #include <cstddef>
@@ -23,19 +23,23 @@
 #include <string>
 #include <memory>
 #include <systemd/sd-event.h>
-
-extern "C"
-{
-	#define AFB_BINDING_VERSION 2
-	#include <afb/afb-binding.h>
-};
+#include <cctype>
+#include <ctl-config.h>
+#include <afb/afb-binding>
 
 class low_can_subscription_t;
 
-void on_no_clients(std::shared_ptr<low_can_subscription_t> can_subscription, std::map<int, std::shared_ptr<low_can_subscription_t> >& s);
-void on_no_clients(std::shared_ptr<low_can_subscription_t> can_subscription, uint32_t pid, std::map<int, std::shared_ptr<low_can_subscription_t> >& s);
+typedef std::map<int, std::shared_ptr<low_can_subscription_t>> map_subscription;
+
+void on_no_clients(std::shared_ptr<low_can_subscription_t> can_subscription, map_subscription& s);
+void on_no_clients(std::shared_ptr<low_can_subscription_t> can_subscription, uint32_t pid, map_subscription& s);
 int read_message(sd_event_source *s, int fd, uint32_t revents, void *userdata);
 
-void subscribe(struct afb_req request);
-void unsubscribe(struct afb_req request);
-void swrite(struct afb_req request);
+inline bool caseInsCharCompareN(char a, char b) {
+	return(toupper(a) == toupper(b));
+}
+
+inline bool caseInsCompare(const std::string& s1, const std::string& s2) {
+	return((s1.size() == s2.size()) &&
+	equal(s1.begin(), s1.end(), s2.begin(), caseInsCharCompareN));
+}