diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-07-20 10:14:56 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-07-20 13:23:15 +0000 |
| commit | 944295b5af95fdcb1a33e2028ef709e7bf60cb6e (patch) | |
| tree | b22ddde59ab0f0fd3fabdb87413105b9571cdf9b /low-can-binding/utils/socketcan-bcm.cpp | |
| parent | 5d58986bc8389a44741486c5856f39f51a4c6e39 (diff) | |
Fix: align bindingv2 struct with dab appfw version
DAB Fixes follows appfw API break.
Following functions now return 0 on success and negative value
on failure :
o afb_req_subcall
o afb_req_subcall_sync
o afb_service_call
o afb_service_call_sync
Verbosity macros used in v2 bindings now needs to be prefixed
with AFB_ (ERROR -> AFB_ERROR)
New field for afb_verb_v2 and afb_binding_v2 structures
Fix: uninitialized variables.
Change-Id: Ia728b9ac4576b9b44c8c7c054820b7c64a314942
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/utils/socketcan-bcm.cpp')
| -rw-r--r-- | low-can-binding/utils/socketcan-bcm.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/low-can-binding/utils/socketcan-bcm.cpp b/low-can-binding/utils/socketcan-bcm.cpp index e16b246..39b53f5 100644 --- a/low-can-binding/utils/socketcan-bcm.cpp +++ b/low-can-binding/utils/socketcan-bcm.cpp @@ -45,10 +45,10 @@ namespace utils // Attempts to open a socket to CAN bus ::strcpy(ifr.ifr_name, device_name.c_str()); - DEBUG("BCM socket ifr_name is : %s", ifr.ifr_name); + AFB_DEBUG("BCM socket ifr_name is : %s", ifr.ifr_name); if(::ioctl(socket_, SIOCGIFINDEX, &ifr) < 0) { - ERROR("ioctl failed. Error was : %s", strerror(errno)); + AFB_ERROR("ioctl failed. Error was : %s", strerror(errno)); close(); } else @@ -58,7 +58,7 @@ namespace utils if(connect((struct sockaddr *)&tx_address_, sizeof(tx_address_)) < 0) { - ERROR("Connect failed. %s", strerror(errno)); + AFB_ERROR("Connect failed. %s", strerror(errno)); close(); } // Needed because of using systemD event loop. See sd_event_add_io manual. @@ -84,8 +84,8 @@ namespace utils ioctl(s.socket(), SIOCGIFNAME, &ifr); long unsigned int frame_size = nbytes-sizeof(struct bcm_msg_head); - DEBUG("Data available: %li bytes read. BCM head, opcode: %i, can_id: %i, nframes: %i", frame_size, msg.msg_head.opcode, msg.msg_head.can_id, msg.msg_head.nframes); - DEBUG("read: Found on bus %s:\n id: %X, length: %X, data %02X%02X%02X%02X%02X%02X%02X%02X", ifr.ifr_name, msg.msg_head.can_id, msg.frames.can_dlc, + AFB_DEBUG("Data available: %li bytes read. BCM head, opcode: %i, can_id: %i, nframes: %i", frame_size, msg.msg_head.opcode, msg.msg_head.can_id, msg.msg_head.nframes); + AFB_DEBUG("read: Found on bus %s:\n id: %X, length: %X, data %02X%02X%02X%02X%02X%02X%02X%02X", ifr.ifr_name, msg.msg_head.can_id, msg.frames.can_dlc, msg.frames.data[0], msg.frames.data[1], msg.frames.data[2], msg.frames.data[3], msg.frames.data[4], msg.frames.data[5], msg.frames.data[6], msg.frames.data[7]); struct timeval tv; @@ -98,4 +98,4 @@ namespace utils return s; } -}
\ No newline at end of file +} |