|
@@ -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;
|
|
|
|
|
|