aboutsummaryrefslogtreecommitdiff
path: root/cc3200
diff options
context:
space:
mode:
authordanicampora2015-02-14 18:52:07 +0100
committerdanicampora2015-02-20 16:40:15 +0100
commit2b899b6708470a9e2473eb4cf9120c64519fb4ef (patch)
treed5cf5aad5f2642747acf304c35b13273aa9d1ca3 /cc3200
parent6ff9a47255e301480a29df8f0082d792f73a62a3 (diff)
cc3200: Remove asserts from sl_Stop() and reduce timeout to 250ms.
Diffstat (limited to 'cc3200')
-rw-r--r--cc3200/bootmgr/main.c2
-rw-r--r--cc3200/mods/modwlan.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/cc3200/bootmgr/main.c b/cc3200/bootmgr/main.c
index ee8a32d34..7929f1648 100644
--- a/cc3200/bootmgr/main.c
+++ b/cc3200/bootmgr/main.c
@@ -53,7 +53,7 @@
//*****************************************************************************
// Local Constants
//*****************************************************************************
-#define SL_STOP_TIMEOUT 500
+#define SL_STOP_TIMEOUT 250
#define BOOTMGR_HASH_ALGO SHAMD5_ALGO_MD5
#define BOOTMGR_HASH_SIZE 32
#define BOOTMGR_BUFF_SIZE 512
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
index 4a1920568..013437a04 100644
--- a/cc3200/mods/modwlan.c
+++ b/cc3200/mods/modwlan.c
@@ -130,7 +130,7 @@ typedef struct _wlan_obj_t {
#define ASSERT_ON_ERROR( x ) ASSERT((x) >= 0 )
#define IPV4_ADDR_STR_LEN_MAX (16)
-#define SL_STOP_TIMEOUT 500
+#define SL_STOP_TIMEOUT 250
#define WLAN_MAX_RX_SIZE 16000
@@ -501,7 +501,7 @@ void wlan_sl_disable (void) {
xSemaphoreTake (xWlanSemaphore, portMAX_DELAY);
#endif
wlan_obj.mode = -1;
- ASSERT_ON_ERROR (sl_Stop(SL_STOP_TIMEOUT));
+ sl_Stop(SL_STOP_TIMEOUT);
}
}
@@ -551,7 +551,7 @@ STATIC void wlan_reenable (SlWlanMode_t mode) {
#ifdef USE_FREERTOS
xSemaphoreTake (xWlanSemaphore, portMAX_DELAY);
#endif
- ASSERT_ON_ERROR(sl_Stop(SL_STOP_TIMEOUT));
+ sl_Stop(SL_STOP_TIMEOUT);
wlan_obj.mode = sl_Start(0, 0, 0);
#ifdef USE_FREERTOS
xSemaphoreGive (xWlanSemaphore);