Merge pull request #278 from martijnthe/bugfix-pin-non-iram-isr

Islam Wahdan · web-flow · commit 1b073d33a52d · 2019-03-26T15:27:32.000+01:00
[WIP] Fix crash when pin ISR handler fires (i.e. LoRa TX done) during flash operation (i.e. ota_write() call)
diff --git a/esp32/lora/sx1272-board.c b/esp32/lora/sx1272-board.c
@@ -14,6 +14,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 */
 
 #include "board.h"
+#include "esp_attr.h"
 
 #if defined(LOPY) || defined (FIPY)
 
@@ -25,7 +26,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 /*!
  * Radio driver structure initialization
  */
-const struct Radio_s Radio =
+DRAM_ATTR const struct Radio_s Radio =
 {
     SX1272Init,
     SX1272GetStatus,
diff --git a/esp32/lora/sx1276-board.c b/esp32/lora/sx1276-board.c
@@ -14,6 +14,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 */
 
 #include "board.h"
+#include "esp_attr.h"
 
 #if defined(LOPY4)
 
@@ -24,7 +25,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 /*!
  * Radio driver structure initialization
  */
-const struct Radio_s Radio =
+DRAM_ATTR const struct Radio_s Radio =
 {
     SX1276Init,
     SX1276GetStatus,
diff --git a/lib/lora/mac/region/Region.c b/lib/lora/mac/region/Region.c
@@ -629,7 +629,7 @@ bool RegionIsActive( LoRaMacRegion_t region )
     }
 }
 
-PhyParam_t RegionGetPhyParam( LoRaMacRegion_t region, GetPhyParams_t* getPhy )
+IRAM_ATTR PhyParam_t RegionGetPhyParam( LoRaMacRegion_t region, GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
     switch( region )
diff --git a/lib/lora/mac/region/RegionEU868.c b/lib/lora/mac/region/RegionEU868.c
@@ -184,7 +184,7 @@ static uint8_t CountNbOfEnabledChannels( bool joined, uint8_t datarate, uint16_t
     return nbEnabledChannels;
 }
 
-PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
+IRAM_ATTR PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
 {
     PhyParam_t phyParam = { 0 };
 

Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ bool RegionIsActive( LoRaMacRegion_t region )`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`
`632`		`-PhyParam_t RegionGetPhyParam( LoRaMacRegion_t region, GetPhyParams_t* getPhy )`
	`632`	`+IRAM_ATTR PhyParam_t RegionGetPhyParam( LoRaMacRegion_t region, GetPhyParams_t* getPhy )`
`633`	`633`	`{`
`634`	`634`	`PhyParam_t phyParam = { 0 };`
`635`	`635`	`switch( region )`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ static uint8_t CountNbOfEnabledChannels( bool joined, uint8_t datarate, uint16_t`
`184`	`184`	`return nbEnabledChannels;`
`185`	`185`	`}`
`186`	`186`
`187`		`-PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )`
	`187`	`+IRAM_ATTR PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )`
`188`	`188`	`{`
`189`	`189`	`PhyParam_t phyParam = { 0 };`
`190`	`190`