cc3200: Switch from HAL_Delay() to mp_hal_delay_ms().

pfalcon · pfalcon · commit f4decdc4a3ef · 2015-10-29T20:38:44.000+03:00
diff --git a/cc3200/fatfs/src/drivers/sd_diskio.c b/cc3200/fatfs/src/drivers/sd_diskio.c
@@ -187,7 +187,7 @@ static unsigned int CardSelect (DiskInfo_t *sDiskInfo) {
     }
 
     // Delay 250ms for the card to become ready
-    HAL_Delay (250);
+    mp_hal_delay_ms(250);
 
     return ulRet;
 }
diff --git a/cc3200/hal/cc3200_hal.c b/cc3200/hal/cc3200_hal.c
@@ -108,7 +108,7 @@ uint32_t HAL_GetTick(void) {
     return HAL_tickCount;
 }
 
-void HAL_Delay(uint32_t delay) {
+void mp_hal_delay_ms(uint32_t delay) {
     // 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
@@ -193,7 +193,7 @@ int mp_hal_stdin_rx_chr(void) {
                 }
             }
         }
-        HAL_Delay(1);
+        mp_hal_delay_ms(1);
     }
 }
 
diff --git a/cc3200/hal/cc3200_hal.h b/cc3200/hal/cc3200_hal.h
@@ -63,7 +63,7 @@ extern void HAL_SystemInit (void);
 extern void HAL_SystemDeInit (void);
 extern void HAL_IncrementTick(void);
 extern uint32_t HAL_GetTick(void);
-extern void HAL_Delay(uint32_t delay);
+extern void mp_hal_delay_ms(uint32_t delay);
 extern NORETURN void mp_hal_raise(int errno);
 extern void mp_hal_set_interrupt_char (int c);
 
diff --git a/cc3200/mods/modutime.c b/cc3200/mods/modutime.c
@@ -125,7 +125,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
     int32_t sleep_s = mp_obj_get_int(seconds_o);
     if (sleep_s > 0) {
-        HAL_Delay(sleep_s * 1000);
+        mp_hal_delay_ms(sleep_s * 1000);
     }
     return mp_const_none;
 }
