Bluetooth: controller: remove unnecessary guards in hal headers

aescolar · carlescufi · commit 3712fd34154f · 2018-08-09T12:15:45.000+02:00
After a dedicated header is allocated to the simulated SOC versions
there is no need anymore to have guards in these other files

Signed-off-by: Alberto Escolar Piedras &lt;alpi@oticon.com&gt;
diff --git a/subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf52810.h b/subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf52810.h
@@ -199,7 +199,6 @@ static inline void hal_radio_reset(void)
 
 static inline void hal_radio_ram_prio_setup(void)
 {
-#if !defined(CONFIG_SOC_SERIES_NWTSIM_NRFXX)
 	struct {
 		u32_t volatile reserved_0[0x5a0 >> 2];
 		u32_t volatile bridge_type;
@@ -236,7 +235,6 @@ static inline void hal_radio_ram_prio_setup(void)
 	NRF_AMLI->RAMPRI.I2S     = 0xFFFFFFFFUL;
 	NRF_AMLI->RAMPRI.PDM     = 0xFFFFFFFFUL;
 	NRF_AMLI->RAMPRI.PWM     = 0xFFFFFFFFUL;
-#endif /* !CONFIG_SOC_SERIES_NWTSIM_NRFXX */
 }
 
 static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)
diff --git a/subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf52832.h b/subsys/bluetooth/controller/hal/nrf5/radio/radio_nrf52832.h
@@ -196,16 +196,13 @@
 
 static inline void hal_radio_reset(void)
 {
-#if !defined(CONFIG_SOC_SERIES_NWTSIM_NRFXX)
 	/* Anomalies 102, 106 and 107 */
 	*(volatile u32_t *)0x40001774 = ((*(volatile u32_t *)0x40001774) &
 					 0xfffffffe) | 0x01000000;
-#endif /* !CONFIG_SOC_SERIES_NWTSIM_NRFXX */
 }
 
 static inline void hal_radio_ram_prio_setup(void)
 {
-#if !defined(CONFIG_SOC_SERIES_NWTSIM_NRFXX)
 	struct {
 		u32_t volatile reserved_0[0x5a0 >> 2];
 		u32_t volatile bridge_type;
@@ -242,7 +239,6 @@ static inline void hal_radio_ram_prio_setup(void)
 	NRF_AMLI->RAMPRI.I2S     = 0xFFFFFFFFUL;
 	NRF_AMLI->RAMPRI.PDM     = 0xFFFFFFFFUL;
 	NRF_AMLI->RAMPRI.PWM     = 0xFFFFFFFFUL;
-#endif /* !CONFIG_SOC_SERIES_NWTSIM_NRFXX */
 }
 
 static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,6 @@ static inline void hal_radio_reset(void)`
`199`	`199`
`200`	`200`	`static inline void hal_radio_ram_prio_setup(void)`
`201`	`201`	`{`
`202`		`-#if !defined(CONFIG_SOC_SERIES_NWTSIM_NRFXX)`
`203`	`202`	`struct {`
`204`	`203`	`u32_t volatile reserved_0[0x5a0 >> 2];`
`205`	`204`	`u32_t volatile bridge_type;`
`@@ -236,7 +235,6 @@ static inline void hal_radio_ram_prio_setup(void)`
`236`	`235`	`NRF_AMLI->RAMPRI.I2S = 0xFFFFFFFFUL;`
`237`	`236`	`NRF_AMLI->RAMPRI.PDM = 0xFFFFFFFFUL;`
`238`	`237`	`NRF_AMLI->RAMPRI.PWM = 0xFFFFFFFFUL;`
`239`		`-#endif /* !CONFIG_SOC_SERIES_NWTSIM_NRFXX */`
`240`	`238`	`}`
`241`	`239`
`242`	`240`	`static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)`
Original file line number	Diff line number	Diff line change
`@@ -196,16 +196,13 @@`
`196`	`196`
`197`	`197`	`static inline void hal_radio_reset(void)`
`198`	`198`	`{`
`199`		`-#if !defined(CONFIG_SOC_SERIES_NWTSIM_NRFXX)`
`200`	`199`	`/* Anomalies 102, 106 and 107 */`
`201`	`200`	`(volatile u32_t )0x40001774 = (((volatile u32_t )0x40001774) &`
`202`	`201`	`0xfffffffe) \| 0x01000000;`
`203`		`-#endif /* !CONFIG_SOC_SERIES_NWTSIM_NRFXX */`
`204`	`202`	`}`
`205`	`203`
`206`	`204`	`static inline void hal_radio_ram_prio_setup(void)`
`207`	`205`	`{`
`208`		`-#if !defined(CONFIG_SOC_SERIES_NWTSIM_NRFXX)`
`209`	`206`	`struct {`
`210`	`207`	`u32_t volatile reserved_0[0x5a0 >> 2];`
`211`	`208`	`u32_t volatile bridge_type;`
`@@ -242,7 +239,6 @@ static inline void hal_radio_ram_prio_setup(void)`
`242`	`239`	`NRF_AMLI->RAMPRI.I2S = 0xFFFFFFFFUL;`
`243`	`240`	`NRF_AMLI->RAMPRI.PDM = 0xFFFFFFFFUL;`
`244`	`241`	`NRF_AMLI->RAMPRI.PWM = 0xFFFFFFFFUL;`
`245`		`-#endif /* !CONFIG_SOC_SERIES_NWTSIM_NRFXX */`
`246`	`242`	`}`
`247`	`243`
`248`	`244`	`static inline u32_t hal_radio_phy_mode_get(u8_t phy, u8_t flags)`