From ce16945cbab89543aa1e2674accfdbdd9fd8e686 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Sun, 28 Aug 2022 13:25:47 -0400
Subject: [kernel][version] 采用新的版本宏定义
 版本控制规范：https://semver.org/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

目前的版本子号不是很规范，其中RT_VERSION甚至和VS那边造成了冲突
```c
/* RT-Thread version information */
#define RT_VERSION                      4L              /**< major version number */
#define RT_SUBVERSION                   1L              /**< minor version number */
#define RT_REVISION                     1L              /**< revise version number */
```

参考ESP32：
```c
/** Major version number (X.x.x) */
#define ESP_ARDUINO_VERSION_MAJOR   2
/** Minor version number (x.X.x) */
#define ESP_ARDUINO_VERSION_MINOR   0
/** Patch version number (x.x.X) */
#define ESP_ARDUINO_VERSION_PATCH   3
```

建议改成：
```c
/* Major version number (X.x.x) */
#define RT_VERSION_MAJOR   4
/* Minor version number (x.X.x) */
#define RT_VERSION_MINOR   2
/* Patch version number (x.x.X) */
#define RT_VERSION_PATCH   0
```
---
 components/legacy/rtlegacy.h        | 8 +++++---
 components/net/sal/src/sal_socket.c | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'components')

diff --git a/components/legacy/rtlegacy.h b/components/legacy/rtlegacy.h
index df8463cdd2..19b7f38209 100644
--- a/components/legacy/rtlegacy.h
+++ b/components/legacy/rtlegacy.h
@@ -12,10 +12,12 @@
 #define __RT_LEGACY_H__
 
 #include <rtconfig.h>
+#include <rtdef.h>
 
-/* rtlibc */
-#include <stdint.h>
-#include <stddef.h>
+/* legacy version macros */
+#define RT_VERSION              RT_VERSION_MAJOR        /**< major version number */
+#define RT_SUBVERSION           RT_VERSION_MINOR        /**< minor version number */
+#define RT_REVISION             RT_VERSION_PATCH        /**< revise version number */
 
 /* IPC */
 #ifdef RT_USING_DEVICE_IPC
diff --git a/components/net/sal/src/sal_socket.c b/components/net/sal/src/sal_socket.c
index 3256b9f4d6..e3dafd0cc8 100644
--- a/components/net/sal/src/sal_socket.c
+++ b/components/net/sal/src/sal_socket.c
@@ -238,9 +238,9 @@ static void check_netdev_internet_up_work(struct rt_work *work, void *work_data)
     {
         send_data[index + 1] = netdev->hwaddr[index] + moth_num;
     }
-    send_data[9] = RT_VERSION;
-    send_data[10] = RT_SUBVERSION;
-    send_data[11] = RT_REVISION;
+    send_data[9] = RT_VERSION_MAJOR;
+    send_data[10] = RT_VERSION_MINOR;
+    send_data[11] = RT_VERSION_PATCH;
 
     skt_ops->sendto(sockfd, send_data, SAL_INTERNET_BUFF_LEN, 0,
                     (struct sockaddr *)&server_addr, sizeof(struct sockaddr));
-- 
cgit v1.3.1