Ver código fonte

【删除】未实现函数删除

Signed-off-by: liuxianliang <liuxianliang@rt-thread.com>
liuxianliang 6 anos atrás
pai
commit
da8f29f7cf
2 arquivos alterados com 15 adições e 116 exclusões
  1. 7 59
      class/air720/ppp_device_air720.c
  2. 8 57
      class/m6312/ppp_device_m6312.c

+ 7 - 59
class/air720/ppp_device_air720.c

@@ -22,28 +22,14 @@
 
 
 static const struct modem_chat_data mcd[] =
 static const struct modem_chat_data mcd[] =
 {
 {
-    {"ATH",          MODEM_CHAT_RESP_OK,        30, 1},
-    {"AT",           MODEM_CHAT_RESP_OK,        10, 1},
-    {"ATE0",         MODEM_CHAT_RESP_OK,        1,  1},
-    {PPP_APN_CMD,    MODEM_CHAT_RESP_OK,        1,  5},
-    {PPP_DAIL_CMD,   MODEM_CHAT_RESP_CONNECT,   2, 30},
+    {"+++",          MODEM_CHAT_RESP_NOT_NEED,        30, 1, RT_FALSE},
+    {"ATH",          MODEM_CHAT_RESP_OK,              30, 1, RT_TRUE},
+    {"AT",           MODEM_CHAT_RESP_OK,              10, 1, RT_TRUE},
+    {"ATE0",         MODEM_CHAT_RESP_OK,              1,  1, RT_TRUE},
+    {PPP_APN_CMD,    MODEM_CHAT_RESP_OK,              1,  5, RT_TRUE},
+    {PPP_DAIL_CMD,   MODEM_CHAT_RESP_CONNECT,         2, 30, RT_TRUE},
 };
 };
 
 
-/*
- * Use AT command init modem
- *
- * @param struct ppp_device *device
- *
- * @return  0: execute successful
- *         -1: send AT commands errorstruct struct ppp_device *device *devicestruct ppp_device *device
- *         -5: no memory
- */
-static rt_err_t ppp_air720_init(struct ppp_device *device)
-{
-    RT_ASSERT(device != RT_NULL);
-    return RT_EOK;
-}
-
 /*
 /*
  * Get into PPP modem,using uart
  * Get into PPP modem,using uart
  *
  *
@@ -73,51 +59,13 @@ static rt_err_t ppp_air720_open(struct ppp_device *device, rt_uint16_t oflag)
         return RT_NULL;
         return RT_NULL;
     }
     }
 
 
-    rt_thread_mdelay(1000);
-    rt_device_write(uart_device, 0, "+++", 3);
-    rt_thread_mdelay(500);
-
     return modem_chat(uart_device, mcd, sizeof(mcd) / sizeof(mcd[0]));
     return modem_chat(uart_device, mcd, sizeof(mcd) / sizeof(mcd[0]));
 }
 }
 
 
-/*
- * close ppp , deinit uart
- *
- * @param NULL
- *
- * @return  0: execute successful
- *         -1: send AT commands error
- *         -5: no memory
- */
-static rt_err_t ppp_air720_close(struct ppp_device *device)
-{
-    RT_ASSERT(device != RT_NULL);
-    return RT_EOK;
-}
-
-/*
- * control,using AT command to get csq,imei,net_type value
- *
- * @param struct ppp_device *
- *               cmd
- *               *arg
- * @return  0: execute successful
- *         -1: send AT commands error
- *         -5: no memory
- */
-static rt_err_t ppp_air720_control(struct ppp_device *device, int cmd, void *arg)
-{
-    RT_ASSERT(device != RT_NULL);
-    return RT_EOK;
-}
-
 /* ppp_air720_ops for ppp_device_ops , a common interface */
 /* ppp_air720_ops for ppp_device_ops , a common interface */
 static struct ppp_device_ops air720_ops =
 static struct ppp_device_ops air720_ops =
 {
 {
-    ppp_air720_init,
     ppp_air720_open,
     ppp_air720_open,
-    ppp_air720_close,
-    ppp_air720_control
 };
 };
 
 
 /*
 /*
@@ -130,7 +78,7 @@ static struct ppp_device_ops air720_ops =
  * @return  ppp_device function piont
  * @return  ppp_device function piont
  *
  *
  */
  */
