diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-07-25 18:42:06 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-07-25 18:42:06 +0200 |
| commit | 5510670e3ec3f6930c34f023b335480a1efe9967 (patch) | |
| tree | 75b75a1dfa4aeaf5648d9f8e28400c5a70a72cac /low-can-binding | |
| parent | 63461c4f0d06c25e94eeaea7adb85b5d94bb6e41 (diff) | |
Make Kernel check not mandatory
Use 2 different checks, one specify a mandatory kernel version
and the other will output a warning and position a preprocessing
variable that can be used in the code to exclude portions of code
that use kernel features not available under a certain version.
Bug-AGL: SPEC-772
Change-Id: I04523abe96749aeeb185e90eee154fd70a4cbf19
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
# Conflicts:
# conf.d/app-templates
Diffstat (limited to 'low-can-binding')
| -rw-r--r-- | low-can-binding/utils/config-parser.cpp | 2 | ||||
| -rw-r--r-- | low-can-binding/utils/socketcan-bcm.hpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/low-can-binding/utils/config-parser.cpp b/low-can-binding/utils/config-parser.cpp index e3936eb..98d6ad5 100644 --- a/low-can-binding/utils/config-parser.cpp +++ b/low-can-binding/utils/config-parser.cpp @@ -39,7 +39,7 @@ namespace utils { if (config_content_.size() <= 0) { - AFB_ERROR("Can't load the INI config file."); + AFB_ERROR("Can't load the INI config file: /etc/dev-mapping.conf."); return false; } AFB_DEBUG("Configuration file parsed"); diff --git a/low-can-binding/utils/socketcan-bcm.hpp b/low-can-binding/utils/socketcan-bcm.hpp index 97f093d..22927cb 100644 --- a/low-can-binding/utils/socketcan-bcm.hpp +++ b/low-can-binding/utils/socketcan-bcm.hpp @@ -28,12 +28,14 @@ namespace utils struct can_frame frames; }; +#ifdef KERNEL_MINIMAL_VERSION_OK struct canfd_bcm_msg { struct bcm_msg_head msg_head; struct canfd_frame frames; canfd_bcm_msg() { msg_head.flags |= CAN_FD_FRAME; } }; +#endif /// @brief derivated socketcan class specialized for BCM CAN socket. class socketcan_bcm_t : public socketcan_t |