commit 4004475e7fbc93f9e845eca7d4bdf36599260d6c
author Stephanos Ioannidis <root@stephanos.io> Fri Aug 05 18:02:38 2022 +0900
committer Carles Cufí <carles.cufi@nordicsemi.no> Fri Aug 05 15:15:34 2022 +0200
tree e408d57c77ea5abd25e54a7f870d82350a9c0659
parent 1d844bff265765be0f644a8b06d3fd90fe18de98

drivers: timer: nrf_rtc_timer: Fix assert conditions

This commit fixes the incomplete assert conditions for the `chan`
argument passed to the nRF RTC timer functions.

Note that the `chan` argument for this driver is of a **signed**
integer type, so it is necessary to check that its value is
non-negative.

This fixes the warnings generated by the GCC 12 such as:

  error: array subscript -1 is below array bounds of '...'

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>

drivers/timer/nrf_rtc_timer.c

diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c
index 051bf1c..a41a5fd 100644
--- a/drivers/timer/nrf_rtc_timer.c
+++ b/drivers/timer/nrf_rtc_timer.c
@@ -119,14 +119,14 @@
 
 uint32_t z_nrf_rtc_timer_compare_evt_address_get(int32_t chan)
 {
-	__ASSERT_NO_MSG(chan < CHAN_COUNT);
+	__ASSERT_NO_MSG(chan >= 0 && chan < CHAN_COUNT);
 	return nrf_rtc_event_address_get(RTC, nrf_rtc_compare_event_get(chan));
 }
 
 uint32_t z_nrf_rtc_timer_capture_task_address_get(int32_t chan)
 {
 #if defined(RTC_TASKS_CAPTURE_TASKS_CAPTURE_Msk)
-	__ASSERT_NO_MSG(chan < CHAN_COUNT);
+	__ASSERT_NO_MSG(chan >= 0 && chan < CHAN_COUNT);
 	if (chan == 0) {
 		return 0;
 	}
@@ -155,7 +155,7 @@
 
 bool z_nrf_rtc_timer_compare_int_lock(int32_t chan)
 {
-	__ASSERT_NO_MSG(chan && chan < CHAN_COUNT);
+	__ASSERT_NO_MSG(chan > 0 && chan < CHAN_COUNT);
 
 	return compare_int_lock(chan);
 }
@@ -173,14 +173,14 @@
 
 void z_nrf_rtc_timer_compare_int_unlock(int32_t chan, bool key)
 {
-	__ASSERT_NO_MSG(chan && chan < CHAN_COUNT);
+	__ASSERT_NO_MSG(chan > 0 && chan < CHAN_COUNT);
 
 	compare_int_unlock(chan, key);
 }
 
 uint32_t z_nrf_rtc_timer_compare_read(int32_t chan)
 {
-	__ASSERT_NO_MSG(chan < CHAN_COUNT);
+	__ASSERT_NO_MSG(chan >= 0 && chan < CHAN_COUNT);
 
 	return nrf_rtc_cc_get(RTC, chan);
 }
@@ -329,14 +329,14 @@
 			 z_nrf_rtc_timer_compare_handler_t handler,
 			 void *user_data)
 {
-	__ASSERT_NO_MSG(chan && chan < CHAN_COUNT);
+	__ASSERT_NO_MSG(chan > 0 && chan < CHAN_COUNT);
 
 	return compare_set(chan, target_time, handler, user_data);
 }
 
 void z_nrf_rtc_timer_abort(int32_t chan)
 {
-	__ASSERT_NO_MSG(chan && chan < CHAN_COUNT);
+	__ASSERT_NO_MSG(chan > 0 && chan < CHAN_COUNT);
 
 	bool key = compare_int_lock(chan);
 
@@ -535,7 +535,7 @@
 
 void z_nrf_rtc_timer_chan_free(int32_t chan)
 {
-	__ASSERT_NO_MSG(chan && chan < CHAN_COUNT);
+	__ASSERT_NO_MSG(chan > 0 && chan < CHAN_COUNT);
 
 	atomic_or(&alloc_mask, BIT(chan));
 }