|
|
@@ -26,7 +26,7 @@
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
-#define LOG_TAG "at.dev.m5311"
|
|
|
+#define LOG_TAG "at.dev.m5311"
|
|
|
#include <at_log.h>
|
|
|
|
|
|
#ifdef AT_DEVICE_USING_M5311
|
|
|
@@ -40,11 +40,11 @@
|
|
|
*/
|
|
|
static void m5311_power_on(struct at_device *device)
|
|
|
{
|
|
|
- struct at_device_m5311 *m5311 = RT_NULL;
|
|
|
- m5311 = (struct at_device_m5311 *) device->user_data;
|
|
|
+ struct at_device_m5311 *m5311 = RT_NULL;
|
|
|
+ m5311 = (struct at_device_m5311 *) device->user_data;
|
|
|
|
|
|
if (m5311->power_pin == -1)
|
|
|
- {
|
|
|
+ {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -59,7 +59,7 @@ static void m5311_power_off(struct at_device *device)
|
|
|
m5311 = (struct at_device_m5311 *) device->user_data;
|
|
|
/* not nead to set pin configuration for M5311 device power on */
|
|
|
if (m5311->power_pin == -1)
|
|
|
- {
|
|
|
+ {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -89,20 +89,20 @@ static int m5311_netdev_set_info(struct netdev *netdev)
|
|
|
|
|
|
device = at_device_get_by_name(AT_DEVICE_NAMETYPE_NETDEV, netdev->name);
|
|
|
if (device == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("get device(%s) failed.", netdev->name);
|
|
|
return -RT_ERROR;
|
|
|
}
|
|
|
client = device->client;
|
|
|
|
|
|
/* set network interface device up status */
|
|
|
- netdev_low_level_set_status(netdev, RT_TRUE);
|
|
|
+ netdev_low_level_set_status(netdev, RT_TRUE);
|
|
|
netdev_low_level_set_link_status(netdev, RT_TRUE);
|
|
|
- netdev_low_level_set_dhcp_status(netdev, RT_TRUE);
|
|
|
-
|
|
|
+ netdev_low_level_set_dhcp_status(netdev, RT_TRUE);
|
|
|
+
|
|
|
resp = at_create_resp(M5311_IMEI_RESP_SIZE, 0, M5311_INFO_RESP_TIMO);
|
|
|
if (resp == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("no memory for resp create <m5311 module>.");
|
|
|
result = -RT_ENOMEM;
|
|
|
goto __exit;
|
|
|
@@ -118,13 +118,13 @@ static int m5311_netdev_set_info(struct netdev *netdev)
|
|
|
|
|
|
/* send "AT+GSN" commond to get device IMEI */
|
|
|
if (at_obj_exec_cmd(client, resp, "AT+GSN") < 0)
|
|
|
- {
|
|
|
+ {
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
}
|
|
|
|
|
|
if (at_resp_parse_line_args(resp, 2, "%s", imei) <= 0)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("%s device prase \"AT+GSN\" cmd error.", device->name);
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
@@ -135,13 +135,13 @@ static int m5311_netdev_set_info(struct netdev *netdev)
|
|
|
netdev->hwaddr_len = M5311_NETDEV_HWADDR_LEN;
|
|
|
/* get hardware address by IMEI */
|
|
|
for (i = 0, j = 0; i < M5311_NETDEV_HWADDR_LEN && j < M5311_IMEI_LEN; i++, j+=2)
|
|
|
- {
|
|
|
+ {
|
|
|
if (j != M5311_IMEI_LEN - 1)
|
|
|
- {
|
|
|
+ {
|
|
|
netdev->hwaddr[i] = (imei[j] - '0') * 10 + (imei[j + 1] - '0');
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
+ else
|
|
|
+ {
|
|
|
netdev->hwaddr[i] = (imei[j] - '0');
|
|
|
}
|
|
|
}
|
|
|
@@ -156,16 +156,16 @@ static int m5311_netdev_set_info(struct netdev *netdev)
|
|
|
|
|
|
/* send "AT+CGPADDR=1" commond to get IP address */
|
|
|
if (at_obj_exec_cmd(device->client, resp, "AT+CGPADDR=1") != RT_EOK)
|
|
|
- {
|
|
|
- result = -RT_ERROR;
|
|
|
- goto __exit;
|
|
|
+ {
|
|
|
+ result = -RT_ERROR;
|
|
|
+ goto __exit;
|
|
|
}
|
|
|
/* 解析响应的数据
|
|
|
* parse response data "+CGPADDR: 1,<IP_address>"
|
|
|
- * eg: +CGPADDR: 1,"100.66.19.177"
|
|
|
+ * eg: +CGPADDR: 1,"100.66.19.177"
|
|
|
* */
|
|
|
if (at_resp_parse_line_args_by_kw(resp, "+CGPADDR:", "+CGPADDR: %*d,%s", ipaddr) <= 0)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("%s device run \"AT+CGPADDR=1\" cmd error.", device->name);
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
@@ -180,7 +180,7 @@ static int m5311_netdev_set_info(struct netdev *netdev)
|
|
|
}
|
|
|
|
|
|
/* set network interface device dns server
|
|
|
- *
|
|
|
+ *
|
|
|
* */
|
|
|
{
|
|
|
#define DNS_ADDR_SIZE_MAX 16
|
|
|
@@ -190,7 +190,7 @@ static int m5311_netdev_set_info(struct netdev *netdev)
|
|
|
|
|
|
/* send "AT+QIDNSCFG?" commond to get DNS servers address */
|
|
|
if (at_obj_exec_cmd(client, resp, "AT+DNSSER?") < 0)
|
|
|
- {
|
|
|
+ {
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
}
|
|
|
@@ -215,7 +215,7 @@ static int m5311_netdev_set_info(struct netdev *netdev)
|
|
|
|
|
|
__exit:
|
|
|
if (resp)
|
|
|
- {
|
|
|
+ {
|
|
|
at_delete_resp(resp);
|
|
|
}
|
|
|
return result;
|
|
|
@@ -240,23 +240,23 @@ static void check_link_status_entry(void *parameter)
|
|
|
|
|
|
device = at_device_get_by_name(AT_DEVICE_NAMETYPE_NETDEV, netdev->name);
|
|
|
if (device == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("get device(%s) failed.", netdev->name);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
resp = at_create_resp(M5311_LINK_RESP_SIZE, 0, M5311_LINK_RESP_TIMO);
|
|
|
if (resp == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("no memory for resp create.");
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- while (1)
|
|
|
- {
|
|
|
+ while (1)
|
|
|
+ {
|
|
|
/* send "AT+CGATT" commond to check netweork interface device link status */
|
|
|
if (at_obj_exec_cmd(device->client, resp, "AT+CGATT?") < 0)
|
|
|
- {
|
|
|
+ {
|
|
|
rt_thread_mdelay(M5311_LINK_DELAY_TIME);
|
|
|
continue;
|
|
|
}
|
|
|
@@ -266,7 +266,7 @@ static void check_link_status_entry(void *parameter)
|
|
|
|
|
|
/* check the network interface device link status */
|
|
|
if ((M5311_LINK_STATUS_OK == link_status) != netdev_is_link_up(netdev))
|
|
|
- {
|
|
|
+ {
|
|
|
netdev_low_level_set_link_status(netdev, (M5311_LINK_STATUS_OK == link_status));
|
|
|
}
|
|
|
rt_thread_mdelay(M5311_LINK_DELAY_TIME);
|
|
|
@@ -287,13 +287,13 @@ static int m5311_netdev_check_link_status(struct netdev *netdev)
|
|
|
rt_snprintf(tname, RT_NAME_MAX, "%s", netdev->name);
|
|
|
|
|
|
tid = rt_thread_create( tname,
|
|
|
- check_link_status_entry,
|
|
|
- (void *)netdev,
|
|
|
- M5311_LINK_THREAD_STACK_SIZE,
|
|
|
- M5311_LINK_THREAD_PRIORITY,
|
|
|
- M5311_LINK_THREAD_TICK );
|
|
|
+ check_link_status_entry,
|
|
|
+ (void *)netdev,
|
|
|
+ M5311_LINK_THREAD_STACK_SIZE,
|
|
|
+ M5311_LINK_THREAD_PRIORITY,
|
|
|
+ M5311_LINK_THREAD_TICK );
|
|
|
if (tid)
|
|
|
- {
|
|
|
+ {
|
|
|
rt_thread_startup(tid);
|
|
|
}
|
|
|
return RT_EOK;
|
|
|
@@ -307,13 +307,13 @@ static int m5311_netdev_set_up(struct netdev *netdev)
|
|
|
|
|
|
device = at_device_get_by_name(AT_DEVICE_NAMETYPE_NETDEV, netdev->name);
|
|
|
if (device == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("get device(%s) failed.", netdev->name);
|
|
|
return -RT_ERROR;
|
|
|
}
|
|
|
|
|
|
if (device->is_init == RT_FALSE)
|
|
|
- {
|
|
|
+ {
|
|
|
m5311_net_init(device);
|
|
|
device->is_init = RT_TRUE;
|
|
|
|
|
|
@@ -350,8 +350,8 @@ static int m5311_netdev_set_down(struct netdev *netdev)
|
|
|
* */
|
|
|
static int m5311_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, ip_addr_t *dns_server)
|
|
|
{
|
|
|
-#define M5311_DNS_RESP_LEN 8
|
|
|
-#define M5311_DNS_RESP_TIMEO rt_tick_from_millisecond(300)
|
|
|
+#define M5311_DNS_RESP_LEN 8
|
|
|
+#define M5311_DNS_RESP_TIMEO rt_tick_from_millisecond(300)
|
|
|
|
|
|
int result = RT_EOK;
|
|
|
at_response_t resp = RT_NULL;
|
|
|
@@ -362,23 +362,23 @@ static int m5311_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, i
|
|
|
|
|
|
device = at_device_get_by_name(AT_DEVICE_NAMETYPE_NETDEV, netdev->name);
|
|
|
if (device == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("get device(%s) failed.", netdev->name);
|
|
|
return - RT_ERROR;
|
|
|
}
|
|
|
|
|
|
resp = at_create_resp(M5311_DNS_RESP_LEN, 0, M5311_DNS_RESP_TIMEO);
|
|
|
if (resp == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("no memory for resp create.");
|
|
|
return -RT_ENOMEM;
|
|
|
}
|
|
|
|
|
|
/* send "AT+DNSSER=<server_ip>[,<dns_id>[,<iptype>]]" commond to set dns servers
|
|
|
- * 设置DNS地址
|
|
|
+ * 设置DNS地址
|
|
|
* */
|
|
|
if (at_exec_cmd(resp, "AT+DNSSER=\"%s\",%d,0", inet_ntoa(*dns_server), dns_num) < 0)
|
|
|
- {
|
|
|
+ {
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
}
|
|
|
@@ -386,7 +386,7 @@ static int m5311_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, i
|
|
|
|
|
|
__exit:
|
|
|
if (resp)
|
|
|
- {
|
|
|
+ {
|
|
|
at_delete_resp(resp);
|
|
|
}
|
|
|
return result;
|
|
|
@@ -404,7 +404,7 @@ __exit:
|
|
|
*/
|
|
|
#ifdef NETDEV_USING_PING
|
|
|
static int m5311_netdev_ping(struct netdev *netdev, const char *host,
|
|
|
- size_t data_len, uint32_t timeout, struct netdev_ping_resp *ping_resp)
|
|
|
+ size_t data_len, uint32_t timeout, struct netdev_ping_resp *ping_resp)
|
|
|
{
|
|
|
#define M5311_PING_RESP_SIZE 256
|
|
|
#define M5311_PING_IP_SIZE 16
|
|
|
@@ -422,41 +422,41 @@ static int m5311_netdev_ping(struct netdev *netdev, const char *host,
|
|
|
|
|
|
device = at_device_get_by_name(AT_DEVICE_NAMETYPE_NETDEV, netdev->name);
|
|
|
if (device == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("get device(%s) failed.", netdev->name);
|
|
|
return - RT_ERROR;
|
|
|
}
|
|
|
|
|
|
resp = at_create_resp(M5311_PING_RESP_SIZE, 5, M5311_PING_TIMEO);
|
|
|
if (resp == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("no memory for resp create.");
|
|
|
return -RT_ENOMEM;
|
|
|
}
|
|
|
/* send "AT+PING=<remote addr>[,<p_size>[,<timeout>[,<p_count>[,<type>]]]]" commond to send ping request */
|
|
|
if (at_obj_exec_cmd(device->client, resp, "AT+PING=\"%s\",64,5000,1", host) < 0)
|
|
|
- {
|
|
|
+ {
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
}
|
|
|
|
|
|
if (at_resp_parse_line_args_by_kw(resp, "+PING:","+PING: %d", &response) <= 0)
|
|
|
- {
|
|
|
- if (at_resp_parse_line_args_by_kw(resp, "+PINGERR:", "+PINGERR: %d", &response) <= 0){
|
|
|
+ {
|
|
|
+ if (at_resp_parse_line_args_by_kw(resp, "+PINGERR:", "+PINGERR: %d", &response) <= 0){
|
|
|
|
|
|
- LOG_D("PING timeout");
|
|
|
- }
|
|
|
+ LOG_D("PING timeout");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/* Received the ping response from the server */
|
|
|
if (response == 0)
|
|
|
{
|
|
|
if (at_resp_parse_line_args_by_kw(resp, "+PING:", "+PING: %s,%d,%d",
|
|
|
- ip_addr,
|
|
|
- &ttl,
|
|
|
- &time) <= 0)
|
|
|
+ ip_addr,
|
|
|
+ &ttl,
|
|
|
+ &time) <= 0)
|
|
|
{
|
|
|
- rt_thread_mdelay(500);
|
|
|
+ rt_thread_mdelay(500);
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
}
|
|
|
@@ -464,25 +464,25 @@ static int m5311_netdev_ping(struct netdev *netdev, const char *host,
|
|
|
|
|
|
/* prase response number */
|
|
|
switch (response)
|
|
|
- {
|
|
|
- case 0:
|
|
|
- inet_aton(ip_addr, &(ping_resp->ip_addr));
|
|
|
- ping_resp->data_len = data_len;
|
|
|
- ping_resp->ticks = time;
|
|
|
- ping_resp->ttl = ttl;
|
|
|
- result = RT_EOK;
|
|
|
- break;
|
|
|
- case 1:
|
|
|
- result = -RT_ETIMEOUT;
|
|
|
- break;
|
|
|
- default:
|
|
|
- result = -RT_ERROR;
|
|
|
- break;
|
|
|
+ {
|
|
|
+ case 0:
|
|
|
+ inet_aton(ip_addr, &(ping_resp->ip_addr));
|
|
|
+ ping_resp->data_len = data_len;
|
|
|
+ ping_resp->ticks = time;
|
|
|
+ ping_resp->ttl = ttl;
|
|
|
+ result = RT_EOK;
|
|
|
+ break;
|
|
|
+ case 1:
|
|
|
+ result = -RT_ETIMEOUT;
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ result = -RT_ERROR;
|
|
|
+ break;
|
|
|
}
|
|
|
|
|
|
__exit:
|
|
|
if (resp)
|
|
|
- {
|
|
|
+ {
|
|
|
at_delete_resp(resp);
|
|
|
}
|
|
|
|
|
|
@@ -515,7 +515,7 @@ static struct netdev *m5311_netdev_add(const char *netdev_name)
|
|
|
|
|
|
netdev = (struct netdev *) rt_calloc(1, sizeof(struct netdev));
|
|
|
if (netdev == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("no memory for netdev ceate(m5311).");
|
|
|
return RT_NULL;
|
|
|
}
|
|
|
@@ -538,23 +538,23 @@ static struct netdev *m5311_netdev_add(const char *netdev_name)
|
|
|
*
|
|
|
*/
|
|
|
|
|
|
-#define AT_SEND_CMD(client, resp, resp_line, timeout, cmd) \
|
|
|
- do { \
|
|
|
- (resp) = at_resp_set_info((resp), 128, (resp_line), rt_tick_from_millisecond(timeout)); \
|
|
|
- if (at_obj_exec_cmd((client),(resp), (cmd)) < 0) { \
|
|
|
- result = -RT_ERROR; \
|
|
|
- goto __exit; \
|
|
|
- } \
|
|
|
- } while(0); \
|
|
|
+#define AT_SEND_CMD(client, resp, resp_line, timeout, cmd) \
|
|
|
+ do { \
|
|
|
+ (resp) = at_resp_set_info((resp), 128, (resp_line), rt_tick_from_millisecond(timeout)); \
|
|
|
+ if (at_obj_exec_cmd((client),(resp), (cmd)) < 0) { \
|
|
|
+ result = -RT_ERROR; \
|
|
|
+ goto __exit; \
|
|
|
+ } \
|
|
|
+ } while(0); \
|
|
|
|
|
|
|
|
|
/* initialize for m5311 */
|
|
|
static void m5311_init_thread_entry(void *parameter)
|
|
|
{
|
|
|
-#define INIT_RETRY 5 //初始化尝试次数
|
|
|
-#define CPIN_RETRY 5 //设备插卡检测尝试次数
|
|
|
-#define CSQ_RETRY 10 //信号强度
|
|
|
-#define CREG_RETRY 10 //网络注册状态查询
|
|
|
+#define INIT_RETRY 5 //初始化尝试次数
|
|
|
+#define CPIN_RETRY 5 //设备插卡检测尝试次数
|
|
|
+#define CSQ_RETRY 10 //信号强度
|
|
|
+#define CREG_RETRY 10 //网络注册状态查询
|
|
|
|
|
|
at_response_t resp = RT_NULL;
|
|
|
int i;
|
|
|
@@ -566,7 +566,7 @@ static void m5311_init_thread_entry(void *parameter)
|
|
|
|
|
|
resp = at_create_resp(128, 0, rt_tick_from_millisecond(300));
|
|
|
if (resp == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("no memory for resp create(m5311).");
|
|
|
return;
|
|
|
}
|
|
|
@@ -574,14 +574,14 @@ static void m5311_init_thread_entry(void *parameter)
|
|
|
LOG_D("start init m5311 device(%s)", device->name);
|
|
|
|
|
|
while (retry_num--)
|
|
|
- {
|
|
|
+ {
|
|
|
/* power on the m5311 device */
|
|
|
m5311_power_on(device);
|
|
|
rt_thread_mdelay(1000);
|
|
|
|
|
|
/* wait m5311 startup finish */
|
|
|
if (at_client_obj_wait_connect(client, M5311_WAIT_CONNECT_TIME))
|
|
|
- {
|
|
|
+ {
|
|
|
result = -RT_ETIMEOUT;
|
|
|
goto __exit;
|
|
|
}
|
|
|
@@ -589,32 +589,32 @@ static void m5311_init_thread_entry(void *parameter)
|
|
|
/* disable echo */
|
|
|
AT_SEND_CMD(client, resp, 0, 300, "ATE0");
|
|
|
/* get module version */
|
|
|
- AT_SEND_CMD(client, resp, 0, 300, "ATI"); //输出设备信号信息
|
|
|
+ AT_SEND_CMD(client, resp, 0, 300, "ATI");
|
|
|
/* LED Status reg:slow, not reg:fast
|
|
|
* AT+CMSYSCTRL=<op>,<mode>[,<nonreg_h>,<reg_h>,<nonreg_l>,<reg_l>]
|
|
|
- * */
|
|
|
+ * */
|
|
|
AT_SEND_CMD(client, resp, 0, 300, "AT+CMSYSCTRL=0,2,50,80,50,700");
|
|
|
- /* Turn off sleep */
|
|
|
+ /* Turn off sleep */
|
|
|
AT_SEND_CMD(client,resp,0,300,"AT+SM=LOCK");
|
|
|
/* show module version */
|
|
|
for (i = 0; i < (int) resp->line_counts - 1; i++)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_D("%s", at_resp_get_line(resp, i + 1));
|
|
|
}
|
|
|
/* check SIM card */
|
|
|
for (i = 0; i < CPIN_RETRY; i++)
|
|
|
- {
|
|
|
- AT_SEND_CMD(client, resp, 2, 5 * RT_TICK_PER_SECOND, "AT+CPIN?"); //SIM卡插入状态
|
|
|
+ {
|
|
|
+ AT_SEND_CMD(client, resp, 2, 5 * RT_TICK_PER_SECOND, "AT+CPIN?");
|
|
|
|
|
|
if (at_resp_get_line_by_kw(resp, "READY"))
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_D("%s device SIM card detection success.", device->name);
|
|
|
break;
|
|
|
}
|
|
|
rt_thread_mdelay(1000);
|
|
|
}
|
|
|
if (i == CPIN_RETRY)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("SIM card detection failed!");
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
@@ -623,11 +623,11 @@ static void m5311_init_thread_entry(void *parameter)
|
|
|
rt_thread_mdelay(10);
|
|
|
/* check signal strength */
|
|
|
for (i = 0; i < CSQ_RETRY; i++)
|
|
|
- {
|
|
|
+ {
|
|
|
AT_SEND_CMD(client, resp, 0, 300, "AT+CSQ");
|
|
|
at_resp_parse_line_args_by_kw(resp, "+CSQ:", "+CSQ: %s", &parsed_data);
|
|
|
if (rt_strncmp(parsed_data, "99,99", sizeof(parsed_data)))
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_D("%s device signal strength: %s", device->name, parsed_data);
|
|
|
break;
|
|
|
}
|
|
|
@@ -635,28 +635,27 @@ static void m5311_init_thread_entry(void *parameter)
|
|
|
}
|
|
|
|
|
|
if (i == CSQ_RETRY)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("%s device signal strength check failed(%s).", device->name, parsed_data);
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
}
|
|
|
/* check the network is registered */
|
|
|
for (i = 0; i < CREG_RETRY; i++)
|
|
|
- {
|
|
|
+ {
|
|
|
AT_SEND_CMD(client, resp, 0, 300, "AT+CREG?");
|
|
|
at_resp_parse_line_args_by_kw(resp, "+CREG:", "+CREG: %s", &parsed_data);
|
|
|
if (!rt_strncmp(parsed_data, "0,1", sizeof(parsed_data)) ||
|
|
|
!rt_strncmp(parsed_data, "0,5", sizeof(parsed_data)) ||
|
|
|
- !rt_strncmp(parsed_data, "0,6", sizeof(parsed_data)))
|
|
|
+ !rt_strncmp(parsed_data, "0,6", sizeof(parsed_data)))
|
|
|
{
|
|
|
- /* 网络注册失败 */
|
|
|
LOG_D("%s device Network is registered(%s).", device->name, parsed_data);
|
|
|
break;
|
|
|
}
|
|
|
rt_thread_mdelay(1000);
|
|
|
}
|
|
|
if (i == CREG_RETRY)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("%s device Network is register failed(%s)", device->name, parsed_data);
|
|
|
result = -RT_ERROR;
|
|
|
goto __exit;
|
|
|
@@ -668,51 +667,49 @@ static void m5311_init_thread_entry(void *parameter)
|
|
|
|
|
|
__exit:
|
|
|
if (result != RT_EOK)
|
|
|
- {
|
|
|
+ {
|
|
|
/* power off the m5311 device */
|
|
|
m5311_power_off(device);
|
|
|
rt_thread_mdelay(1000);
|
|
|
|
|
|
LOG_I("%s device initialize retry...", device->name);
|
|
|
}
|
|
|
- } //while end
|
|
|
+ } //while end
|
|
|
|
|
|
if (resp)
|
|
|
at_delete_resp(resp);
|
|
|
|
|
|
if (result == RT_EOK)
|
|
|
- {
|
|
|
- m5311_netdev_set_info(device->netdev); //进入网卡设置
|
|
|
+ {
|
|
|
+ m5311_netdev_set_info(device->netdev);
|
|
|
/* check and create link staus sync thread */
|
|
|
if (rt_thread_find(device->netdev->name) == RT_NULL)
|
|
|
m5311_netdev_check_link_status(device->netdev);
|
|
|
|
|
|
LOG_I("%s device network initialize success(m5311).", device->name);
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
+ else
|
|
|
+ {
|
|
|
LOG_E("%s device network initialize failed(%d)(m5311).", device->name, result);
|
|
|
}
|
|
|
}
|
|
|
-/**
|
|
|
- * 模块网络初始化
|
|
|
- * */
|
|
|
+
|
|
|
static int m5311_net_init(struct at_device *device)
|
|
|
{
|
|
|
#ifdef AT_DEVICE_M5311_INIT_ASYN
|
|
|
rt_thread_t tid;
|
|
|
|
|
|
tid = rt_thread_create("m5311_net_init",
|
|
|
- m5311_init_thread_entry,
|
|
|
- (void *)device,
|
|
|
+ m5311_init_thread_entry,
|
|
|
+ (void *)device,
|
|
|
M5311_THREAD_STACK_SIZE,
|
|
|
- M5311_THREAD_PRIORITY, 20);
|
|
|
+ M5311_THREAD_PRIORITY, 20);
|
|
|
if (tid)
|
|
|
- {
|
|
|
+ {
|
|
|
rt_thread_startup(tid);
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
+ else
|
|
|
+ {
|
|
|
LOG_E("create %s device init thread failed.", device->name);
|
|
|
return -RT_ERROR;
|
|
|
}
|
|
|
@@ -722,9 +719,7 @@ static int m5311_net_init(struct at_device *device)
|
|
|
|
|
|
return RT_EOK;
|
|
|
}
|
|
|
-/**
|
|
|
- * 模块设备初始化
|
|
|
- * */
|
|
|
+
|
|
|
static int m5311_init(struct at_device *device)
|
|
|
{
|
|
|
struct at_device_m5311 *m5311 = (struct at_device_m5311 *) device->user_data;
|
|
|
@@ -734,7 +729,7 @@ static int m5311_init(struct at_device *device)
|
|
|
|
|
|
device->client = at_client_get(m5311->client_name);
|
|
|
if (device->client == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("get AT client(%s) failed.", m5311->client_name);
|
|
|
return -RT_ERROR;
|
|
|
}
|
|
|
@@ -746,14 +741,14 @@ static int m5311_init(struct at_device *device)
|
|
|
/* add m5311 netdev to the netdev list */
|
|
|
device->netdev = m5311_netdev_add(m5311->device_name);
|
|
|
if (device->netdev == RT_NULL)
|
|
|
- {
|
|
|
+ {
|
|
|
LOG_E("get netdev(%s) failed.", m5311->device_name);
|
|
|
return -RT_ERROR;
|
|
|
}
|
|
|
|
|
|
/* initialize m5311 pin configuration */
|
|
|
if (m5311->power_pin != -1 && m5311->power_status_pin != -1)
|
|
|
- {
|
|
|
+ {
|
|
|
rt_pin_mode(m5311->power_pin, PIN_MODE_OUTPUT);
|
|
|
rt_pin_mode(m5311->power_status_pin, PIN_MODE_INPUT);
|
|
|
}
|
|
|
@@ -774,22 +769,22 @@ static int m5311_control(struct at_device *device, int cmd, void *arg)
|
|
|
RT_ASSERT(device);
|
|
|
|
|
|
switch (cmd)
|
|
|
- {
|
|
|
- case AT_DEVICE_CTRL_POWER_ON:
|
|
|
- case AT_DEVICE_CTRL_POWER_OFF:
|
|
|
- case AT_DEVICE_CTRL_RESET:
|
|
|
- case AT_DEVICE_CTRL_LOW_POWER:
|
|
|
- case AT_DEVICE_CTRL_SLEEP:
|
|
|
- case AT_DEVICE_CTRL_WAKEUP:
|
|
|
- case AT_DEVICE_CTRL_NET_CONN:
|
|
|
- case AT_DEVICE_CTRL_NET_DISCONN:
|
|
|
- case AT_DEVICE_CTRL_GET_SIGNAL:
|
|
|
- case AT_DEVICE_CTRL_GET_VER:
|
|
|
- LOG_W("not support the control command(%d).", cmd);
|
|
|
- break;
|
|
|
- default:
|
|
|
- LOG_E("input error control command(%d).", cmd);
|
|
|
- break;
|
|
|
+ {
|
|
|
+ case AT_DEVICE_CTRL_POWER_ON:
|
|
|
+ case AT_DEVICE_CTRL_POWER_OFF:
|
|
|
+ case AT_DEVICE_CTRL_RESET:
|
|
|
+ case AT_DEVICE_CTRL_LOW_POWER:
|
|
|
+ case AT_DEVICE_CTRL_SLEEP:
|
|
|
+ case AT_DEVICE_CTRL_WAKEUP:
|
|
|
+ case AT_DEVICE_CTRL_NET_CONN:
|
|
|
+ case AT_DEVICE_CTRL_NET_DISCONN:
|
|
|
+ case AT_DEVICE_CTRL_GET_SIGNAL:
|
|
|
+ case AT_DEVICE_CTRL_GET_VER:
|
|
|
+ LOG_W("not support the control command(%d).", cmd);
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ LOG_E("input error control command(%d).", cmd);
|
|
|
+ break;
|
|
|
}
|
|
|
|
|
|
return result;
|
|
|
@@ -807,9 +802,9 @@ static int m5311_device_class_register(void)
|
|
|
|
|
|
class = (struct at_device_class *) rt_calloc(1, sizeof(struct at_device_class));
|
|
|
if (class == RT_NULL)
|
|
|
- {
|
|
|
- LOG_E("no memory for device class create.");
|
|
|
- return -RT_ENOMEM;
|
|
|
+ {
|
|
|
+ LOG_E("no memory for device class create.");
|
|
|
+ return -RT_ENOMEM;
|
|
|
}
|
|
|
|
|
|
/* fill m5311 device class object */
|