Bluetooth: Controller: Use macro to adjust ticks based on remainder

Use macro to adjust ticks for jitter stored in remainder
value.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c

@@ -1050,11 +1050,7 @@ void radio_tmr_tifs_set(uint32_t tifs)
 
 uint32_t radio_tmr_start(uint8_t trx, uint32_t ticks_start, uint32_t remainder)
 {
-	if ((!(remainder / 1000000UL)) || (remainder & 0x80000000)) {
-		ticks_start--;
-		remainder += 30517578UL;
-	}
-	remainder /= 1000000UL;
+	HAL_TICKER_REMOVE_JITTER(ticks_start, remainder);
 
 	nrf_timer_task_trigger(EVENT_TIMER, NRF_TIMER_TASK_CLEAR);
 	EVENT_TIMER->MODE = 0;

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.h

@@ -13,6 +13,12 @@
 /* Macro defining the max. counter update latency in ticks */
 #define HAL_TICKER_CNTR_SET_LATENCY 0
 
+/* Macro defines the h/w supported most significant bit */
+#define HAL_TICKER_CNTR_MSBIT 23
+
+/* Macro defining the HW supported counter bits */
+#define HAL_TICKER_CNTR_MASK 0x00FFFFFF
+
 /* Macro to translate microseconds to tick units.
  * NOTE: This returns the floor value.
  */
@@ -22,7 +28,7 @@
 		& HAL_TICKER_CNTR_MASK \
 	)
 
-/* Macro returning remainder in nanoseconds */
+/* Macro returning remainder in picoseconds */
 #define HAL_TICKER_REMAINDER(x) \
 	( \
 		( \
@@ -32,16 +38,30 @@
 		/ 1000UL \
 	)
 
+/* Macro to remove ticks and return positive remainder value in microseconds */
+#define HAL_TICKER_REMOVE_JITTER(t, r) \
+	{ \
+		if ((!(r / 1000000UL)) || (r & BIT(31))) { \
+			t--; \
+			r += 30517578UL; \
+		} \
+		r /= 1000000UL; \
+	}
+
+/* Macro to add ticks and return positive remainder value in microseconds */
+#define HAL_TICKER_ADD_JITTER(t, r) \
+	{ \
+		if ((!(r / 1000000UL)) || (r & BIT(31))) { \
+			t++; \
+			r += 30517578UL; \
+		} \
+		r /= 1000000UL; \
+	}
+
 /* Macro to translate tick units to microseconds. */
 #define HAL_TICKER_TICKS_TO_US(x) \
 	((uint32_t)(((uint64_t)(x) * 30517578125UL) / 1000000000UL))
 
-/* Macro defines the h/w supported most significant bit */
-#define HAL_TICKER_CNTR_MSBIT 23
-
-/* Macro defining the HW supported counter bits */
-#define HAL_TICKER_CNTR_MASK 0x00FFFFFF
-
 /* Macro defining the remainder resolution/range
  * ~ 1000000 * HAL_TICKER_TICKS_TO_US(1)
  */