From: Romain Forlot <romain.forlot@iot.bzh>
Date: Wed, 1 Mar 2017 16:07:49 +0000 (+0100)
Subject: Merge branch 'master' of github.com:iotbzh/CAN_signaling
X-Git-Tag: 5.0.2~592
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=0c9926d385f357e4a0a8bb2932da0aa6e2503b9b;hp=e320a0bc3f6a40cf7b6c7cd2e708de419dc4006c;p=apps%2Fagl-service-can-low-level.git

Merge branch 'master' of github.com:iotbzh/CAN_signaling
---

diff --git a/src/can-bus.cpp b/src/can-bus.cpp
index 989dfa20..52c81cf1 100644
--- a/src/can-bus.cpp
+++ b/src/can-bus.cpp
@@ -143,8 +143,6 @@ void can_bus_t::stop_threads()
 {
 	is_decoding_ = false;
 	is_pushing_ = false;
-	th_decoding_.join();
-	th_pushing_.join();
 }
 
 int can_bus_t::init_can_dev()
@@ -361,7 +359,7 @@ canfd_frame can_bus_dev_t::read()
 {
 	ssize_t nbytes;
 	//int maxdlen;
-	canfd_frame canfd_frame;
+	struct canfd_frame cfd;
 
 	/* Test that socket is really opened */
 	if (can_socket_ < 0)
@@ -370,17 +368,18 @@ canfd_frame can_bus_dev_t::read()
 		is_running_ = false;
 	}
 
-	nbytes = ::read(can_socket_, &canfd_frame, CANFD_MTU);
+	nbytes = ::read(can_socket_, &cfd, CANFD_MTU);
 
 	/* if we did not fit into CAN sized messages then stop_reading. */
 	if (nbytes != CANFD_MTU && nbytes != CAN_MTU)
+	{
 		if (errno == ENETDOWN)
 			ERROR(binder_interface, "read: %s CAN device down", device_name_);
-		ERROR(binder_interface, "read: Error reading CAN bus");
-		::memset(&canfd_frame, 0, sizeof(canfd_frame));
-		stop_reading();
+		ERROR(binder_interface, "read: Incomplete CAN(FD) frame");
+		::memset(&cfd, 0, sizeof(cfd));
+	}
 
-	return canfd_frame;
+	return cfd;
 }
 
 void can_bus_dev_t::start_reading(can_bus_t& can_bus)
@@ -395,7 +394,6 @@ void can_bus_dev_t::start_reading(can_bus_t& can_bus)
 void can_bus_dev_t::stop_reading()
 {
 	is_running_ = false;
-	th_reading_.join();
 }
 
 void can_bus_dev_t::can_reader(can_bus_t& can_bus)
diff --git a/src/can-message.cpp b/src/can-message.cpp
index a95722e8..e2732487 100644
--- a/src/can-message.cpp
+++ b/src/can-message.cpp
@@ -186,7 +186,7 @@ void can_message_t::convert_from_canfd_frame(const struct canfd_frame& frame)
 	data_.reserve(dlen);
 	set_data(frame.data, dlen);
 
-	DEBUG(binder_interface, "convert_from_canfd_frame: Found id: %d, format: %d, length: %d, data %d%d%d%d%d%d%d%d", id_, format_, length_,
+	DEBUG(binder_interface, "convert_from_canfd_frame: Found id: %X, format: %X, length: %X, data %02X%02X%02X%02X%02X%02X%02X%02X", id_, format_, length_,
 							data_[0], data_[1], data_[2], data_[3], data_[4], data_[5], data_[6], data_[7]);
 }