Revert "[nrf temphack] drivers: nrf_802154: Don't set RADIO NVIC when using MPSL"

mbolivar-nordic · mbolivar-nordic · commit f8933111e6d6 · 2020-07-13T22:35:36.000-07:00
This reverts commit 61fd76b. This temphack was replaced upstream with a solution in 7f66fd8, which introduced a new CONFIG_IEEE802154_NRF5_EXT_IRQ_MGMT that can be used for the same purpose. We'll switch from this patch to using that new kconfig in nrfxlib by selecting it whenever MPSL=y. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c
@@ -438,24 +438,20 @@ static int nrf5_stop(struct device *dev)
 	return 0;
 }
 
-#if !CONFIG_MPSL
 static void nrf5_radio_irq(void *arg)
 {
 	ARG_UNUSED(arg);
 
 	nrf_802154_radio_irq_handler();
 }
-#endif
 
 static void nrf5_irq_config(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-#if !CONFIG_MPSL
 	IRQ_CONNECT(RADIO_IRQn, NRF_802154_IRQ_PRIORITY,
 		    nrf5_radio_irq, NULL, 0);
 	irq_enable(RADIO_IRQn);
-#endif
 }
 
 static int nrf5_init(struct device *dev)

Original file line number	Diff line number	Diff line change
`@@ -438,24 +438,20 @@ static int nrf5_stop(struct device *dev)`
`438`	`438`	`return 0;`
`439`	`439`	`}`
`440`	`440`
`441`		`-#if !CONFIG_MPSL`
`442`	`441`	`static void nrf5_radio_irq(void *arg)`
`443`	`442`	`{`
`444`	`443`	`ARG_UNUSED(arg);`
`445`	`444`
`446`	`445`	`nrf_802154_radio_irq_handler();`
`447`	`446`	`}`
`448`		`-#endif`
`449`	`447`
`450`	`448`	`static void nrf5_irq_config(struct device *dev)`
`451`	`449`	`{`
`452`	`450`	`ARG_UNUSED(dev);`
`453`	`451`
`454`		`-#if !CONFIG_MPSL`
`455`	`452`	`IRQ_CONNECT(RADIO_IRQn, NRF_802154_IRQ_PRIORITY,`
`456`	`453`	`nrf5_radio_irq, NULL, 0);`
`457`	`454`	`irq_enable(RADIO_IRQn);`
`458`		`-#endif`
`459`	`455`	`}`
`460`	`456`
`461`	`457`	`static int nrf5_init(struct device *dev)`