[diag] align platform code to diag callback changes

openthread · Jun 20, 2024 · 7171e11 · 7171e11
1 parent fd8c8fc
commit 7171e11
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 27 deletions.
diff --git a/openthread b/openthread
diff --git a/src/src/diag.c b/src/src/diag.c
@@ -73,31 +73,43 @@
 struct PlatformDiagCommand
 {
     const char *mName;
-    otError (*mCommand)(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[], char *aOutput, size_t aOutputMaxLen);
+    otError (*mCommand)(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[]);
 };
 
 // Diagnostics mode variables.
-static bool sDiagMode = false;
+static bool                     sDiagMode            = false;
+static otPlatDiagOutputCallback sDiagOutputCallback  = NULL;
+static void                    *sDiagCallbackContext = NULL;
+
+static void diagOutput(const char *aFormat, ...)
+{
+    va_list args;
+
+    va_start(args, aFormat);
+
+    if (sDiagOutputCallback != NULL)
+    {
+        sDiagOutputCallback(aFormat, args, sDiagCallbackContext);
+    }
+
+    va_end(args);
+}
 
 // *****************************************************************************
 // Helper functions
 // *****************************************************************************
-static void appendErrorResult(otError aError, char *aOutput, size_t aOutputMaxLen)
+static void appendErrorResult(otError aError)
 {
     if (aError != OT_ERROR_NONE)
     {
-        snprintf(aOutput, aOutputMaxLen, "failed\r\nstatus %#x\r\n", aError);
+        diagOutput("failed\r\nstatus %#x\r\n", aError);
     }
 }
 
 // *****************************************************************************
 // CLI functions
 // *****************************************************************************
-static otError processAddressMatch(otInstance *aInstance,
-                                   uint8_t     aArgsLength,
-                                   char       *aArgs[],
-                                   char       *aOutput,
-                                   size_t      aOutputMaxLen)
+static otError processAddressMatch(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
 {
     OT_UNUSED_VARIABLE(aInstance);
 
@@ -116,15 +128,11 @@ static otError processAddressMatch(otInstance *aInstance,
     }
 
 exit:
-    appendErrorResult(error, aOutput, aOutputMaxLen);
+    appendErrorResult(error);
     return error;
 }
 
-static otError processAutoAck(otInstance *aInstance,
-                              uint8_t     aArgsLength,
-                              char       *aArgs[],
-                              char       *aOutput,
-                              size_t      aOutputMaxLen)
+static otError processAutoAck(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
 {
     OT_UNUSED_VARIABLE(aInstance);
 
@@ -143,7 +151,7 @@ static otError processAutoAck(otInstance *aInstance,
     }
 
 exit:
-    appendErrorResult(error, aOutput, aOutputMaxLen);
+    appendErrorResult(error);
     return error;
 }
 
@@ -155,11 +163,15 @@ const struct PlatformDiagCommand sCommands[] = {
     {"auto-ack", &processAutoAck},
 };
 
-otError otPlatDiagProcess(otInstance *aInstance,
-                          uint8_t     aArgsLength,
-                          char       *aArgs[],
-                          char       *aOutput,
-                          size_t      aOutputMaxLen)
+void otPlatDiagSetOutputCallback(otInstance *aInstance, otPlatDiagOutputCallback aCallback, void *aContext)
+{
+    OT_UNUSED_VARIABLE(aInstance);
+
+    sDiagOutputCallback  = aCallback;
+    sDiagCallbackContext = aContext;
+}
+
+otError otPlatDiagProcess(otInstance *aInstance, uint8_t aArgsLength, char *aArgs[])
 {
     otError error = OT_ERROR_INVALID_COMMAND;
     size_t  i;
@@ -168,11 +180,7 @@ otError otPlatDiagProcess(otInstance *aInstance,
     {
         if (strcmp(aArgs[0], sCommands[i].mName) == 0)
         {
-            error = sCommands[i].mCommand(aInstance,
-                                          aArgsLength - 1,
-                                          aArgsLength > 1 ? &aArgs[1] : NULL,
-                                          aOutput,
-                                          aOutputMaxLen);
+            error = sCommands[i].mCommand(aInstance, aArgsLength - 1, aArgsLength > 1 ? &aArgs[1] : NULL);
             break;
         }
     }
+7 −0		examples/platforms/simulation/diag.c
+16 −16		include/openthread/diag.h
+1 −1		include/openthread/instance.h
+21 −10		include/openthread/platform/diag.h
+3 −1		script/check-size
+9 −4		script/git-tool
+12 −7		src/cli/cli.cpp
+5 −0		src/cli/cli.hpp
+8 −4		src/core/api/diags_api.cpp
+130 −129		src/core/diags/factory_diags.cpp
+33 −23		src/core/diags/factory_diags.hpp
+36 −13		src/lib/spinel/radio_spinel.cpp
+18 −6		src/lib/spinel/radio_spinel.hpp
+51 −5		src/ncp/ncp_base.cpp
+10 −0		src/ncp/ncp_base.hpp
+80 −20		src/posix/platform/radio.cpp
+9 −9		src/posix/platform/rcp_caps_diag.cpp
+17 −8		src/posix/platform/rcp_caps_diag.hpp
+8 −7		tests/fuzz/fuzzer_platform.cpp
+26 −2		tests/unit/test_platform.cpp
+1 −0		tests/unit/test_platform.h