drivers: CAN: Change u32_t error_flags to int error_numbers

The error_flags parameter of the can_tx_callback_t is a u32_t
but gets negative CAN_TX error codes. This commit changes the
error_flags to int error_numbers.

Signed-off-by: Alexander Wachter <alexander.wachter@student.tugraz.at>

Author: Alexander Wachter

drivers/can/can_common.c

@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(can_driver);
 
 #define WORK_BUF_FULL 0xFFFF
 
-void can_common_isr_callback_handler(u32_t err, void *cb_arg)
+void can_common_isr_callback_handler(int err, void *cb_arg)
 {
 	struct can_send_wait *send_wait = (struct can_send_wait *) cb_arg;
 

drivers/can/socket_can_generic.h

@@ -44,12 +44,12 @@ static inline void socket_can_iface_init(struct net_if *iface)
 	LOG_DBG("Init CAN interface %p dev %p", iface, dev);
 }
 
-static inline void tx_irq_callback(u32_t error_flags, void *arg)
+static inline void tx_irq_callback(int error_number, void *arg)
 {
 	char *caller_str = (char *)arg;
-	if (error_flags) {
+	if (error_number) {
 		LOG_DBG("TX error from %s! error-code: %d",
-			caller_str, error_flags);
+			caller_str, error_number);
 	}
 }
 

include/drivers/can.h

@@ -257,7 +257,7 @@ struct can_bus_err_cnt {
  * @param error_flags status of the performed send operation
  * @param arg argument that was passed when the message was sent
  */
-typedef void (*can_tx_callback_t)(u32_t error_flags, void *arg);
+typedef void (*can_tx_callback_t)(int error_number, void *arg);
 
 /**
  * @typedef can_rx_callback_t

samples/drivers/CAN/src/main.c

@@ -36,13 +36,13 @@ struct can_bus_err_cnt current_err_cnt;
 
 CAN_DEFINE_MSGQ(counter_msgq, 2);
 
-void tx_irq_callback(u32_t error_flags, void *arg)
+void tx_irq_callback(int error_number, void *arg)
 {
 	char *sender = (char *)arg;
 
-	if (error_flags) {
+	if (error_number) {
 		printk("Callback! error-code: %d\nSender: %s\n",
-		       error_flags, sender);
+		       error_number, sender);
 	}
 }
 

subsys/net/l2/canbus/6locan.c

@@ -425,10 +425,10 @@ static void canbus_set_frame_addr_pkt(struct zcan_frame *frame,
 	canbus_set_frame_addr(frame, dest_addr, &src_addr, mcast);
 }
 
-static void canbus_fc_send_cb(u32_t err_flags, void *arg)
+static void canbus_fc_send_cb(int err_number, void *arg)
 {
-	if (err_flags) {
-		NET_ERR("Sending FC frame failed: %d", err_flags);
+	if (err_number) {
+		NET_ERR("Sending FC frame failed: %d", err_number);
 	}
 }
 
@@ -684,7 +684,7 @@ static enum net_verdict canbus_process_sf(struct net_pkt *pkt)
 	return canbus_finish_pkt(pkt);
 }
 
-static void canbus_tx_frame_isr(u32_t err_flags, void *arg)
+static void canbus_tx_frame_isr(int err_number, void *arg)
 {
 	struct net_pkt *pkt = (struct net_pkt *)arg;
 	struct canbus_isotp_tx_ctx *ctx = pkt->canbus_tx_ctx;
@@ -1528,14 +1528,14 @@ static inline int canbus_send_dad_request(struct device *net_can_dev,
 	return 0;
 }
 
-static void canbus_send_dad_resp_cb(u32_t err_flags, void *cb_arg)
+static void canbus_send_dad_resp_cb(int err_number, void *cb_arg)
 {
 	static u8_t fail_cnt;
 	struct k_work *work = (struct k_work *)cb_arg;
 
-	if (err_flags) {
-		NET_ERR("Failed to send dad response [%u]", err_flags);
-		if (err_flags != CAN_TX_BUS_OFF &&
+	if (err_number) {
+		NET_ERR("Failed to send dad response [%u]", err_number);
+		if (err_number != CAN_TX_BUS_OFF &&
 		    fail_cnt < NET_CAN_DAD_SEND_RETRY) {
 			k_work_submit_to_queue(&net_canbus_workq, work);
 		}

tests/drivers/can/api/src/main.c

@@ -162,7 +162,7 @@ static inline void check_msg(struct zcan_frame *msg1, struct zcan_frame *msg2,
 	zassert_equal(cmp_res, 0, "Received data differ");
 }
 
-static void tx_timeout_isr(u32_t error_flags, void *arg)
+static void tx_timeout_isr(int error_number, void *arg)
 {
 	int expected_err = (int)arg;
 
@@ -173,7 +173,7 @@ static void tx_timeout_isr(u32_t error_flags, void *arg)
 			  expected_err, error_number);
 }
 
-static void tx_std_isr(u32_t error_flags, void *arg)
+static void tx_std_isr(int error_number, void *arg)
 {
 	struct zcan_frame *msg = (struct zcan_frame *)arg;
 
@@ -182,7 +182,7 @@ static void tx_std_isr(u32_t error_flags, void *arg)
 	zassert_equal(msg->std_id, TEST_CAN_STD_ID, "Arg does not match");
 }
 
-static void tx_std_masked_isr(u32_t error_flags, void *arg)
+static void tx_std_masked_isr(int error_number, void *arg)
 {
 	struct zcan_frame *msg = (struct zcan_frame *)arg;
 
@@ -191,7 +191,7 @@ static void tx_std_masked_isr(u32_t error_flags, void *arg)
 	zassert_equal(msg->std_id, TEST_CAN_STD_MASK_ID, "Arg does not match");
 }
 
-static void tx_ext_isr(u32_t error_flags, void *arg)
+static void tx_ext_isr(int error_number, void *arg)
 {
 	struct zcan_frame *msg = (struct zcan_frame *)arg;
 
@@ -200,7 +200,7 @@ static void tx_ext_isr(u32_t error_flags, void *arg)
 	zassert_equal(msg->ext_id, TEST_CAN_EXT_ID, "Arg does not match");
 }
 
-static void tx_ext_masked_isr(u32_t error_flags, void *arg)
+static void tx_ext_masked_isr(int error_number, void *arg)
 {
 	struct zcan_frame *msg = (struct zcan_frame *)arg;