From 78c8876dba7ec1bdd60596ba717bc751fff6f149 Mon Sep 17 00:00:00 2001
From: mculover666 <2412828003@qq.com>
Date: Tue, 11 Aug 2020 19:30:18 +0800
Subject: [PATCH] improve esp8266 driver for multi module support

---
 devices/esp8266/esp8266.c | 18 +++++++++---------
 devices/esp8266/esp8266.h | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/devices/esp8266/esp8266.c b/devices/esp8266/esp8266.c
index cd1becde..cd3df29f 100644
--- a/devices/esp8266/esp8266.c
+++ b/devices/esp8266/esp8266.c
@@ -42,13 +42,13 @@ static int esp8266_net_mode_set(esp8266_net_mode_t mode)
     at_echo_t echo;
 
     switch (mode) {
-        case SAL_NET_MODE_STA:
+        case ESP8266_NET_MODE_STA:
             cmd = "AT+CWMODE=1\r\n";
             break;
-        case SAL_NET_MODE_AP:
+        case ESP8266_NET_MODE_AP:
             cmd = "AT+CWMODE=2\r\n";
             break;
-        case SAL_NET_MODE_STA_AP:
+        case ESP8266_NET_MODE_STA_AP:
             cmd = "AT+CWMODE=3\r\n";
             break;
         default:
@@ -72,7 +72,7 @@ static int esp8266_send_mode_set(esp8266_send_mode_t mode)
 
     tos_at_echo_create(&echo, NULL, 0, NULL);
     while (try++ < 10) {
-        tos_at_cmd_exec(&echo, 1000, "AT+CIPMODE=%d\r\n", mode == SAL_SEND_MODE_NORMAL ? 0 : 1);
+        tos_at_cmd_exec(&echo, 1000, "AT+CIPMODE=%d\r\n", mode == ESP8266_SEND_MODE_NORMAL ? 0 : 1);
         if (echo.status == AT_ECHO_STATUS_OK) {
             return 0;
         }
@@ -87,7 +87,7 @@ static int esp8266_multilink_set(esp8266_multilink_state_t state)
 
     tos_at_echo_create(&echo, NULL, 0, "link is builded");
     while (try++ < 10) {
-        tos_at_cmd_exec(&echo, 500, "AT+CIPMUX=%d\r\n", state == SAL_MULTILINK_STATE_ENABLE ? 1 : 0);
+        tos_at_cmd_exec(&echo, 500, "AT+CIPMUX=%d\r\n", state == ESP8266_MULTILINK_STATE_ENABLE ? 1 : 0);
         if (echo.status == AT_ECHO_STATUS_OK || echo.status == AT_ECHO_STATUS_EXPECT) {
             return 0;
         }
@@ -127,7 +127,7 @@ static int esp8266_reconnect_init(void)
         return -1;
     }
 #else
-    if (esp8266_multilink_set(SAL_MULTILINK_STATE_ENABLE) != 0) {
+    if (esp8266_multilink_set(ESP8266_MULTILINK_STATE_ENABLE) != 0) {
         printf("esp8266 multilink set FAILED\n");
         return -1;
     }
@@ -363,12 +363,12 @@ static int esp8266_init(void)
         return -1;
     }
 
-    if (esp8266_net_mode_set(SAL_NET_MODE_STA) != 0) {
+    if (esp8266_net_mode_set(ESP8266_NET_MODE_STA) != 0) {
         printf("esp8266 net mode set FAILED\n");
         return -1;
     }
 
-    if (esp8266_send_mode_set(SAL_SEND_MODE_NORMAL) != 0) {
+    if (esp8266_send_mode_set(ESP8266_SEND_MODE_NORMAL) != 0) {
         printf("esp8266 send mode set FAILED\n");
         return -1;
     }
@@ -379,7 +379,7 @@ static int esp8266_init(void)
         return -1;
     }
 #else
-    if (esp8266_multilink_set(SAL_MULTILINK_STATE_ENABLE) != 0) {
+    if (esp8266_multilink_set(ESP8266_MULTILINK_STATE_ENABLE) != 0) {
         printf("esp8266 multilink set FAILED\n");
         return -1;
     }
diff --git a/devices/esp8266/esp8266.h b/devices/esp8266/esp8266.h
index 3d76a089..c68d3aaa 100644
--- a/devices/esp8266/esp8266.h
+++ b/devices/esp8266/esp8266.h
@@ -21,19 +21,19 @@
 #include "tos_hal.h"
 
 typedef enum esp8266_net_mode {
-    SAL_NET_MODE_STA,
-    SAL_NET_MODE_AP,
-    SAL_NET_MODE_STA_AP,
+    ESP8266_NET_MODE_STA,
+    ESP8266_NET_MODE_AP,
+    ESP8266_NET_MODE_STA_AP,
 } esp8266_net_mode_t ;
 
 typedef enum esp8266_send_mode {
-    SAL_SEND_MODE_NORMAL,
-    SAL_SEND_MODE_TRANSPARENT,
+    ESP8266_SEND_MODE_NORMAL,
+    ESP8266_SEND_MODE_TRANSPARENT,
 } esp8266_send_mode_t;
 
 typedef enum esp8266_multilink_state {
-    SAL_MULTILINK_STATE_ENABLE,
-    SAL_MULTILINK_STATE_DISABLE,
+    ESP8266_MULTILINK_STATE_ENABLE,
+    ESP8266_MULTILINK_STATE_DISABLE,
 } esp8266_multilink_state_t;
 
 int esp8266_sal_init(hal_uart_port_t uart_port);