Merge pull request #4931 from ShermanShao/master

[components]rt-link v0.2.0 新特性：

components/utilities/rt-link/Kconfig

@@ -14,21 +14,6 @@ if RT_USING_RT_LINK
             bool "use hardware crc device"
     endchoice
 
-    menu "rt-link hardware device configuration"
-        config RT_LINK_HW_DEVICE_NAME
-            string "the name of base actual device"
-            default "uart2"
-
-        choice
-            prompt"hardware device is spi, uart or usb"
-            default RT_LINK_USING_UART
-
-            config RT_LINK_USING_UART
-                bool "use UART"
-        endchoice
-
-    endmenu
-
     menu "rt link debug option"
         config USING_RT_LINK_DEBUG
             bool "Enable RT-Link debug"

components/utilities/rt-link/hw_port/SConscript

@@ -1,14 +0,0 @@
-import os
-from building import *
-import rtconfig
-
-cwd  = GetCurrentDir()
-src  = []
-CPPPATH = []
-
-if GetDepend('RT_LINK_USING_UART'):
-    src += ['uart/rtlink_port_uart.c']
-
-group = DefineGroup('rt-link-port', src, depend = ['RT_USING_RT_LINK'], CPPPATH = CPPPATH)
-
-Return('group')

components/utilities/rt-link/hw_port/uart/rtlink_port_uart.c

@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date           Author       Notes
- * 2020-12-09     xiangxistu   the first version
- */
-
-#include <rtthread.h>
-#include <rtdevice.h>
-
-#include <rtlink_port.h>
-
-#ifndef RT_LINK_HW_DEVICE_NAME
-    #define RT_LINK_HW_DEVICE_NAME "uart2"
-#endif
-
-#define DBG_TAG              "rtlink_port"
-#define DBG_LVL              DBG_INFO
-#include <rtdbg.h>
-
-static struct rt_device *hw_device = RT_NULL;
-rt_err_t rt_link_port_rx_ind(rt_device_t device, rt_size_t size)
-{
-    RT_ASSERT(device != RT_NULL);
-
-    rt_uint8_t buffer[RT_SERIAL_RB_BUFSZ] = {0};
-    rt_size_t length = 0;
-    length = rt_device_read(device, 0, buffer, sizeof(buffer));
-    rt_link_hw_write_cb(&buffer, length);
-    return RT_EOK;
-}
-
-rt_size_t rt_link_port_send(void *data, rt_size_t length)
-{
-    rt_size_t size = 0;
-    size = rt_device_write(hw_device, 0, data, length);
-    return size;
-}
-
-int rt_link_port_init(void)
-{
-    hw_device = rt_device_find(RT_LINK_HW_DEVICE_NAME);
-    if (hw_device)
-    {
-        rt_device_open(hw_device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX);
-        rt_device_set_rx_indicate(hw_device, rt_link_port_rx_ind);
-    }
-    else
-    {
-        LOG_E("Not find device %s", RT_LINK_HW_DEVICE_NAME);
-        return -RT_ERROR;
-    }
-    return RT_EOK;
-}
-
-int rt_link_port_deinit(void)
-{
-    hw_device = rt_device_find(RT_LINK_HW_DEVICE_NAME);
-    if (hw_device)
-    {
-        rt_device_close(hw_device);
-        rt_device_set_rx_indicate(hw_device, RT_NULL);
-    }
-    else
-    {
-        LOG_E("Not find device %s", RT_LINK_HW_DEVICE_NAME);
-        return -RT_ERROR;
-    }
-    return RT_EOK;
-}

components/utilities/rt-link/inc/rtlink_dev.h

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2021-06-15     Sherman      the first version
+ */
+
+#include <rtthread.h>
+#include <rtlink.h>
+
+#define RT_LINK_RX_NONBLOCKING       0x1000
+#define RT_LINK_RX_BLOCKING          0x2000
+#define RT_LINK_TX_NONBLOCKING       0x4000
+#define RT_LINK_TX_BLOCKING          0x8000
+#define RT_LINK_DEVICE_MASK          0xf000
+
+struct rtlink_recv_list
+{
+    void *data;
+    rt_size_t size;
+    rt_size_t index;
+    struct rt_slist_node list;
+};
+
+struct rt_link_device
+{
+    struct rt_device parent;
+    struct rt_link_service service;
+    struct rt_slist_node recv_head; /* recv data list, struct rtlink_recv_list  */
+};
+
+/*
+ * rtlink device register
+ */
+rt_err_t rt_link_dev_register(struct rt_link_device *rtlink,
+                              const char              *name,
+                              rt_uint32_t              flag,
+                              void                    *data);

components/utilities/rt-link/inc/rtlink_hw.h

@@ -6,6 +6,7 @@
  * Change Logs:
  * Date           Author       Notes
  * 2021-02-02     xiangxistu   the first version
+ * 2021-07-13     Sherman      add reconnect API
  *
  */
 #ifndef __RT_LINK_HW_H__
