qcdm: add SW_VERSION command

6 files changed, 124 insertions, 0 deletions

diff --git a/libqcdm/src/commands.c b/libqcdm/src/commands.c
index c0d0783b..9cc85e2e 100644
--- a/libqcdm/src/commands.c
+++ b/libqcdm/src/commands.c
@@ -287,6 +287,55 @@ qcdm_cmd_cdma_status_result (const char *buf, gsize len, GError **error)
 /**********************************************************************/
 
 gsize
+qcdm_cmd_sw_version_new (char *buf, gsize len, GError **error)
+{
+    char cmdbuf[3];
+    DMCmdHeader *cmd = (DMCmdHeader *) &cmdbuf[0];
+
+    g_return_val_if_fail (buf != NULL, 0);
+    g_return_val_if_fail (len >= sizeof (*cmd) + DIAG_TRAILER_LEN, 0);
+
+    memset (cmd, 0, sizeof (cmd));
+    cmd->code = DIAG_CMD_SW_VERSION;
+
+    return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);
+}
+
+QCDMResult *
+qcdm_cmd_sw_version_result (const char *buf, gsize len, GError **error)
+{
+    QCDMResult *result = NULL;
+    DMCmdSwVersionRsp *rsp = (DMCmdSwVersionRsp *) buf;
+    char tmp[25];
+
+    g_return_val_if_fail (buf != NULL, NULL);
+
+    if (!check_command (buf, len, DIAG_CMD_SW_VERSION, sizeof (*rsp), error))
+        return NULL;
+
+    result = qcdm_result_new ();
+
+    memset (tmp, 0, sizeof (tmp));
+    g_assert (sizeof (rsp->version) <= sizeof (tmp));
+    memcpy (tmp, rsp->version, sizeof (rsp->version));
+    qcdm_result_add_string (result, QCDM_CMD_SW_VERSION_ITEM_VERSION, tmp);
+
+    memset (tmp, 0, sizeof (tmp));
+    g_assert (sizeof (rsp->comp_date) <= sizeof (tmp));
+    memcpy (tmp, rsp->comp_date, sizeof (rsp->comp_date));
+    qcdm_result_add_string (result, QCDM_CMD_SW_VERSION_ITEM_COMP_DATE, tmp);
+
+    memset (tmp, 0, sizeof (tmp));
+    g_assert (sizeof (rsp->comp_time) <= sizeof (tmp));
+    memcpy (tmp, rsp->comp_time, sizeof (rsp->comp_time));
+    qcdm_result_add_string (result, QCDM_CMD_SW_VERSION_ITEM_COMP_TIME, tmp);
+
+    return result;
+}
+
+/**********************************************************************/
+
+gsize
 qcdm_cmd_nv_get_mdn_new (char *buf, gsize len, guint8 profile, GError **error)
 {
     char cmdbuf[sizeof (DMCmdNVReadWrite) + DIAG_TRAILER_LEN];
diff --git a/libqcdm/src/commands.h b/libqcdm/src/commands.h
index 4ca7909e..bc19334c 100644
--- a/libqcdm/src/commands.h
+++ b/libqcdm/src/commands.h
@@ -71,6 +71,24 @@ QCDMResult *qcdm_cmd_cdma_status_result (const char *buf,
 
 /**********************************************************************/
 
+/* NOTE: this command does not appear to be implemented in recent
+ * devices and probably returns (QCDM_COMMAND_ERROR, QCDM_COMMAND_BAD_COMMAND).
+ */
+
+#define QCDM_CMD_SW_VERSION_ITEM_VERSION   "version"
+#define QCDM_CMD_SW_VERSION_ITEM_COMP_DATE "comp-date"
+#define QCDM_CMD_SW_VERSION_ITEM_COMP_TIME "comp-time"
+
+gsize       qcdm_cmd_sw_version_new    (char *buf,
+                                        gsize len,
+                                        GError **error);
+
+QCDMResult *qcdm_cmd_sw_version_result (const char *buf,
+                                        gsize len,
+                                        GError **error);
+
+/**********************************************************************/
+
 #define QCDM_CMD_NV_GET_MDN_ITEM_PROFILE "profile"
 #define QCDM_CMD_NV_GET_MDN_ITEM_MDN "mdn"
 
diff --git a/libqcdm/src/dm-commands.h b/libqcdm/src/dm-commands.h
index 5bb05b35..f575b7ef 100644
--- a/libqcdm/src/dm-commands.h
+++ b/libqcdm/src/dm-commands.h
@@ -210,6 +210,14 @@ struct DMCmdStatusRsp {
 } __attribute__ ((packed));
 typedef struct DMCmdStatusRsp DMCmdStatusRsp;
 
+/* DIAG_CMD_SW_VERSION */
+struct DMCmdSwVersionRsp {
+    guint8 code;
+    char version[20];
+    char comp_date[11];
+    char comp_time[8];
+} __attribute__ ((packed));
+typedef struct DMCmdSwVersionRsp DMCmdSwVersionRsp;
 
 #endif  /* LIBQCDM_DM_COMMANDS_H */
 
diff --git a/libqcdm/tests/test-qcdm-com.c b/libqcdm/tests/test-qcdm-com.c
index 89f3007e..b9de598b 100644
--- a/libqcdm/tests/test-qcdm-com.c
+++ b/libqcdm/tests/test-qcdm-com.c
@@ -29,6 +29,7 @@
 #include "utils.h"
 #include "result.h"
 #include "commands.h"
+#include "error.h"
 
 typedef struct {
     char *port;
@@ -393,3 +394,48 @@ test_com_status (void *f, void *data)
     qcdm_result_unref (result);
 }
 
+void
+test_com_sw_version (void *f, void *data)
+{
+    TestComData *d = data;
+    gboolean success;
+    GError *error = NULL;
+    char buf[100];
+    gint len;
+    QCDMResult *result;
+    gsize reply_len;
+
+    len = qcdm_cmd_sw_version_new (buf, sizeof (buf), NULL);
+    g_assert (len == 4);
+
+    /* Send the command */
+    success = send_command (d, buf, len);
+    g_assert (success);
+
+    /* Get a response */
+    reply_len = wait_reply (d, buf, sizeof (buf));
+
+    /* Parse the response into a result structure */
+    result = qcdm_cmd_sw_version_result (buf, reply_len, &error);
+
+    /* Recent devices don't appear to implement this command */
+    g_assert (result == NULL);
+    g_assert_error (error, QCDM_COMMAND_ERROR, QCDM_COMMAND_BAD_COMMAND);
+
+/*
+    str = NULL;
+    qcdm_result_get_string (result, QCDM_CMD_SW_VERSION_ITEM_VERSION, &str);
+    g_message ("%s: SW Version: %s", __func__, str);
+
+    str = NULL;
+    qcdm_result_get_string (result, QCDM_CMD_SW_VERSION_ITEM_COMP_DATE, &str);
+    g_message ("%s: Compiled Date: %s", __func__, str);
+
+    str = NULL;
+    qcdm_result_get_string (result, QCDM_CMD_SW_VERSION_ITEM_COMP_TIME, &str);
+    g_message ("%s: Compiled Time: %s", __func__, str);
+
+    qcdm_result_unref (result);
+*/
+}
+
diff --git a/libqcdm/tests/test-qcdm-com.h b/libqcdm/tests/test-qcdm-com.h
index 93a43dcc..e30105cd 100644
--- a/libqcdm/tests/test-qcdm-com.h
+++ b/libqcdm/tests/test-qcdm-com.h
@@ -31,5 +31,7 @@ void test_com_mdn (void *f, void *data);
 
 void test_com_status (void *f, void *data);
 
+void test_com_sw_version (void *f, void *data);
+
 #endif  /* TEST_QCDM_COM_H */
 
diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c
index 65653f3c..a7da047e 100644
--- a/libqcdm/tests/test-qcdm.c
+++ b/libqcdm/tests/test-qcdm.c
@@ -93,6 +93,7 @@ int main (int argc, char **argv)
         g_test_suite_add (suite, TESTCASE (test_com_esn, data->com_data));
         g_test_suite_add (suite, TESTCASE (test_com_mdn, data->com_data));
         g_test_suite_add (suite, TESTCASE (test_com_status, data->com_data));
+        g_test_suite_add (suite, TESTCASE (test_com_sw_version, data->com_data));
     }
 
 	result = g_test_run ();