From 6739d23dfdeb656d4d114b473fb0777bf886ff7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=9F=B3=E5=A4=B4?= <nnhy@vip.qq.com>
Date: Tue, 21 Mar 2017 18:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BD=AF=E7=A1=AC=E4=BB=B6?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=92=8C=E4=BA=A7=E5=93=81=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E7=AD=89=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Kernel/Sys.cpp | 21 +++++++++++++--------
 Kernel/Sys.h   | 10 +++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Kernel/Sys.cpp b/Kernel/Sys.cpp
index 61fbc700..37f70da1 100644
--- a/Kernel/Sys.cpp
+++ b/Kernel/Sys.cpp
@@ -7,7 +7,8 @@ TSys Sys;
 const TTime Time;
 
 // 系统配置
-const SystemConfig g_Config = {
+//const SystemConfig g_Config = {
+SystemConfig g_Config = {
 	// 操作系统 v3.2.x
 	(0x03020000 | __BUILD_DATE__),
 	"SmartOS_CPU",
@@ -18,8 +19,8 @@ const SystemConfig g_Config = {
 	// 应用软件
 	0x0,
 	0x0,
-	"WsLink",
-	"",
+	__BUILD_USER__,
+	"170321",
 };
 
 #if defined(BOOT) || defined(APP)
@@ -31,17 +32,18 @@ struct HandlerRemap StrBoot __attribute__((at(0x2000fff0)));
 // 关键性代码，放到开头
 INROOT TSys::TSys()
 {
+	auto& cfg = g_Config;
 	Config = &g_Config;
 
 	OnInit();
 
 	OnSleep	= nullptr;
 
-	Code	= 0x0000;
-	Ver		= 6220;
+	Code	= cfg.Code;
+	Ver		= cfg.Ver;
 #ifndef TINY
-	Name	= "SmartOS";
-	Company	= "NewLife_Embedded_Team";
+	Name	= cfg.Name;
+	Company	= cfg.Company;
 
     Interrupt.Init();
 #endif
@@ -63,7 +65,10 @@ void TSys::ShowInfo() const
 	debug_printf("%s::%s Code:%04X ", Company, Name, Code);
 	Version v(Config->Ver);
 	debug_printf("Ver:%s\r\n", v.ToString().GetBuffer());
-	debug_printf("Build:%s %s\r\n", __BUILD_USER__, __BUILD_COMPILE__);
+	debug_printf("Product:%s Build:%s %s\r\n", Config->Product, __BUILD_USER__, __BUILD_COMPILE__);
+	Version v1(Config->AppVer);
+	Version v2(Config->HardVer);
+	debug_printf("AppVer:%s HardVer:%s\r\n", v1.ToString().GetBuffer(), v2.ToString().GetBuffer());
 
 	OnShowInfo();
 
diff --git a/Kernel/Sys.h b/Kernel/Sys.h
index 405e8809..d68662dc 100644
--- a/Kernel/Sys.h
+++ b/Kernel/Sys.h
@@ -145,7 +145,7 @@ class SystemConfig
 public:
 	// 操作系统
 	uint	Ver;		// 系统版本。Version格式
-	char	Name[16];	// 系统名称。如：SmartOS-M3-10x
+	char	Name[16];	// 系统名称
 
 	// 硬件
 	uint	HardVer;	// 硬件版本
@@ -208,16 +208,16 @@ public:
 
 // 编译信息兼容性处理
 #ifndef __BUILD_DATE__
-#define __BUILD_DATE__ 0
+#define __BUILD_DATE__ 6289		// 2017-03-21
 #endif
 #ifndef __BUILD_TIME__
-#define __BUILD_TIME__ 0
+#define __BUILD_TIME__ 1490054400	// 2017-03-21 00:00:00
 #endif
 #ifndef __BUILD_COMPILE__
-#define __BUILD_COMPILE__ ""
+#define __BUILD_COMPILE__ "2017-03-21 00:00:00"
 #endif
 #ifndef __BUILD_USER__
-#define __BUILD_USER__ ""
+#define __BUILD_USER__ "User_Computer"
 #endif