qcdm: add ZTE signal strength request

6 files changed, 103 insertions, 0 deletions

diff --git a/libqcdm/src/commands.c b/libqcdm/src/commands.c
index 58aa4906..f738d4bf 100644
--- a/libqcdm/src/commands.c
+++ b/libqcdm/src/commands.c
@@ -749,3 +749,40 @@ qcdm_cmd_hdr_subsys_state_info_result (const char *buf, gsize len, GError **erro
 
 /**********************************************************************/
 
+gsize
+qcdm_cmd_zte_subsys_status_new (char *buf, gsize len, GError **error)
+{
+    char cmdbuf[sizeof (DMCmdSubsysHeader) + 2];
+    DMCmdSubsysHeader *cmd = (DMCmdSubsysHeader *) &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_SUBSYS;
+    cmd->subsys_id = DIAG_SUBSYS_ZTE;
+    cmd->subsys_cmd = GUINT16_TO_LE (DIAG_SUBSYS_ZTE_STATUS);
+
+    return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);
+}
+
+QCDMResult *
+qcdm_cmd_zte_subsys_status_result (const char *buf, gsize len, GError **error)
+{
+    QCDMResult *result = NULL;
+    DMCmdSubsysZteStatusRsp *rsp = (DMCmdSubsysZteStatusRsp *) buf;
+
+    g_return_val_if_fail (buf != NULL, NULL);
+
+    if (!check_command (buf, len, DIAG_CMD_SUBSYS, sizeof (DMCmdSubsysZteStatusRsp), error))
+        return NULL;
+
+    result = qcdm_result_new ();
+
+    qcdm_result_add_uint8 (result, QCDM_CMD_ZTE_SUBSYS_STATUS_ITEM_SIGNAL_INDICATOR, rsp->signal_ind);
+
+    return result;
+}
+
+/**********************************************************************/
+
diff --git a/libqcdm/src/commands.h b/libqcdm/src/commands.h
index 8e739edd..820dbe4b 100644
--- a/libqcdm/src/commands.h
+++ b/libqcdm/src/commands.h
@@ -311,4 +311,16 @@ QCDMResult *qcdm_cmd_hdr_subsys_state_info_result (const char *buf,
 
 /**********************************************************************/
 
+#define QCDM_CMD_ZTE_SUBSYS_STATUS_ITEM_SIGNAL_INDICATOR    "signal-indicator"
+
+gsize       qcdm_cmd_zte_subsys_status_new    (char *buf,
+                                               gsize len,
+                                               GError **error);
+
+QCDMResult *qcdm_cmd_zte_subsys_status_result (const char *buf,
+                                               gsize len,
+                                               GError **error);
+
+/**********************************************************************/
+
 #endif  /* LIBQCDM_COMMANDS_H */
diff --git a/libqcdm/src/dm-commands.h b/libqcdm/src/dm-commands.h
index bad9e932..e7ad4d36 100644
--- a/libqcdm/src/dm-commands.h
+++ b/libqcdm/src/dm-commands.h
@@ -122,6 +122,7 @@ enum {
     DIAG_SUBSYS_SMS             = 14,
     DIAG_SUBSYS_CM              = 15, /* Call manager */
     DIAG_SUBSYS_NW_CONTROL_6500 = 50, /* for Novatel Wireless MSM6500-based devices */
+    DIAG_SUBSYS_ZTE             = 101, /* for ZTE EVDO devices */
     DIAG_SUBSYS_NW_CONTROL_6800 = 250 /* for Novatel Wireless MSM6800-based devices */
 };
 
@@ -148,6 +149,10 @@ enum {
     DIAG_SUBSYS_NW_CONTROL_MODEM_STATUS_WCDMA = 20,
 };
 
+enum {
+    DIAG_SUBSYS_ZTE_STATUS = 0,
+};
+
 /* Generic DM command header */
 struct DMCmdHeader {
     guint8 code;
@@ -250,5 +255,15 @@ struct DMCmdSubsysHDRStateInfoRsp {
 } __attribute__ ((packed));
 typedef struct DMCmdSubsysHDRStateInfoRsp DMCmdSubsysHDRStateInfoRsp;
 
+
+/* DIAG_SUBSYS_ZTE_STATUS subsys command */
+struct DMCmdSubsysZteStatusRsp {
+    DMCmdSubsysHeader header;
+    guint8 _unknown1[8];
+    guint8 signal_ind;
+    guint8 _unknown2;
+} __attribute__ ((packed));
+typedef struct DMCmdSubsysZteStatusRsp DMCmdSubsysZteStatusRsp;
+
 #endif  /* LIBQCDM_DM_COMMANDS_H */
 
diff --git a/libqcdm/tests/test-qcdm-com.c b/libqcdm/tests/test-qcdm-com.c
index f24ef1e4..8b5fe90b 100644
--- a/libqcdm/tests/test-qcdm-com.c
+++ b/libqcdm/tests/test-qcdm-com.c
@@ -895,3 +895,39 @@ test_com_hdr_subsys_state_info (void *f, void *data)
     qcdm_result_unref (result);
 }
 
+void
+test_com_zte_subsys_status (void *f, void *data)
+{
+    TestComData *d = data;
+    gboolean success;
+    GError *error = NULL;
+    char buf[100];
+    gint len;
+    QCDMResult *result;
+    gsize reply_len;
+    guint8 ind = 0;
+
+    len = qcdm_cmd_zte_subsys_status_new (buf, sizeof (buf), NULL);
+    g_assert (len == 7);
+
+    /* 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_zte_subsys_status_result (buf, reply_len, &error);
+    if (!result) {
+        /* Obviously not all devices implement this command */
+        g_assert_error (error, QCDM_COMMAND_ERROR, QCDM_COMMAND_BAD_COMMAND);
+        return;
+    }
+
+    qcdm_result_get_uint8 (result, QCDM_CMD_ZTE_SUBSYS_STATUS_ITEM_SIGNAL_INDICATOR, &ind);
+    g_message ("%s: Signal Indicator: %d", __func__, ind);
+
+    qcdm_result_unref (result);
+}
+
diff --git a/libqcdm/tests/test-qcdm-com.h b/libqcdm/tests/test-qcdm-com.h
index 6903df0d..d9f4ee75 100644
--- a/libqcdm/tests/test-qcdm-com.h
+++ b/libqcdm/tests/test-qcdm-com.h
@@ -41,5 +41,7 @@ void test_com_cm_subsys_state_info (void *f, void *data);
 
 void test_com_hdr_subsys_state_info (void *f, void *data);
 
+void test_com_zte_subsys_status (void *f, void *data);
+
 #endif  /* TEST_QCDM_COM_H */
 
diff --git a/libqcdm/tests/test-qcdm.c b/libqcdm/tests/test-qcdm.c
index fbef7edc..01535cac 100644
--- a/libqcdm/tests/test-qcdm.c
+++ b/libqcdm/tests/test-qcdm.c
@@ -98,6 +98,7 @@ int main (int argc, char **argv)
         g_test_suite_add (suite, TESTCASE (test_com_sw_version, data->com_data));
         g_test_suite_add (suite, TESTCASE (test_com_cm_subsys_state_info, data->com_data));
         g_test_suite_add (suite, TESTCASE (test_com_hdr_subsys_state_info, data->com_data));
+        g_test_suite_add (suite, TESTCASE (test_com_zte_subsys_status, data->com_data));
     }
 
 	result = g_test_run ();