@@ -134,7 +134,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);
 STATIC mp_obj_t time_sleep_ms (mp_obj_t ms_in) {
     mp_int_t ms = mp_obj_get_int(ms_in);
     if (ms > 0) {
-        HAL_Delay(ms);
+        mp_hal_delay_ms(ms);
     }
     return mp_const_none;
 }
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
@@ -691,7 +691,7 @@ STATIC void wlan_sl_disconnect (void) {
     // other return-codes
     if (0 == sl_WlanDisconnect()) {
         while (IS_CONNECTED(wlan_obj.status)) {
-            HAL_Delay(MODWLAN_CONNECTION_WAIT_MS);
+            mp_hal_delay_ms(MODWLAN_CONNECTION_WAIT_MS);
             wlan_update();
         }
     }
@@ -711,7 +711,7 @@ STATIC modwlan_Status_t wlan_do_connect (const char* ssid, uint32_t ssid_len, co
         // wait for the WLAN Event
         uint32_t waitForConnectionMs = 0;
         while (timeout && !IS_CONNECTED(wlan_obj.status)) {
-            HAL_Delay(MODWLAN_CONNECTION_WAIT_MS);
+            mp_hal_delay_ms(MODWLAN_CONNECTION_WAIT_MS);
             waitForConnectionMs += MODWLAN_CONNECTION_WAIT_MS;
             if (timeout > 0 && waitForConnectionMs > timeout) {
                 return MODWLAN_ERROR_TIMEOUT;
@@ -875,7 +875,7 @@ STATIC mp_obj_t wlan_scan(mp_obj_t self_in) {
     ASSERT_ON_ERROR(sl_WlanPolicySet(SL_POLICY_SCAN , MODWLAN_SL_SCAN_ENABLE, (_u8 *)&scanSeconds, sizeof(scanSeconds)));
 
     // wait for the scan to complete
-    HAL_Delay (MODWLAN_WAIT_FOR_SCAN_MS);
+    mp_hal_delay_ms(MODWLAN_WAIT_FOR_SCAN_MS);
 
     do {
         if (sl_WlanGetNetworkList(_index++, 1, &wlanEntry) <= 0) {
diff --git a/cc3200/mods/pybsleep.c b/cc3200/mods/pybsleep.c
@@ -247,7 +247,7 @@ void pyb_sleep_sleep (void) {
     if (pybsleep_data.rtc_obj->irq_enabled && (pybsleep_data.rtc_obj->pwrmode & PYB_PWR_MODE_LPDS)) {
         if (!setup_timer_lpds_wake()) {
             // lpds entering is not possible, wait for the forced interrupt and return
-            HAL_Delay (FAILED_SLEEP_DELAY_MS);
+            mp_hal_delay_ms(FAILED_SLEEP_DELAY_MS);
             return;
         }
     } else {
@@ -280,7 +280,7 @@ void pyb_sleep_deepsleep (void) {
     if (pybsleep_data.rtc_obj->irq_enabled && (pybsleep_data.rtc_obj->pwrmode & PYB_PWR_MODE_HIBERNATE)) {
         if (!setup_timer_hibernate_wake()) {
             // hibernating is not possible, wait for the forced interrupt and return
-            HAL_Delay (FAILED_SLEEP_DELAY_MS);
+            mp_hal_delay_ms(FAILED_SLEEP_DELAY_MS);
             return;
         }
     } else {
diff --git a/cc3200/mptask.c b/cc3200/mptask.c
@@ -236,7 +236,7 @@ void TASK_Micropython (void *pvParameters) {
     modusocket_close_all_user_sockets();
 
     // wait for pending transactions to complete
-    HAL_Delay(20);
+    mp_hal_delay_ms(20);
 
     goto soft_reset;
 }
diff --git a/cc3200/serverstask.c b/cc3200/serverstask.c
@@ -131,21 +131,21 @@ void TASK_Servers (void *pvParameters) {
 
         // move to the next cycle
         cycle = cycle ? false : true;
-        HAL_Delay(SERVERS_CYCLE_TIME_MS);
+        mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS);
     }
 }
 
 void servers_start (void) {
     servers_data.do_enable = true;
-    HAL_Delay (SERVERS_CYCLE_TIME_MS * 3);
+    mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS * 3);
 }
 
 void servers_stop (void) {
     servers_data.do_disable = true;
     do {
-        HAL_Delay (SERVERS_CYCLE_TIME_MS);
+        mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS);
     } while (servers_are_enabled());
-    HAL_Delay (SERVERS_CYCLE_TIME_MS * 3);
+    mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS * 3);
 }
 
 void servers_reset (void) {
@@ -158,7 +158,7 @@ bool servers_are_enabled (void) {
 
 void server_sleep_sockets (void) {
     sleep_sockets = true;
-    HAL_Delay (SERVERS_CYCLE_TIME_MS + 1);
+    mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS + 1);
 }
 
 void servers_close_socket (int16_t *sd) {
diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c
@@ -477,7 +477,7 @@ static bool telnet_send_with_retries (int16_t sd, const void *pBuf, int16_t len)
                 return false;
             }
             // start with the default delay and increment it on each retry
-            HAL_Delay (delay++);
+            mp_hal_delay_ms(delay++);
         } while (++retries <= TELNET_TX_RETRIES_MAX);
     }
     return false;

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ static unsigned int CardSelect (DiskInfo_t *sDiskInfo) {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`// Delay 250ms for the card to become ready`
`190`		`- HAL_Delay (250);`
	`190`	`+ mp_hal_delay_ms(250);`
`191`	`191`
`192`	`192`	`return ulRet;`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ uint32_t HAL_GetTick(void) {`
`108`	`108`	`return HAL_tickCount;`
`109`	`109`	`}`
`110`	`110`
`111`		`-void HAL_Delay(uint32_t delay) {`
	`111`	`+void mp_hal_delay_ms(uint32_t delay) {`
`112`	`112`	`// only if we are not within interrupt context and interrupts are enabled`
`113`	`113`	`if ((HAL_NVIC_INT_CTRL_REG & HAL_VECTACTIVE_MASK) == 0 && query_irq() == IRQ_STATE_ENABLED) {`
`114`	`114`	`#ifdef USE_FREERTOS`
`@@ -193,7 +193,7 @@ int mp_hal_stdin_rx_chr(void) {`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`}`
`196`		`- HAL_Delay(1);`
	`196`	`+ mp_hal_delay_ms(1);`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);`
`125`	`125`	`STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {`
`126`	`126`	`int32_t sleep_s = mp_obj_get_int(seconds_o);`
`127`	`127`	`if (sleep_s > 0) {`
`128`		`- HAL_Delay(sleep_s * 1000);`
	`128`	`+ mp_hal_delay_ms(sleep_s * 1000);`
`129`	`129`	`}`
`130`	`130`	`return mp_const_none;`
`131`	`131`	`}`
`@@ -134,7 +134,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);`
`134`	`134`	`STATIC mp_obj_t time_sleep_ms (mp_obj_t ms_in) {`
`135`	`135`	`mp_int_t ms = mp_obj_get_int(ms_in);`
`136`	`136`	`if (ms > 0) {`
`137`		`- HAL_Delay(ms);`
	`137`	`+ mp_hal_delay_ms(ms);`
`138`	`138`	`}`
`139`	`139`	`return mp_const_none;`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ void TASK_Micropython (void *pvParameters) {`
`236`	`236`	`modusocket_close_all_user_sockets();`
`237`	`237`
`238`	`238`	`// wait for pending transactions to complete`
`239`		`- HAL_Delay(20);`
	`239`	`+ mp_hal_delay_ms(20);`
`240`	`240`
`241`	`241`	`goto soft_reset;`
`242`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,21 +131,21 @@ void TASK_Servers (void *pvParameters) {`
`131`	`131`
`132`	`132`	`// move to the next cycle`
`133`	`133`	`cycle = cycle ? false : true;`
`134`		`- HAL_Delay(SERVERS_CYCLE_TIME_MS);`
	`134`	`+ mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`void servers_start (void) {`
`139`	`139`	`servers_data.do_enable = true;`
`140`		`- HAL_Delay (SERVERS_CYCLE_TIME_MS * 3);`
	`140`	`+ mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS * 3);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`void servers_stop (void) {`
`144`	`144`	`servers_data.do_disable = true;`
`145`	`145`	`do {`
`146`		`- HAL_Delay (SERVERS_CYCLE_TIME_MS);`
	`146`	`+ mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS);`
`147`	`147`	`} while (servers_are_enabled());`
`148`		`- HAL_Delay (SERVERS_CYCLE_TIME_MS * 3);`
	`148`	`+ mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS * 3);`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`void servers_reset (void) {`
`@@ -158,7 +158,7 @@ bool servers_are_enabled (void) {`
`158`	`158`
`159`	`159`	`void server_sleep_sockets (void) {`
`160`	`160`	`sleep_sockets = true;`
`161`		`- HAL_Delay (SERVERS_CYCLE_TIME_MS + 1);`
	`161`	`+ mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS + 1);`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`void servers_close_socket (int16_t *sd) {`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ static bool telnet_send_with_retries (int16_t sd, const void *pBuf, int16_t len)`
`477`	`477`	`return false;`
`478`	`478`	`}`
`479`	`479`	`// start with the default delay and increment it on each retry`
`480`		`- HAL_Delay (delay++);`
	`480`	`+ mp_hal_delay_ms(delay++);`
`481`	`481`	`} while (++retries <= TELNET_TX_RETRIES_MAX);`
`482`	`482`	`}`
`483`	`483`	`return false;`