@@ -19,6 +20,7 @@ void rt_link_hw_buffer_point_shift(rt_uint8_t **pointer_address, rt_size_t lengt
 
 rt_err_t rt_link_hw_init(void);
 rt_err_t rt_link_hw_deinit(void);
-rt_err_t rt_link_hw_send(void *data, rt_size_t length);
+rt_err_t rt_link_hw_reconnect(void);
+rt_size_t rt_link_hw_send(void *data, rt_size_t length);
 
 #endif /* _RT_LINK_PORT_INTERNAL_H_ */

components/utilities/rt-link/inc/rtlink_port.h

@@ -7,6 +7,7 @@
  * Date           Author       Notes
  * 2021-02-02     xiangxistu   the first version
  * 2021-05-15     Sherman      function rename
+ * 2021-07-13     Sherman      add reconnect API
  */
 #ifndef __RT_LINK_PORT_H__
 #define __RT_LINK_PORT_H__
@@ -14,8 +15,9 @@
 #include <rtdef.h>
 
 /* Functions that need to be implemented at the hardware */
-int rt_link_port_init(void);
-int rt_link_port_deinit(void);
+rt_err_t rt_link_port_init(void);
+rt_err_t rt_link_port_deinit(void);
+rt_err_t rt_link_port_reconnect(void);
 rt_size_t rt_link_port_send(void *data, rt_size_t length);
 
 #ifdef RT_LINK_USING_HW_CRC

components/utilities/rt-link/src/rtlink_hw.c

@@ -85,18 +85,39 @@ static rt_size_t rt_link_hw_buffer_write(void *data, rt_size_t count)
 /* increases buffer pointer by one and circle around if necessary */
 void rt_link_hw_buffer_point_shift(rt_uint8_t **pointer_address, rt_size_t length)
 {
-    rt_uint8_t *pointer = RT_NULL;
+    rt_uint8_t *pointer = *pointer_address + length;
 
-    pointer = *pointer_address + length;
-    if (pointer >= rx_buffer->end_point)
+    if (rx_buffer->write_point >= rx_buffer->read_point)
     {
-        rt_size_t offset = 0;
-        offset = pointer - rx_buffer->end_point;
-        *pointer_address = rx_buffer->data + offset;
+        if (pointer >= rx_buffer->write_point)
+        {
+            *pointer_address = rx_buffer->write_point;
+        }
+        else
+        {
+            *pointer_address = pointer;
+        }
     }
     else
     {
-        *pointer_address = *pointer_address + length;
+        if (pointer >= rx_buffer->end_point)
+        {
+            *pointer_address = rx_buffer->data;
+            pointer = pointer - rx_buffer->end_point + rx_buffer->data;
+
+            if (pointer >= rx_buffer->write_point)
+            {
+                *pointer_address = rx_buffer->write_point;
+            }
+            else
+            {
+                *pointer_address = pointer;
+            }
+        }
+        else
+        {
+            *pointer_address = pointer;
+        }
     }
 }
 
@@ -119,9 +140,13 @@ void rt_link_hw_copy(rt_uint8_t *dst, rt_uint8_t *src, rt_size_t count)
     }
 }
 
-/* Tells, how many chars are saved into the buffer */
+/* Length of data received */
 rt_size_t rt_link_hw_recv_len(struct rt_link_receive_buffer *buffer)
 {
+    if (buffer == RT_NULL)
+    {
+        return 0;
+    }
     if (buffer->write_point >= buffer->read_point)
     {
         return (buffer->write_point - buffer->read_point);
@@ -183,15 +208,18 @@ rt_uint32_t rt_link_get_crc(rt_uint8_t using_buffer_ring, rt_uint8_t *data, rt_s
     return crc32;
 }
 
-rt_err_t rt_link_hw_send(void *data, rt_size_t length)
+rt_size_t rt_link_hw_send(void *data, rt_size_t length)
 {
     rt_size_t send_len = 0;
     send_len = rt_link_port_send(data, length);
-    LOG_D("hw_send len= %d", send_len);
+    if (send_len <= 0)
+    {
+        rt_link_port_reconnect();
+        send_len = rt_link_port_send(data, length);
+    }
     return send_len;
 }
 
-/* provide this function to hardware spi/uart/usb to store data */
 rt_size_t rt_link_hw_write_cb(void *data, rt_size_t length)
 {
     /* write real data into rtlink receive buffer */
@@ -220,11 +248,17 @@ rt_err_t rt_link_hw_init(void)
     scb->rx_buffer = rx_buffer;
     scb->calculate_crc = rt_link_get_crc;
 
-    rt_link_port_init();
+    if (RT_EOK != rt_link_port_init())
+    {
+        return -RT_ERROR;
+    }
 
 #ifdef LINK_LAYER_USING_HW_CRC
     /* crc hardware device for mcu and node */
-    rt_link_hw_crc32_init();
+    if (RT_EOK != rt_link_hw_crc32_init())
+    {
+        return -RT_ERROR;
+    }
 #endif
 
     LOG_I("link layer hardware environment init successful.");
@@ -244,11 +278,17 @@ rt_err_t rt_link_hw_deinit(void)
         scb->rx_buffer = rx_buffer;
         scb->calculate_crc = RT_NULL;
     }
-    rt_link_port_deinit();
+    if (RT_EOK != rt_link_port_deinit())
+    {
+        return -RT_ERROR;
+    }
 
 #ifdef LINK_LAYER_USING_HW_CRC
     /* crc hardware device for mcu and node */
-    rt_link_hw_crc32_deinit();
+    if (RT_EOK != rt_link_hw_crc32_deinit())
+    {
+        return -RT_ERROR;
+    }
 #endif
 
     LOG_I("rtlink hardware deinit successful.");