cc3200: Use alternative HAL_Delay also when interrupts are disabled.

Daniel Campora · Daniel Campora · commit d18ced9cddb4 · 2015-07-08T12:48:35.000+02:00
diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c
@@ -46,6 +46,7 @@
 #include "telnet.h"
 #include "pybuart.h"
 #include "utils.h"
+#include "irq.h"
 
 #ifdef USE_FREERTOS
 #include "FreeRTOS.h"
@@ -108,8 +109,8 @@ uint32_t HAL_GetTick(void) {
 }
 
 void HAL_Delay(uint32_t delay) {
-    // only if we are not within interrupt context
-    if ((HAL_NVIC_INT_CTRL_REG & HAL_VECTACTIVE_MASK) == 0) {
+    // only if we are not within interrupt context and interrupts are enabled
+    if ((HAL_NVIC_INT_CTRL_REG & HAL_VECTACTIVE_MASK) == 0 && query_irq() == IRQ_STATE_ENABLED) {
         #ifdef USE_FREERTOS
             vTaskDelay (delay / portTICK_PERIOD_MS);
         #else
@@ -121,8 +122,10 @@ void HAL_Delay(uint32_t delay) {
             }
         #endif
     } else {
-        for (int ms = 1; ms <= delay; ms++) {
-            UtilsDelay(UTILS_DELAY_US_TO_COUNT(ms * 1000));
+        for (int ms = 0; ms < delay; ms++) {
+            // 500 instead of 1000 us to compensate the overhead of the for loop
+            // and the function call
+            UtilsDelay(UTILS_DELAY_US_TO_COUNT(500));
         }
     }
 }
diff --git a/cc3200/misc/mpsystick.c b/cc3200/misc/mpsystick.c
@@ -28,7 +28,6 @@
 #include "py/mpconfig.h"
 #include MICROPY_HAL_H
 #include "py/obj.h"
-#include "irq.h"
 #include "mpsystick.h"
 #include "systick.h"
 #include "inc/hw_types.h"
diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c
@@ -38,6 +38,7 @@
 #include "mpexception.h"
 #include "serverstask.h"
 #include "genhdr/mpversion.h"
+#include "irq.h"
 
 /******************************************************************************
  DEFINE PRIVATE CONSTANTS
@@ -492,8 +493,8 @@ static void telnet_parse_input (uint8_t *str, int16_t *len) {
 
 static bool telnet_send_with_retries (int16_t sd, const void *pBuf, int16_t len) {
     int32_t retries = 0;
-    // abort sending if we happen to be within interrupt context
-    if ((HAL_NVIC_INT_CTRL_REG & HAL_VECTACTIVE_MASK) == 0) {
+    // only if we are not within interrupt context and interrupts are enabled
+    if ((HAL_NVIC_INT_CTRL_REG & HAL_VECTACTIVE_MASK) == 0 && query_irq() == IRQ_STATE_ENABLED) {
         do {
             _i16 result = sl_Send(sd, pBuf, len, 0);
             if (result > 0) {

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`#include "telnet.h"`
`47`	`47`	`#include "pybuart.h"`
`48`	`48`	`#include "utils.h"`
	`49`	`+#include "irq.h"`
`49`	`50`
`50`	`51`	`#ifdef USE_FREERTOS`
`51`	`52`	`#include "FreeRTOS.h"`
`@@ -108,8 +109,8 @@ uint32_t HAL_GetTick(void) {`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`void HAL_Delay(uint32_t delay) {`
`111`		`- // only if we are not within interrupt context`
`112`		`- if ((HAL_NVIC_INT_CTRL_REG & HAL_VECTACTIVE_MASK) == 0) {`
	`112`	`+ // only if we are not within interrupt context and interrupts are enabled`
	`113`	`+ if ((HAL_NVIC_INT_CTRL_REG & HAL_VECTACTIVE_MASK) == 0 && query_irq() == IRQ_STATE_ENABLED) {`
`113`	`114`	`#ifdef USE_FREERTOS`
`114`	`115`	`vTaskDelay (delay / portTICK_PERIOD_MS);`
`115`	`116`	`#else`
`@@ -121,8 +122,10 @@ void HAL_Delay(uint32_t delay) {`
`121`	`122`	`}`
`122`	`123`	`#endif`
`123`	`124`	`} else {`
`124`		`- for (int ms = 1; ms <= delay; ms++) {`
`125`		`- UtilsDelay(UTILS_DELAY_US_TO_COUNT(ms * 1000));`
	`125`	`+ for (int ms = 0; ms < delay; ms++) {`
	`126`	`+ // 500 instead of 1000 us to compensate the overhead of the for loop`
	`127`	`+ // and the function call`
	`128`	`+ UtilsDelay(UTILS_DELAY_US_TO_COUNT(500));`
`126`	`129`	`}`
`127`	`130`	`}`
`128`	`131`	`}`