cc3200: Remove asserts from sl_Stop() and reduce timeout to 250ms.

pull/1124/head^2
danicampora 2015-02-14 18:52:07 +01:00
rodzic 6ff9a47255
commit 2b899b6708
2 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -53,7 +53,7 @@
//***************************************************************************** //*****************************************************************************
// Local Constants // Local Constants
//***************************************************************************** //*****************************************************************************
#define SL_STOP_TIMEOUT 500 #define SL_STOP_TIMEOUT 250
#define BOOTMGR_HASH_ALGO SHAMD5_ALGO_MD5 #define BOOTMGR_HASH_ALGO SHAMD5_ALGO_MD5
#define BOOTMGR_HASH_SIZE 32 #define BOOTMGR_HASH_SIZE 32
#define BOOTMGR_BUFF_SIZE 512 #define BOOTMGR_BUFF_SIZE 512

Wyświetl plik

@ -130,7 +130,7 @@ typedef struct _wlan_obj_t {
#define ASSERT_ON_ERROR( x ) ASSERT((x) >= 0 ) #define ASSERT_ON_ERROR( x ) ASSERT((x) >= 0 )
#define IPV4_ADDR_STR_LEN_MAX (16) #define IPV4_ADDR_STR_LEN_MAX (16)
#define SL_STOP_TIMEOUT 500 #define SL_STOP_TIMEOUT 250
#define WLAN_MAX_RX_SIZE 16000 #define WLAN_MAX_RX_SIZE 16000
@ -501,7 +501,7 @@ void wlan_sl_disable (void) {
xSemaphoreTake (xWlanSemaphore, portMAX_DELAY); xSemaphoreTake (xWlanSemaphore, portMAX_DELAY);
#endif #endif
wlan_obj.mode = -1; 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 #ifdef USE_FREERTOS
xSemaphoreTake (xWlanSemaphore, portMAX_DELAY); xSemaphoreTake (xWlanSemaphore, portMAX_DELAY);
#endif #endif
ASSERT_ON_ERROR(sl_Stop(SL_STOP_TIMEOUT)); sl_Stop(SL_STOP_TIMEOUT);
wlan_obj.mode = sl_Start(0, 0, 0); wlan_obj.mode = sl_Start(0, 0, 0);
#ifdef USE_FREERTOS #ifdef USE_FREERTOS
xSemaphoreGive (xWlanSemaphore); xSemaphoreGive (xWlanSemaphore);