ISO-TP fast: fix compiler warning and CAN sample build conf

Fixes the following warning: isotp_fast.c:210:1: warning: control reaches end of non-void function [-Wreturn-type]
ThingSet · Apr 9, 2024 · 1f23a8c · 1f23a8c
1 parent 74edabd
commit 1f23a8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/samples/counter/can.conf b/samples/counter/can.conf
@@ -7,6 +7,7 @@ CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR=y
 
 # CAN driver and ISO-TP subsystem
 CONFIG_CAN=y
+CONFIG_ISOTP=y
 CONFIG_ISOTP_FAST=y
 
 # ThingSet SDK

diff --git a/subsys/canbus/isotp_fast/isotp_fast.c b/subsys/canbus/isotp_fast/isotp_fast.c
@@ -205,8 +205,13 @@ struct isotp_fast_addr isotp_fast_get_reply_addr(struct isotp_fast_ctx *ctx,
             return ctx->get_tx_addr_callback(addr);
 #endif /* CONFIG_ISOTP_FAST_CUSTOM_ADDRESSING */
     }
-    __ASSERT(false,
-             "addressing_mode mode either not set or set to an invalid value on isotp_fast_ctx");
+
+    /*
+     * This cannot be reached unless addressing_mode was set to an invalid value. As C cannot
+     * guarantee that no invalid value is set to the enum, we still need to return something to
+     * avoid a warning for -Wreturn-type.
+     */
+    return *addr;
 }
 
 static void receive_report_error(struct isotp_fast_recv_ctx *rctx, int8_t err)