-int ppp_air720_register(struct ppp_air720 *air720, const char *dev_name, const char *uart_name, void *user_data)
+int ppp_air720_register(struct ppp_sample *air720, const char *dev_name, const char *uart_name, void *user_data)
 {
 {
     struct ppp_device *ppp_device = RT_NULL;
     struct ppp_device *ppp_device = RT_NULL;
 
 

+ 8 - 57
class/m6312/ppp_device_m6312.c

@@ -22,30 +22,15 @@
 
 
 static const struct modem_chat_data mcd[] =
 static const struct modem_chat_data mcd[] =
 {
 {
-    {"+++",          MODEM_CHAT_RESP_OK,        10, 1},
-    {"ATH",          MODEM_CHAT_RESP_OK,        1,  1},
-    {"AT+CMRESET",   MODEM_CHAT_RESP_NOT_NEED,  1,  1},
-    {"AT",           MODEM_CHAT_RESP_OK,        10, 1},
-    {"ATE0",         MODEM_CHAT_RESP_OK,        1,  1},
-    {PPP_APN_CMD,    MODEM_CHAT_RESP_OK,        1,  5},
-    {PPP_DAIL_CMD,   MODEM_CHAT_RESP_CONNECT,   2, 30},
+    {"+++",          MODEM_CHAT_RESP_OK,        10, 1, RT_FALSE},
+    {"ATH",          MODEM_CHAT_RESP_OK,        1,  1, RT_FALSE},
+    {"AT+CMRESET",   MODEM_CHAT_RESP_NOT_NEED,  1,  1, RT_FALSE},
+    {"AT",           MODEM_CHAT_RESP_OK,        10, 1, RT_FALSE},
+    {"ATE0",         MODEM_CHAT_RESP_OK,        1,  1, RT_FALSE},
+    {PPP_APN_CMD,    MODEM_CHAT_RESP_OK,        1,  5, RT_FALSE},
+    {PPP_DAIL_CMD,   MODEM_CHAT_RESP_CONNECT,   2, 30, RT_FALSE},
 };
 };
 
 
-/*
- * Use AT command init modem
- *
- * @param struct ppp_device *device
- *
- * @return  0: execute successful
- *         -1: send AT commands errorstruct struct ppp_device *device *devicestruct ppp_device *device
- *         -5: no memory
- */
-static rt_err_t ppp_m6312_init(struct ppp_device *device)
-{
-    RT_ASSERT(device != RT_NULL);
-    return RT_EOK;
-}
-
 /*
 /*
  * Get into PPP modem,using uart
  * Get into PPP modem,using uart
  *
  *
@@ -78,44 +63,10 @@ static rt_err_t ppp_m6312_open(struct ppp_device *device, rt_uint16_t oflag)
     return modem_chat(uart_device, mcd, sizeof(mcd) / sizeof(mcd[0]));
     return modem_chat(uart_device, mcd, sizeof(mcd) / sizeof(mcd[0]));
 }
 }
 
 
-/*
- * close ppp , deinit uart
- *
- * @param NULL
- *
- * @return  0: execute successful
- *         -1: send AT commands error
- *         -5: no memory
- */
-static rt_err_t ppp_m6312_close(struct ppp_device *device)
-{
-    RT_ASSERT(device != RT_NULL);
-    return RT_EOK;
-}
-
-/*
- * control,using AT command to get csq,imei,net_type value
- *
- * @param struct ppp_device *
- *               cmd
- *               *arg
- * @return  0: execute successful
- *         -1: send AT commands error
- *         -5: no memory
- */
-static rt_err_t ppp_m6312_control(struct ppp_device *device, int cmd, void *arg)
-{
-    RT_ASSERT(device != RT_NULL);
-    return RT_EOK;
-}
-
 /* ppp_m6312_ops for ppp_device_ops , a common interface */
 /* ppp_m6312_ops for ppp_device_ops , a common interface */
 static struct ppp_device_ops m6312_ops =
 static struct ppp_device_ops m6312_ops =
 {
 {
-    ppp_m6312_init,
     ppp_m6312_open,
     ppp_m6312_open,
-    ppp_m6312_close,
-    ppp_m6312_control
 };
 };
 
 
 /*
 /*
@@ -128,7 +79,7 @@ static struct ppp_device_ops m6312_ops =
  * @return  ppp_device function piont
  * @return  ppp_device function piont
  *
  *
  */
  */
-int ppp_m6312_register(struct ppp_m6312 *m6312, const char *dev_name, const char *uart_name, void *user_data)
+int ppp_m6312_register(struct ppp_sample *m6312, const char *dev_name, const char *uart_name, void *user_data)
 {
 {
     struct ppp_device *ppp_device = RT_NULL;
     struct ppp_device *ppp_device = RT_NULL;