@@ -414,7 +414,7 @@ void radio_tx_enable(void)
414
414
void radio_disable (void )
415
415
{
416
416
#if !defined(CONFIG_BT_CTLR_TIFS_HW )
417
- NRF_PPI -> CHENCLR = PPI_CHEN_CH8_Msk | PPI_CHEN_CH11_Msk ;
417
+ NRF_PPI -> CHENCLR = PPI_CHEN_CH9_Msk | PPI_CHEN_CH12_Msk ;
418
418
NRF_PPI -> TASKS_CHG [0 ].DIS = 1 ;
419
419
NRF_PPI -> TASKS_CHG [1 ].DIS = 1 ;
420
420
#endif /* !CONFIG_BT_CTLR_TIFS_HW */
@@ -489,13 +489,13 @@ static u8_t sw_tifs_toggle;
489
489
static void sw_switch (u8_t dir , u8_t phy_curr , u8_t flags_curr , u8_t phy_next ,
490
490
u8_t flags_next )
491
491
{
492
- u8_t ppi = 12 + sw_tifs_toggle ;
492
+ u8_t ppi = 13 + sw_tifs_toggle ;
493
493
u32_t delay ;
494
494
495
495
NRF_TIMER1 -> EVENTS_COMPARE [sw_tifs_toggle ] = 0 ;
496
496
497
- NRF_PPI -> CH [11 ].EEP = (u32_t )& (NRF_RADIO -> EVENTS_END );
498
- NRF_PPI -> CH [11 ].TEP = (u32_t )& (NRF_PPI -> TASKS_CHG [sw_tifs_toggle ].EN );
497
+ NRF_PPI -> CH [12 ].EEP = (u32_t )& (NRF_RADIO -> EVENTS_END );
498
+ NRF_PPI -> CH [12 ].TEP = (u32_t )& (NRF_PPI -> TASKS_CHG [sw_tifs_toggle ].EN );
499
499
500
500
NRF_PPI -> CH [ppi ].EEP = (u32_t )
501
501
& (NRF_TIMER1 -> EVENTS_COMPARE [sw_tifs_toggle ]);
@@ -518,7 +518,7 @@ static void sw_switch(u8_t dir, u8_t phy_curr, u8_t flags_curr, u8_t phy_next,
518
518
NRF_TIMER1 -> CC [sw_tifs_toggle ] = 1 ;
519
519
}
520
520
521
- NRF_PPI -> CHENSET = PPI_CHEN_CH8_Msk | PPI_CHEN_CH11_Msk ;
521
+ NRF_PPI -> CHENSET = PPI_CHEN_CH9_Msk | PPI_CHEN_CH12_Msk ;
522
522
523
523
sw_tifs_toggle += 1 ;
524
524
sw_tifs_toggle &= 1 ;
@@ -558,7 +558,7 @@ void radio_switch_complete_and_disable(void)
558
558
(RADIO_SHORTS_READY_START_Msk | RADIO_SHORTS_END_DISABLE_Msk );
559
559
560
560
#if !defined(CONFIG_BT_CTLR_TIFS_HW )
561
- NRF_PPI -> CHENCLR = PPI_CHEN_CH8_Msk | PPI_CHEN_CH11_Msk ;
561
+ NRF_PPI -> CHENCLR = PPI_CHEN_CH9_Msk | PPI_CHEN_CH12_Msk ;
562
562
#endif /* !CONFIG_BT_CTLR_TIFS_HW */
563
563
}
564
564
@@ -692,17 +692,17 @@ u32_t radio_tmr_start(u8_t trx, u32_t ticks_start, u32_t remainder)
692
692
NRF_TIMER1 -> BITMODE = 0 ; /* 16 bit */
693
693
NRF_TIMER1 -> TASKS_START = 1 ;
694
694
695
- NRF_PPI -> CH [8 ].EEP = (u32_t )& (NRF_RADIO -> EVENTS_END );
696
- NRF_PPI -> CH [8 ].TEP = (u32_t )& (NRF_TIMER1 -> TASKS_CLEAR );
695
+ NRF_PPI -> CH [9 ].EEP = (u32_t )& (NRF_RADIO -> EVENTS_END );
696
+ NRF_PPI -> CH [9 ].TEP = (u32_t )& (NRF_TIMER1 -> TASKS_CLEAR );
697
697
698
- NRF_PPI -> CH [9 ].EEP = (u32_t )& (NRF_TIMER1 -> EVENTS_COMPARE [0 ]);
699
- NRF_PPI -> CH [9 ].TEP = (u32_t )& (NRF_PPI -> TASKS_CHG [0 ].DIS );
698
+ NRF_PPI -> CH [10 ].EEP = (u32_t )& (NRF_TIMER1 -> EVENTS_COMPARE [0 ]);
699
+ NRF_PPI -> CH [10 ].TEP = (u32_t )& (NRF_PPI -> TASKS_CHG [0 ].DIS );
700
700
701
- NRF_PPI -> CH [10 ].EEP = (u32_t )& (NRF_TIMER1 -> EVENTS_COMPARE [1 ]);
702
- NRF_PPI -> CH [10 ].TEP = (u32_t )& (NRF_PPI -> TASKS_CHG [1 ].DIS );
701
+ NRF_PPI -> CH [11 ].EEP = (u32_t )& (NRF_TIMER1 -> EVENTS_COMPARE [1 ]);
702
+ NRF_PPI -> CH [11 ].TEP = (u32_t )& (NRF_PPI -> TASKS_CHG [1 ].DIS );
703
703
704
- NRF_PPI -> CHG [0 ] = PPI_CHG_CH9_Msk | PPI_CHG_CH12_Msk ;
705
- NRF_PPI -> CHG [1 ] = PPI_CHG_CH10_Msk | PPI_CHG_CH13_Msk ;
704
+ NRF_PPI -> CHG [0 ] = PPI_CHG_CH10_Msk | PPI_CHG_CH13_Msk ;
705
+ NRF_PPI -> CHG [1 ] = PPI_CHG_CH11_Msk | PPI_CHG_CH14_Msk ;
706
706
#endif /* !CONFIG_BT_CTLR_TIFS_HW */
707
707
708
708
return remainder ;
0 commit comments