X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fsocketcan-raw.cpp;h=ca892e70fca389686aed71aa99d42bf5fd3374ca;hb=2daa033bd69b9ede497afa4355a5fdbb119895eb;hp=31965c3d3217c92115b8d6a77ba778f2e9b9ea53;hpb=32e25cbca210a359b09768537b6f443fe90a3070;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/utils/socketcan-raw.cpp b/low-can-binding/utils/socketcan-raw.cpp index 31965c3d..ca892e70 100644 --- a/low-can-binding/utils/socketcan-raw.cpp +++ b/low-can-binding/utils/socketcan-raw.cpp @@ -36,16 +36,16 @@ namespace utils int socketcan_raw_t::open(std::string device_name) { close(); - + struct ifreq ifr; socket_ = socketcan_t::open(PF_CAN, SOCK_RAW, CAN_RAW); // Attempts to open a socket to CAN bus ::strcpy(ifr.ifr_name, device_name.c_str()); - DEBUG("ifr_name is : %s", ifr.ifr_name); + AFB_DEBUG("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 @@ -55,7 +55,7 @@ namespace utils if(bind((struct sockaddr *)&tx_address_, sizeof(tx_address_)) < 0) { - ERROR("Bind failed. %s", strerror(errno)); + AFB_ERROR("Bind failed. %s", strerror(errno)); close(); } } @@ -74,8 +74,8 @@ namespace utils ifr.ifr_ifindex = addr.can_ifindex; ioctl(s.socket(), SIOCGIFNAME, &ifr); - DEBUG("Data available: %i bytes read", (int)nbytes); - DEBUG("read: Found on bus %s:\n id: %X, length: %X, data %02X%02X%02X%02X%02X%02X%02X%02X", ifr.ifr_name, frame.can_id, frame.len, + AFB_DEBUG("Data available: %i bytes read", (int)nbytes); + AFB_DEBUG("read: Found on bus %s:\n id: %X, length: %X, data %02X%02X%02X%02X%02X%02X%02X%02X", ifr.ifr_name, frame.can_id, frame.len, frame.data[0], frame.data[1], frame.data[2], frame.data[3], frame.data[4], frame.data[5], frame.data[6], frame.data[7]); struct timeval tv; @@ -85,4 +85,4 @@ namespace utils return s; } -} \ No newline at end of file +}