[components][at] 修复合并导致的错误

Author: Ryan-CW-Code

components/drivers/include/drivers/dev_serial_v2.h

@@ -355,6 +355,18 @@ void rt_hw_serial_isr(struct rt_serial_device *serial, int event);
 
 rt_err_t rt_hw_serial_control_isr(struct rt_serial_device *serial, int cmd, void *args);
 
+/**
+ * @brief Register a serial device to device list
+ *
+ * @param serial    serial device
+ * @param name      device name
+ * @param flag      device flag
+ * @param data      device private data
+ * @return rt_err_t        error code
+ * @note This function will register a serial device to system device list,
+ *       and add a device object to system object list.
+ * @ingroup group_Serial_v2
+ */
 rt_err_t rt_hw_serial_register(struct rt_serial_device      *serial,
                                const  char                  *name,
                                       rt_uint32_t            flag,

components/net/at/src/at_client.c

@@ -987,8 +987,7 @@ static int at_client_para_init(at_client_t client)
                                      (void (*)(void *parameter))client_parser,
                                      client,
                                      1024 + 512,
-                                     6,
-                                    /*  RT_THREAD_PRIORITY_MAX / 3 - 1,*/
+                                     RT_THREAD_PRIORITY_MAX / 3 - 1,
                                      5);
     if (client->parser == RT_NULL)
     {
@@ -1088,18 +1087,13 @@ int at_client_init(const char *dev_name, rt_size_t recv_bufsz, rt_size_t send_bu
         RT_ASSERT(client->device->type == RT_Device_Class_Char);
 #if (!defined(RT_USING_SERIAL_V2))
         rt_device_set_rx_indicate(client->device, at_client_rx_ind);
-
-#ifdef RT_USING_SERIAL_V2
-        open_result = rt_device_open(client->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_RX_NON_BLOCKING);
-#else
         /* using DMA mode first */
         open_result = rt_device_open(client->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_DMA_RX);
         /* using interrupt mode when DMA mode not supported */
         if (open_result == -RT_EIO)
         {
             open_result = rt_device_open(client->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX);
         }
-#endif /* RT_USING_SERIAL_V2 */
         RT_ASSERT(open_result == RT_EOK);
 #else
         open_result = rt_device_open(client->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_RX_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING);

components/net/at/src/at_server.c

@@ -591,18 +591,13 @@ int at_server_init(void)
         RT_ASSERT(at_server_local->device->type == RT_Device_Class_Char);
 #if (!defined(RT_USING_SERIAL_V2))
         rt_device_set_rx_indicate(at_server_local->device, at_rx_ind);
-
-#ifdef RT_USING_SERIAL_V2
-        open_result = rt_device_open(client->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_RX_NON_BLOCKING);
-#else
         /* using DMA mode first */
         open_result = rt_device_open(at_server_local->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_DMA_RX);
         /* using interrupt mode when DMA mode not supported */
         if (open_result == -RT_EIO)
         {
             open_result = rt_device_open(at_server_local->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX);
         }
-#endif /* RT_USING_SERIAL_V2 */
         RT_ASSERT(open_result == RT_EOK);
 #else
         open_result = rt_device_open(at_server_local->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_RX_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING);