|
8 | 8 | * Enable Radio on Event Timer tick: |
9 | 9 | * wire the EVENT_TIMER EVENTS_COMPARE[0] event to RADIO TASKS_TXEN/RXEN task. |
10 | 10 | */ |
11 | | -#define HAL_RADIO_ENABLE_TX_ON_TICK_PPI 6 |
12 | | -#define HAL_RADIO_ENABLE_RX_ON_TICK_PPI 6 |
| 11 | +#define HAL_RADIO_ENABLE_TX_ON_TICK_PPI 9 |
| 12 | +#define HAL_RADIO_ENABLE_RX_ON_TICK_PPI 9 |
13 | 13 |
|
14 | 14 | /******************************************************************************* |
15 | 15 | * Capture event timer on Address reception: |
16 | 16 | * wire the RADIO EVENTS_ADDRESS event to the |
17 | 17 | * EVENT_TIMER TASKS_CAPTURE[<address timer>] task. |
18 | 18 | */ |
19 | | -#define HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI 9 |
| 19 | +#define HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI 7 |
20 | 20 |
|
21 | 21 | /******************************************************************************* |
22 | 22 | * Disable Radio on HCTO: |
23 | 23 | * wire the EVENT_TIMER EVENTS_COMPARE[<HCTO timer>] event |
24 | 24 | * to the RADIO TASKS_DISABLE task. |
25 | 25 | */ |
26 | | -#define HAL_RADIO_DISABLE_ON_HCTO_PPI 10 |
| 26 | +#define HAL_RADIO_DISABLE_ON_HCTO_PPI 11 |
27 | 27 |
|
28 | 28 | /******************************************************************************* |
29 | 29 | * Capture event timer on Radio end: |
30 | 30 | * wire the RADIO EVENTS_END event to the |
31 | 31 | * EVENT_TIMER TASKS_CAPTURE[<radio end timer>] task. |
32 | 32 | */ |
33 | | -#define HAL_RADIO_END_TIME_CAPTURE_PPI 11 |
| 33 | +#define HAL_RADIO_END_TIME_CAPTURE_PPI 12 |
34 | 34 |
|
35 | 35 | /******************************************************************************* |
36 | 36 | * Start event timer on RTC tick: |
37 | 37 | * wire the RTC0 EVENTS_COMPARE[2] event to EVENT_TIMER TASKS_START task. |
38 | 38 | */ |
39 | | -#define HAL_EVENT_TIMER_START_PPI 7 |
| 39 | +#define HAL_EVENT_TIMER_START_PPI 8 |
40 | 40 | #define HAL_PPIB_SEND_EVENT_TIMER_START_PPI \ |
41 | 41 | _CONCAT(NRF_PPIB_TASK_SEND_, HAL_EVENT_TIMER_START_PPI) |
42 | 42 | #define HAL_PPIB_RECEIVE_EVENT_TIMER_START_PPI \ |
|
47 | 47 | * wire the RADIO EVENTS_READY event to the |
48 | 48 | * EVENT_TIMER TASKS_CAPTURE[<radio ready timer>] task. |
49 | 49 | */ |
50 | | -#define HAL_RADIO_READY_TIME_CAPTURE_PPI 8 |
| 50 | +#define HAL_RADIO_READY_TIME_CAPTURE_PPI 10 |
51 | 51 |
|
52 | 52 | /******************************************************************************* |
53 | 53 | * Trigger encryption task upon address reception: |
|
62 | 62 | * Trigger automatic address resolution on Bit counter match: |
63 | 63 | * wire the RADIO EVENTS_BCMATCH event to the AAR TASKS_START task. |
64 | 64 | */ |
65 | | -#define HAL_TRIGGER_AAR_PPI 12 |
| 65 | +#define HAL_TRIGGER_AAR_PPI 6 |
66 | 66 |
|
67 | 67 | #if defined(CONFIG_BT_CTLR_PHY_CODED) && \ |
68 | 68 | defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED) |
69 | 69 | /******************************************************************************* |
70 | 70 | * Trigger Radio Rate override upon Rateboost event. |
71 | 71 | */ |
72 | | -#define HAL_TRIGGER_RATEOVERRIDE_PPI 13 |
| 72 | +#define HAL_TRIGGER_RATEOVERRIDE_PPI 5 |
73 | 73 | #endif /* CONFIG_BT_CTLR_PHY_CODED && CONFIG_HAS_HW_NRF_RADIO_BLE_CODED */ |
74 | 74 |
|
75 | 75 | #if defined(HAL_RADIO_GPIO_HAVE_PA_PIN) || defined(HAL_RADIO_GPIO_HAVE_LNA_PIN) |
76 | 76 | /******************************************************************************/ |
77 | | -#define HAL_ENABLE_PALNA_PPI 5 |
| 77 | +#define HAL_ENABLE_PALNA_PPI 3 |
78 | 78 |
|
79 | 79 | #if defined(HAL_RADIO_FEM_IS_NRF21540) |
80 | | -#define HAL_DISABLE_PALNA_PPI 4 |
| 80 | +#define HAL_DISABLE_PALNA_PPI 1 |
81 | 81 | #else |
82 | 82 | #define HAL_DISABLE_PALNA_PPI HAL_ENABLE_PALNA_PPI |
83 | 83 | #endif |
84 | 84 |
|
85 | | -#define HAL_ENABLE_FEM_PPI 3 |
| 85 | +#define HAL_ENABLE_FEM_PPI 2 |
86 | 86 | #define HAL_DISABLE_FEM_PPI HAL_DISABLE_PALNA_PPI |
87 | 87 |
|
88 | 88 | #endif /* HAL_RADIO_GPIO_HAVE_PA_PIN || HAL_RADIO_GPIO_HAVE_LNA_PIN */ |
|
107 | 107 |
|
108 | 108 | /* Wire a SW SWITCH TIMER EVENTS_COMPARE[<cc_offset>] event |
109 | 109 | * to a PPI GROUP TASK DISABLE task (PPI group with index <index>). |
110 | | - * 2 adjacent PPIs (14 & 15) and 2 adjacent PPI groups are used for this wiring; |
| 110 | + * 2 adjacent PPIs (13 & 14) and 2 adjacent PPI groups are used for this wiring; |
111 | 111 | * <index> must be 0 or 1. <offset> must be a valid TIMER CC register offset. |
112 | 112 | */ |
113 | | -#define HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI_BASE 14 |
| 113 | +#define HAL_SW_SWITCH_GROUP_TASK_DISABLE_PPI_BASE 13 |
114 | 114 |
|
115 | 115 | /* Enable the SW Switch PPI Group on RADIO END Event. |
116 | 116 | * |
|
130 | 130 | * We use the same PPI for the alternative SW Switch Timer compare |
131 | 131 | * event. |
132 | 132 | */ |
133 | | -#define HAL_SW_SWITCH_RADIO_ENABLE_PPI_BASE 14 |
| 133 | +#define HAL_SW_SWITCH_RADIO_ENABLE_PPI_BASE 13 |
134 | 134 |
|
135 | 135 | #if defined(CONFIG_BT_CTLR_PHY_CODED) && \ |
136 | 136 | defined(CONFIG_HAS_HW_NRF_RADIO_BLE_CODED) |
|
151 | 151 | /* Cancel the SW switch timer running considering PHYEND delay compensation timing: |
152 | 152 | * wire the RADIO EVENTS_CTEPRESENT event to SW_SWITCH_TIMER TASKS_CAPTURE task. |
153 | 153 | */ |
154 | | -#define HAL_SW_SWITCH_TIMER_PHYEND_DELAY_COMPENSATION_DISABLE_PPI 16 |
| 154 | +#define HAL_SW_SWITCH_TIMER_PHYEND_DELAY_COMPENSATION_DISABLE_PPI 15 |
155 | 155 | #endif /* CONFIG_BT_CTLR_DF_PHYEND_OFFSET_COMPENSATION_ENABLE */ |
156 | 156 |
|
157 | 157 | #if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RX) |
|
162 | 162 | * when direction finding RX and PHY is set to PHY1M. Due to that it can be shared with Radio Rate |
163 | 163 | * override. |
164 | 164 | */ |
165 | | -#define HAL_TRIGGER_CRYPT_DELAY_PPI 13 |
| 165 | +#define HAL_TRIGGER_CRYPT_DELAY_PPI 5 |
166 | 166 | #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RX */ |
167 | 167 |
|
168 | 168 | /* The 2 adjacent PPI groups used for implementing SW_SWITCH_TIMER-based |
|
0 commit comments