NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

显示软硬件版本和产品批次等详细信息

This commit is contained in:
大石头 2017-03-21 18:03:00 +08:00
parent 3bb2387b8b
commit 6739d23dfd
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Kernel/Sys.cpp
View File

@ -7,7 +7,8 @@ TSys Sys;
const TTime Time; const TTime Time;
// 系统配置 // 系统配置
const SystemConfig g_Config = { //const SystemConfig g_Config = {
SystemConfig g_Config = {
// 操作系统 v3.2.x // 操作系统 v3.2.x
(0x03020000 | __BUILD_DATE__), (0x03020000 | __BUILD_DATE__),
"SmartOS_CPU", "SmartOS_CPU",
@ -18,8 +19,8 @@ const SystemConfig g_Config = {
// 应用软件 // 应用软件
0x0, 0x0,
0x0, 0x0,
"WsLink", __BUILD_USER__,
"", "170321",
}; };
#if defined(BOOT) || defined(APP) #if defined(BOOT) || defined(APP)
@ -31,17 +32,18 @@ struct HandlerRemap StrBoot __attribute__((at(0x2000fff0)));
// 关键性代码，放到开头 // 关键性代码，放到开头
INROOT TSys::TSys() INROOT TSys::TSys()
{ {
auto& cfg = g_Config;
Config = &g_Config; Config = &g_Config;
OnInit(); OnInit();
OnSleep = nullptr; OnSleep = nullptr;
Code = 0x0000; Code = cfg.Code;
Ver = 6220; Ver = cfg.Ver;
#ifndef TINY #ifndef TINY
Name = "SmartOS"; Name = cfg.Name;
Company = "NewLife_Embedded_Team"; Company = cfg.Company;
Interrupt.Init(); Interrupt.Init();
#endif #endif
@ -63,7 +65,10 @@ void TSys::ShowInfo() const
debug_printf("%s::%s Code:%04X ", Company, Name, Code); debug_printf("%s::%s Code:%04X ", Company, Name, Code);
Version v(Config->Ver); Version v(Config->Ver);
debug_printf("Ver:%s\r\n", v.ToString().GetBuffer()); 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(); OnShowInfo();

10
Kernel/Sys.h
View File

@ -145,7 +145,7 @@ class SystemConfig
public: public:
// 操作系统 // 操作系统
uint Ver; // 系统版本。Version格式 uint Ver; // 系统版本。Version格式
char Name[16]; // 系统名称。如：SmartOS-M3-10x char Name[16]; // 系统名称
// 硬件 // 硬件
uint HardVer; // 硬件版本 uint HardVer; // 硬件版本
@ -208,16 +208,16 @@ public:
// 编译信息兼容性处理 // 编译信息兼容性处理
#ifndef __BUILD_DATE__ #ifndef __BUILD_DATE__
#define __BUILD_DATE__ 0 #define __BUILD_DATE__ 6289 // 2017-03-21
#endif #endif
#ifndef __BUILD_TIME__ #ifndef __BUILD_TIME__
#define __BUILD_TIME__ 0 #define __BUILD_TIME__ 1490054400 // 2017-03-21 00:00:00
#endif #endif
#ifndef __BUILD_COMPILE__ #ifndef __BUILD_COMPILE__
#define __BUILD_COMPILE__ "" #define __BUILD_COMPILE__ "2017-03-21 00:00:00"
#endif #endif
#ifndef __BUILD_USER__ #ifndef __BUILD_USER__
#define __BUILD_USER__ "" #define __BUILD_USER__ "User_Computer"
#endif #endif