[Silabs] Silabs Uart Shell fixes (project-chip#36667)

lpbeliveau-silabs · web-flow · commit 439de24a5457 · 2024-11-28T14:08:02.000-05:00
* [SL-UP] Bugfix/silabs out rtt removal (#142) * [SL-UP] Bugfix/matter shell crash nullptr (#125) * Added checks on null ptr to prevent uart shell crash and modified ICD shell commands to be compatible with our internal structure
diff --git a/examples/platform/silabs/shell/BUILD.gn b/examples/platform/silabs/shell/BUILD.gn
@@ -23,17 +23,17 @@ if (use_SiWx917) {
   shell_dependency_path = "${chip_root}/examples/platform/silabs/SiWx917"
 }
 
-config("shell-config") {
-  include_dirs = [ "." ]
+config("icd-shell-config") {
+  include_dirs = [ "./icd/" ]
 }
 
 source_set("icd") {
   sources = [
-    "ICDShellCommands.cpp",
-    "ICDShellCommands.h",
+    "./icd/ICDShellCommands.cpp",
+    "./icd/ICDShellCommands.h",
   ]
 
-  public_configs = [ ":shell-config" ]
+  public_configs = [ ":icd-shell-config" ]
 
   deps = [ "${shell_dependency_path}:matter-shell" ]
 }
diff --git a/examples/platform/silabs/shell/icd/ICDShellCommands.cpp b/examples/platform/silabs/shell/icd/ICDShellCommands.cpp
diff --git a/examples/platform/silabs/shell/icd/ICDShellCommands.h b/examples/platform/silabs/shell/icd/ICDShellCommands.h
diff --git a/src/lib/shell/Engine.cpp b/src/lib/shell/Engine.cpp
@@ -86,6 +86,8 @@ CHIP_ERROR Engine::ExecCommand(int argc, char * argv[])
     CHIP_ERROR retval = CHIP_ERROR_INVALID_ARGUMENT;
 
     VerifyOrReturnError(argc > 0, retval);
+    VerifyOrReturnError(nullptr != argv, retval);
+
     // Find the command
     for (unsigned i = 0; i < _commandSetCount; i++)
     {
diff --git a/src/platform/silabs/Logging.cpp b/src/platform/silabs/Logging.cpp
@@ -51,13 +51,8 @@
 #include "uart.h"
 #endif
 
-// Enable RTT by default
-#ifndef SILABS_LOG_OUT_RTT
-#define SILABS_LOG_OUT_RTT 1
-#endif
-
 // SEGGER_RTT includes
-#if SILABS_LOG_OUT_RTT
+#if !SILABS_LOG_OUT_UART
 #include "SEGGER_RTT.h"
 #include "SEGGER_RTT_Conf.h"
 #endif
@@ -136,7 +131,7 @@ static void PrintLog(const char * msg)
         SEGGER_RTT_WriteNoLock(LOG_RTT_BUFFER_INDEX, msg, sz);
 #endif // SILABS_LOG_OUT_UART
 
-#if SILABS_LOG_OUT_RTT || PW_RPC_ENABLED
+#if !SILABS_LOG_OUT_UART || PW_RPC_ENABLED
         const char * newline = "\r\n";
         sz                   = strlen(newline);
 #if PW_RPC_ENABLED
@@ -154,7 +149,7 @@ static void PrintLog(const char * msg)
 extern "C" void silabsInitLog(void)
 {
 #if SILABS_LOG_ENABLED
-#if SILABS_LOG_OUT_RTT
+#if !SILABS_LOG_OUT_UART
 #if LOG_RTT_BUFFER_INDEX != 0
     SEGGER_RTT_ConfigUpBuffer(LOG_RTT_BUFFER_INDEX, LOG_RTT_BUFFER_NAME, sLogBuffer, LOG_RTT_BUFFER_SIZE,
                               SEGGER_RTT_MODE_NO_BLOCK_TRIM);
@@ -164,7 +159,7 @@ extern "C" void silabsInitLog(void)
 #else
     SEGGER_RTT_SetFlagsUpBuffer(LOG_RTT_BUFFER_INDEX, SEGGER_RTT_MODE_NO_BLOCK_TRIM);
 #endif
-#endif // SILABS_LOG_OUT_RTT
+#endif // !SILABS_LOG_OUT_UART
 
 #ifdef PW_RPC_ENABLED
     PigweedLogger::init();
diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -331,10 +331,9 @@ template("siwx917_sdk") {
     }
 
     if (sl_uart_log_output) {
-      defines += [
-        "SILABS_LOG_OUT_UART=1",
-        "SILABS_LOG_OUT_RTT=0",
-      ]
+      defines += [ "SILABS_LOG_OUT_UART=1" ]
+    } else {
+      defines += [ "SILABS_LOG_OUT_UART=0" ]
     }
 
     if (chip_build_libshell) {  # matter shell
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -487,10 +487,9 @@ template("efr32_sdk") {
     }
 
     if (sl_uart_log_output) {
-      defines += [
-        "SILABS_LOG_OUT_UART=1",
-        "SILABS_LOG_OUT_RTT=0",
-      ]
+      defines += [ "SILABS_LOG_OUT_UART=1" ]
+    } else {
+      defines += [ "SILABS_LOG_OUT_UART=0" ]
     }
 
     if (use_silabs_thread_lib) {

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,17 @@ if (use_SiWx917) {`
`23`	`23`	`shell_dependency_path = "${chip_root}/examples/platform/silabs/SiWx917"`
`24`	`24`	`}`
`25`	`25`
`26`		`-config("shell-config") {`
`27`		`- include_dirs = [ "." ]`
	`26`	`+config("icd-shell-config") {`
	`27`	`+ include_dirs = [ "./icd/" ]`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`source_set("icd") {`
`31`	`31`	`sources = [`
`32`		`- "ICDShellCommands.cpp",`
`33`		`- "ICDShellCommands.h",`
	`32`	`+ "./icd/ICDShellCommands.cpp",`
	`33`	`+ "./icd/ICDShellCommands.h",`
`34`	`34`	`]`
`35`	`35`
`36`		`- public_configs = [ ":shell-config" ]`
	`36`	`+ public_configs = [ ":icd-shell-config" ]`
`37`	`37`
`38`	`38`	`deps = [ "${shell_dependency_path}:matter-shell" ]`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,8 @@ CHIP_ERROR Engine::ExecCommand(int argc, char * argv[])`
`86`	`86`	`CHIP_ERROR retval = CHIP_ERROR_INVALID_ARGUMENT;`
`87`	`87`
`88`	`88`	`VerifyOrReturnError(argc > 0, retval);`
	`89`	`+ VerifyOrReturnError(nullptr != argv, retval);`
	`90`	`+`
`89`	`91`	`// Find the command`
`90`	`92`	`for (unsigned i = 0; i < _commandSetCount; i++)`
`91`	`93`	`{`
Original file line number	Diff line number	Diff line change
`@@ -331,10 +331,9 @@ template("siwx917_sdk") {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`if (sl_uart_log_output) {`
`334`		`- defines += [`
`335`		`- "SILABS_LOG_OUT_UART=1",`
`336`		`- "SILABS_LOG_OUT_RTT=0",`
`337`		`- ]`
	`334`	`+ defines += [ "SILABS_LOG_OUT_UART=1" ]`
	`335`	`+ } else {`
	`336`	`+ defines += [ "SILABS_LOG_OUT_UART=0" ]`
`338`	`337`	`}`
`339`	`338`
`340`	`339`	`if (chip_build_libshell) { # matter shell`
Original file line number	Diff line number	Diff line change
`@@ -487,10 +487,9 @@ template("efr32_sdk") {`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`if (sl_uart_log_output) {`
`490`		`- defines += [`
`491`		`- "SILABS_LOG_OUT_UART=1",`
`492`		`- "SILABS_LOG_OUT_RTT=0",`
`493`		`- ]`
	`490`	`+ defines += [ "SILABS_LOG_OUT_UART=1" ]`
	`491`	`+ } else {`
	`492`	`+ defines += [ "SILABS_LOG_OUT_UART=0" ]`
`494`	`493`	`}`
`495`	`494`
`496`	`495`	`if (use_silabs_thread_lib) {`