Improvements in device information

- Add CompilerInfo to SoftwareVersionProperties - Increase size of ReleaseInfo.Info string - Rename fields in SoftwareVersion and ReleaseInfo - Add ChibiOS version and mention to ChibiOS to HAL info string on all reference targets Signed-off-by: José Simões <jose.simoes@eclo.solutions>
nanoframework · Jan 4, 2018 · a642e9e · a642e9e
1 parent c57666c
commit a642e9e
Show file tree

Hide file tree

Showing 20 changed files with 61 additions and 40 deletions.
diff --git a/src/CLR/Debugger/Debugger.cpp b/src/CLR/Debugger/Debugger.cpp
@@ -967,12 +967,12 @@ static void GetClrReleaseInfo(CLR_DBG_Commands::Debugging_Execution_QueryCLRCapa
 
 void NFReleaseInfo::Init(NFReleaseInfo& NFReleaseInfo, unsigned short int major, unsigned short int minor, unsigned short int build, unsigned short int revision, const char *info, size_t infoLen)
 {
-    NFVersion::Init( NFReleaseInfo.version, major, minor, build, revision );
-    NFReleaseInfo.infoString[ 0 ] = 0;
+    NFVersion::Init( NFReleaseInfo.Version, major, minor, build, revision );
+    NFReleaseInfo.InfoString[ 0 ] = 0;
     if ( NULL != info && infoLen > 0 )
     {
-        const size_t len = MIN(infoLen, sizeof(NFReleaseInfo.infoString)-1);
-        hal_strncpy_s( (char*)&NFReleaseInfo.infoString[ 0 ], sizeof(NFReleaseInfo.infoString), info, len );
+        const size_t len = MIN(infoLen, sizeof(NFReleaseInfo.InfoString)-1);
+        hal_strncpy_s( (char*)&NFReleaseInfo.InfoString[ 0 ], sizeof(NFReleaseInfo.InfoString), info, len );
     }
 }
 
@@ -991,6 +991,15 @@ bool CLR_DBG_Debugger::Debugging_Execution_QueryCLRCapabilities( WP_Message* msg
     int size          = 0;
     bool fSuccess     = true;
 
+    // set the compiler info string here
+#if defined(__GNUC__)
+#define COMPILER_INFO "GNU ARM GCC"
+    const size_t len = MIN(sizeof(COMPILER_INFO), sizeof(reply.u_SoftwareVersion.CompilerInfo)-1);
+#else
+#define COMPILER_INFO "UNKNOWN"
+    const size_t len = 0;
+#endif
+
     memset(&reply, 0, sizeof(reply));
 
     switch(cmd->m_cmd)
@@ -1048,16 +1057,19 @@ bool CLR_DBG_Debugger::Debugging_Execution_QueryCLRCapabilities( WP_Message* msg
 #if defined(__GNUC__)
 			// this is returning the GNU GCC compiler version in coded format: MAJOR x 10000 + MINOR x 100 + PATCH
             // example: v6.3.1 shows as 6 x 10000 + 3 x 100 + 1 = 60301
-            reply.u_SoftwareVersion.m_compilerVersion = (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__);
+            reply.u_SoftwareVersion.CompilerVersion = (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__);
 #else
-			reply.u_SoftwareVersion.m_compilerVersion = -1;
+			reply.u_SoftwareVersion.CompilerVersion = -1;
 #endif
 
 #if defined(__DATE__)
-            hal_strncpy_s( reply.u_SoftwareVersion.m_buildDate, sizeof(reply.u_SoftwareVersion.m_buildDate), __DATE__,  hal_strlen_s(__DATE__) );
+            hal_strncpy_s( reply.u_SoftwareVersion.BuildDate, sizeof(reply.u_SoftwareVersion.BuildDate), __DATE__,  hal_strlen_s(__DATE__) );
 #else
 #error "__DATE__ with build timestamp needs to be  defined"
 #endif
+
+            hal_strncpy_s( (char*)&reply.u_SoftwareVersion.CompilerInfo[ 0 ], sizeof(reply.u_SoftwareVersion.CompilerInfo), COMPILER_INFO, len );
+
             data = (CLR_UINT8*)&reply.u_SoftwareVersion;
             size = sizeof(reply.u_SoftwareVersion);
             break;

diff --git a/src/CLR/Debugger/Debugger_stub.cpp b/src/CLR/Debugger/Debugger_stub.cpp
@@ -45,11 +45,11 @@ __nfweak void CLR_DBG_Debugger::BroadcastEvent( unsigned int cmd, unsigned int p
 
 __nfweak void NFReleaseInfo::Init( NFReleaseInfo& NFReleaseInfo, unsigned short int major, unsigned short int minor, unsigned short int build, unsigned short int revision, const char *info, size_t infoLen )
 {
-    NFVersion::Init( NFReleaseInfo.version, major, minor, build, revision );
-    NFReleaseInfo.infoString[ 0 ] = 0;
+    NFVersion::Init( NFReleaseInfo.Version, major, minor, build, revision );
+    NFReleaseInfo.InfoString[ 0 ] = 0;
     if ( NULL != info && infoLen > 0 )
     {
-        const size_t len = MIN(infoLen, sizeof(NFReleaseInfo.infoString)-1);
-        hal_strncpy_s( (char*)&NFReleaseInfo.infoString[0], sizeof(NFReleaseInfo.infoString), info, len );
+        const size_t len = MIN(infoLen, sizeof(NFReleaseInfo.InfoString)-1);
+        hal_strncpy_s( (char*)&NFReleaseInfo.InfoString[0], sizeof(NFReleaseInfo.InfoString), info, len );
     }
 }
diff --git a/src/CLR/Include/nanoCLR_Debugging.h b/src/CLR/Include/nanoCLR_Debugging.h
@@ -293,8 +293,9 @@ struct CLR_DBG_Commands
 
         struct __nfpack SoftwareVersion
         {
-            char m_buildDate[ 22 ];
-            unsigned int m_compilerVersion;
+            char BuildDate[ 22 ];
+            char CompilerInfo[16];
+            unsigned int CompilerVersion;
         };
 
         struct __nfpack ClrInfo

diff --git a/src/CLR/Runtime.Native/nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp b/src/CLR/Runtime.Native/nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo.cpp
@@ -24,16 +24,16 @@ HRESULT Library_nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo::GetSyste
 
         Target_GetReleaseInfo( releaseInfo );
 
-        hbMajor.SetInteger( releaseInfo.version.usMajor );
+        hbMajor.SetInteger( releaseInfo.Version.usMajor );
         NANOCLR_CHECK_HRESULT(hbMajor.StoreToReference( stack.Arg0(), 0 ));
 
-        hbMinor.SetInteger( releaseInfo.version.usMinor );
+        hbMinor.SetInteger( releaseInfo.Version.usMinor );
         NANOCLR_CHECK_HRESULT(hbMinor.StoreToReference( stack.Arg1(), 0 ));
 
-        hbBuild.SetInteger( releaseInfo.version.usBuild );
+        hbBuild.SetInteger( releaseInfo.Version.usBuild );
         NANOCLR_CHECK_HRESULT(hbBuild.StoreToReference( stack.Arg2(), 0 ));
 
-        hbRevision.SetInteger( releaseInfo.version.usRevision );
+        hbRevision.SetInteger( releaseInfo.Version.usRevision );
         NANOCLR_CHECK_HRESULT(hbRevision.StoreToReference( stack.Arg3(), 0 ));
     }
 
@@ -50,7 +50,7 @@ HRESULT Library_nf_rt_native_nanoFramework_Runtime_Hardware_SystemInfo::get_OEMS
 
         Target_GetReleaseInfo( releaseInfo );
 
-        NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.infoString ));
+        NANOCLR_SET_AND_LEAVE(stack.SetResult_String( (char*)releaseInfo.InfoString ));
     }
 
     NANOCLR_NOCLEANUP();

