3 files changed, 103 insertions, 0 deletions

diff --git a/libqcdm/src/commands.c b/libqcdm/src/commands.c
index 41356935..97817202 100644
--- a/libqcdm/src/commands.c
+++ b/libqcdm/src/commands.c
@@ -219,6 +219,74 @@ qcdm_cmd_esn_result (const char *buf, gsize len, GError **error)
 /**********************************************************************/
 
 gsize
+qcdm_cmd_cdma_status_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_STATUS;
+
+    return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);
+}
+
+QCDMResult *
+qcdm_cmd_cdma_status_result (const char *buf, gsize len, GError **error)
+{
+    QCDMResult *result = NULL;
+    DMCmdStatusRsp *rsp = (DMCmdStatusRsp *) buf;
+    char *tmp;
+    guint8 swapped[4];
+    guint32 tmp_num;
+
+    g_return_val_if_fail (buf != NULL, NULL);
+
+    if (!check_command (buf, len, DIAG_CMD_STATUS, sizeof (DMCmdStatusRsp), error))
+        return NULL;
+
+    result = qcdm_result_new ();
+
+    /* Convert the ESN from binary to a hex string; it's LE so we have to
+     * swap it to get the correct ordering.
+     */
+    swapped[0] = rsp->esn[3];
+    swapped[1] = rsp->esn[2];
+    swapped[2] = rsp->esn[1];
+    swapped[3] = rsp->esn[0];
+
+    tmp = bin2hexstr (&swapped[0], sizeof (swapped));
+    qcdm_result_add_string (result, QCDM_CMD_CDMA_STATUS_ITEM_ESN, tmp);
+    g_free (tmp);
+
+    tmp_num = (guint32) GUINT16_FROM_LE (rsp->cdma_rx_state);
+    qcdm_result_add_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_RX_STATE, tmp_num);
+
+    tmp_num = (guint32) GUINT16_FROM_LE (rsp->entry_reason);
+    qcdm_result_add_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_ENTRY_REASON, tmp_num);
+
+    tmp_num = (guint32) GUINT16_FROM_LE (rsp->curr_chan);
+    qcdm_result_add_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_CURRENT_CHANNEL, tmp_num);
+
+    qcdm_result_add_uint8 (result, QCDM_CMD_CDMA_STATUS_ITEM_CODE_CHANNEL, rsp->cdma_code_chan);
+
+    tmp_num = (guint32) GUINT16_FROM_LE (rsp->pilot_base);
+    qcdm_result_add_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_PILOT_BASE, tmp_num);
+
+    tmp_num = (guint32) GUINT16_FROM_LE (rsp->sid);
+    qcdm_result_add_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_RX_STATE, tmp_num);
+
+    tmp_num = (guint32) GUINT16_FROM_LE (rsp->nid);
+    qcdm_result_add_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_RX_STATE, tmp_num);
+
+    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 8e62b7ef..4ca7909e 100644
--- a/libqcdm/src/commands.h
+++ b/libqcdm/src/commands.h
@@ -52,6 +52,25 @@ QCDMResult *qcdm_cmd_esn_result (const char *buf,
 
 /**********************************************************************/
 
+#define QCDM_CMD_CDMA_STATUS_ITEM_ESN             "esn"
+#define QCDM_CMD_CDMA_STATUS_ITEM_RX_STATE        "rx-state"
+#define QCDM_CMD_CDMA_STATUS_ITEM_ENTRY_REASON    "entry-reason"
+#define QCDM_CMD_CDMA_STATUS_ITEM_CURRENT_CHANNEL "current-channel"
+#define QCDM_CMD_CDMA_STATUS_ITEM_CODE_CHANNEL    "code-channel"
+#define QCDM_CMD_CDMA_STATUS_ITEM_PILOT_BASE      "pilot-base"
+#define QCDM_CMD_CDMA_STATUS_ITEM_SID             "sid"
+#define QCDM_CMD_CDMA_STATUS_ITEM_NID             "nid"
+
+gsize       qcdm_cmd_cdma_status_new    (char *buf,
+                                         gsize len,
+                                         GError **error);
+
+QCDMResult *qcdm_cmd_cdma_status_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 9a2c3fe7..c7380bb2 100644
--- a/libqcdm/src/dm-commands.h
+++ b/libqcdm/src/dm-commands.h
@@ -190,5 +190,21 @@ struct DMCmdEsnRsp {
 } __attribute__ ((packed));
 typedef struct DMCmdEsnRsp DMCmdEsnRsp;
 
+/* DIAG_CMD_STATUS */
+struct DMCmdStatusRsp {
+    guint8 code;
+    guint8 _unknown[3];
+    guint8 esn[4];
+    guint16 cdma_rx_state;
+    guint16 entry_reason;
+    guint16 curr_chan;
+    guint8 cdma_code_chan;
+    guint16 pilot_base;
+    guint16 sid;
+    guint16 nid;
+} __attribute__ ((packed));
+typedef struct DMCmdStatusRsp DMCmdStatusRsp;
+
+
 #endif  /* LIBQCDM_DM_COMMANDS_H */