diff --git a/src/HAL/Include/nanoHAL_ReleaseInfo.h b/src/HAL/Include/nanoHAL_ReleaseInfo.h
@@ -29,8 +29,8 @@ struct __nfpack NFVersion
 
 struct __nfpack NFReleaseInfo
 {
-    NFVersion version;
-    unsigned char infoString[64-sizeof(NFVersion)];
+    NFVersion Version;
+    unsigned char InfoString[128-sizeof(NFVersion)];
 
     static void Init(NFReleaseInfo& releaseInfo, unsigned short major=0, unsigned short minor=0, unsigned short build=0, unsigned short revision=0, const char *info=(const char *)NULL, size_t infoLen=0);
 };

diff --git a/src/HAL/nanoHAL_SystemInformation.cpp b/src/HAL/nanoHAL_SystemInformation.cpp
@@ -15,13 +15,13 @@ bool GetHalSystemInfo(HalSystemInfo& systemInfo)
 #else
 
     // NFReleaseInfo:
-    systemInfo.m_releaseInfo.version.usMajor       = VERSION_MAJOR;
-    systemInfo.m_releaseInfo.version.usMinor       = VERSION_MINOR;
-    systemInfo.m_releaseInfo.version.usBuild       = VERSION_BUILD;
-    systemInfo.m_releaseInfo.version.usRevision    = VERSION_REVISION;
-    const size_t len = sizeof(systemInfo.m_releaseInfo.infoString);
+    systemInfo.m_releaseInfo.Version.usMajor       = VERSION_MAJOR;
+    systemInfo.m_releaseInfo.Version.usMinor       = VERSION_MINOR;
+    systemInfo.m_releaseInfo.Version.usBuild       = VERSION_BUILD;
+    systemInfo.m_releaseInfo.Version.usRevision    = VERSION_REVISION;
+    const size_t len = sizeof(systemInfo.m_releaseInfo.InfoString);
 
-    hal_strncpy_s ((char*)&systemInfo.m_releaseInfo.infoString[0], len, OEMSYSTEMINFOSTRING, len-1 );
+    hal_strncpy_s ((char*)&systemInfo.m_releaseInfo.InfoString[0], len, OEMSYSTEMINFOSTRING, len-1 );
 
     // we are not supporting this at this time
     // OEM_MODEL_SKU:

diff --git a/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/nanoBooter/target_board.h.in b/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/nanoBooter/target_board.h.in
@@ -12,7 +12,8 @@
 #define _TARGET_BOARD_NANOBOOTER_H_
 
 #include <target_common.h>
+#include <chversion.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! Running @ @CHIBIOS_BOARD@                    "
+#define OEMSYSTEMINFOSTRING "nanoBooter running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOBOOTER_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/nanoCLR/target_board.h.in b/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/nanoCLR/target_board.h.in
@@ -13,6 +13,6 @@
 
 #include <target_common.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! CLR running @ @CHIBIOS_BOARD@                "
+#define OEMSYSTEMINFOSTRING "nanoCLR running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOCLR_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/nanoBooter/target_board.h.in b/targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/nanoBooter/target_board.h.in
@@ -12,7 +12,8 @@
 #define _TARGET_BOARD_NANOBOOTER_H_
 
 #include <target_common.h>
+#include <chversion.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! Running @ @CHIBIOS_BOARD@                    "
+#define OEMSYSTEMINFOSTRING "nanoBooter running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOBOOTER_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/nanoCLR/target_board.h.in b/targets/CMSIS-OS/ChibiOS/NETDUINO3_WIFI/nanoCLR/target_board.h.in
@@ -13,6 +13,6 @@
 
 #include <target_common.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! CLR running @ @CHIBIOS_BOARD@                "
+#define OEMSYSTEMINFOSTRING "nanoCLR running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOCLR_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/nanoBooter/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/nanoBooter/target_board.h.in
@@ -12,7 +12,8 @@
 #define _TARGET_BOARD_NANOBOOTER_H_
 
 #include <target_common.h>
+#include <chversion.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES!! Booter Running @ @CHIBIOS_BOARD@"
+#define OEMSYSTEMINFOSTRING "nanoBooter running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOBOOTER_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/nanoCLR/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/nanoCLR/target_board.h.in
@@ -13,6 +13,6 @@
 
 #include <target_common.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES!! CLR running @ @CHIBIOS_BOARD@"
+#define OEMSYSTEMINFOSTRING "nanoCLR running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOCLR_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/nanoBooter/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/nanoBooter/target_board.h.in
@@ -12,7 +12,8 @@
 #define _TARGET_BOARD_NANOBOOTER_H_
 
 #include <target_common.h>
+#include <chversion.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! Running @ @CHIBIOS_BOARD@                    "
+#define OEMSYSTEMINFOSTRING "nanoBooter running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOBOOTER_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/nanoCLR/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/nanoCLR/target_board.h.in
@@ -13,6 +13,6 @@
 
 #include <target_common.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! CLR running @ @CHIBIOS_BOARD@                "
+#define OEMSYSTEMINFOSTRING "nanoCLR running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOCLR_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/nanoBooter/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/nanoBooter/target_board.h.in
@@ -12,7 +12,8 @@
 #define _TARGET_BOARD_NANOBOOTER_H_
 
 #include <target_common.h>
+#include <chversion.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! Running @ @CHIBIOS_BOARD@                    "
+#define OEMSYSTEMINFOSTRING "nanoBooter running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOBOOTER_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/nanoCLR/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/nanoCLR/target_board.h.in
@@ -13,6 +13,6 @@
 
 #include <target_common.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! CLR running @ @CHIBIOS_BOARD@                "
+#define OEMSYSTEMINFOSTRING "nanoCLR running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOCLR_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoBooter/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoBooter/target_board.h.in
@@ -12,7 +12,8 @@
 #define _TARGET_BOARD_NANOBOOTER_H_
 
 #include <target_common.h>
+#include <chversion.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! Running @ @CHIBIOS_BOARD@                    "
+#define OEMSYSTEMINFOSTRING "nanoBooter running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOBOOTER_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoCLR/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoCLR/target_board.h.in
@@ -13,6 +13,6 @@
 
 #include <target_common.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES! CLR running @ @CHIBIOS_BOARD@                "
+#define OEMSYSTEMINFOSTRING "nanoCLR running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOCLR_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/nanoBooter/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/nanoBooter/target_board.h.in
@@ -12,7 +12,8 @@
 #define _TARGET_BOARD_NANOBOOTER_H_
 
 #include <target_common.h>
+#include <chversion.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES!! Booter Running @ @CHIBIOS_BOARD@"
+#define OEMSYSTEMINFOSTRING "nanoBooter running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOBOOTER_H_ */
diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/nanoCLR/target_board.h.in b/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/nanoCLR/target_board.h.in
@@ -12,7 +12,8 @@
 #define _TARGET_BOARD_NANOCLR_H_
 
 #include <target_common.h>
+#include <chversion.h>
 
-#define OEMSYSTEMINFOSTRING "nanoFramework RULES!! CLR running @ @CHIBIOS_BOARD@"
+#define OEMSYSTEMINFOSTRING "nanoCLR running @ @CHIBIOS_BOARD@ built with ChibiOS v" CH_VERSION
 
 #endif /* _TARGET_BOARD_NANOCLR_H_ */