qcdm: add Novatel Modem Snapshot command support

3 files changed, 299 insertions, 7 deletions

diff --git a/libqcdm/src/commands.c b/libqcdm/src/commands.c
index 6bdaff06..ab2786f7 100644
--- a/libqcdm/src/commands.c
+++ b/libqcdm/src/commands.c
@@ -911,3 +911,157 @@ qcdm_cmd_zte_subsys_status_result (const char *buf, gsize len, GError **error)
 
 /**********************************************************************/
 
+gsize
+qcdm_cmd_nw_subsys_modem_snapshot_cdma_new (char *buf,
+                                            gsize len,
+                                            guint8 chipset,
+                                            GError **error)
+{
+    char cmdbuf[sizeof (DMCmdSubsysNwSnapshotReq) + 2];
+    DMCmdSubsysNwSnapshotReq *cmd = (DMCmdSubsysNwSnapshotReq *) &cmdbuf[0];
+
+    g_return_val_if_fail (buf != NULL, 0);
+    g_return_val_if_fail (len >= sizeof (*cmd) + DIAG_TRAILER_LEN, 0);
+
+    /* Validate chipset */
+    if (chipset != QCDM_NW_CHIPSET_6500 && chipset != QCDM_NW_CHIPSET_6800) {
+        g_set_error (error, QCDM_COMMAND_ERROR, QCDM_COMMAND_BAD_PARAMETER,
+                     "Unknown Novatel chipset 0x%X",
+                     chipset);
+        return 0;
+    }
+
+    memset (cmd, 0, sizeof (*cmd));
+    cmd->hdr.code = DIAG_CMD_SUBSYS;
+    switch (chipset) {
+    case QCDM_NW_CHIPSET_6500:
+        cmd->hdr.subsys_id = DIAG_SUBSYS_NW_CONTROL_6500;
+        break;
+    case QCDM_NW_CHIPSET_6800:
+        cmd->hdr.subsys_id = DIAG_SUBSYS_NW_CONTROL_6800;
+        break;
+    default:
+        g_assert_not_reached ();
+    }
+    cmd->hdr.subsys_cmd = GUINT16_TO_LE (DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT);
+    cmd->technology = DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT_TECH_CDMA_EVDO;
+    cmd->snapshot_mask = GUINT32_TO_LE (0xFFFF);
+
+    return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);
+}
+
+QCDMResult *
+qcdm_cmd_nw_subsys_modem_snapshot_cdma_result (const char *buf, gsize len, GError **error)
+{
+    QCDMResult *result = NULL;
+    DMCmdSubsysNwSnapshotRsp *rsp = (DMCmdSubsysNwSnapshotRsp *) buf;
+    DMCmdSubsysNwSnapshotCdma *cdma = (DMCmdSubsysNwSnapshotCdma *) &rsp->data;
+    guint32 num;
+    guint8 num8;
+
+    g_return_val_if_fail (buf != NULL, NULL);
+
+    if (!check_command (buf, len, DIAG_CMD_SUBSYS, sizeof (DMCmdSubsysNwSnapshotRsp), error))
+        return NULL;
+
+    /* FIXME: check response_code when we know what it means */
+
+    result = qcdm_result_new ();
+
+    num = GUINT32_FROM_LE (cdma->rssi);
+    qcdm_result_add_uint32 (result, QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_RSSI, num);
+
+    num8 = QCDM_CDMA_PREV_UNKNOWN;
+    switch (cdma->prev) {
+    case CDMA_PREV_IS_95:
+        num8 = QCDM_CDMA_PREV_IS_95;
+        break;
+    case CDMA_PREV_IS_95A:
+        num8 = QCDM_CDMA_PREV_IS_95A;
+        break;
+    case CDMA_PREV_IS_95A_TSB74:
+        num8 = QCDM_CDMA_PREV_IS_95A_TSB74;
+        break;
+    case CDMA_PREV_IS_95B_PHASE1:
+        num8 = QCDM_CDMA_PREV_IS_95B_PHASE1;
+        break;
+    case CDMA_PREV_IS_95B_PHASE2:
+        num8 = QCDM_CDMA_PREV_IS_95B_PHASE2;
+        break;
+    case CDMA_PREV_IS2000_REL0:
+        num8 = QCDM_CDMA_PREV_IS2000_REL0;
+        break;
+    case CDMA_PREV_IS2000_RELA:
+        num8 = QCDM_CDMA_PREV_IS2000_RELA;
+        break;
+    default:
+        break;
+    }
+    qcdm_result_add_uint8 (result, QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_PREV, num8);
+
+    num8 = QCDM_CDMA_BAND_CLASS_UNKNOWN;
+    switch (cdma->band_class) {
+    case CDMA_BAND_CLASS_0_CELLULAR_800:
+        num8 = QCDM_CDMA_BAND_CLASS_0_CELLULAR_800;
+        break;
+    case CDMA_BAND_CLASS_1_PCS:
+        num8 = QCDM_CDMA_BAND_CLASS_1_PCS;
+        break;
+    case CDMA_BAND_CLASS_2_TACS:
+        num8 = QCDM_CDMA_BAND_CLASS_2_TACS;
+        break;
+    case CDMA_BAND_CLASS_3_JTACS:
+        num8 = QCDM_CDMA_BAND_CLASS_3_JTACS;
+        break;
+    case CDMA_BAND_CLASS_4_KOREAN_PCS:
+        num8 = QCDM_CDMA_BAND_CLASS_4_KOREAN_PCS;
+        break;
+    case CDMA_BAND_CLASS_5_NMT450:
+        num8 = QCDM_CDMA_BAND_CLASS_5_NMT450;
+        break;
+    case CDMA_BAND_CLASS_6_IMT2000:
+        num8 = QCDM_CDMA_BAND_CLASS_6_IMT2000;
+        break;
+    case CDMA_BAND_CLASS_7_CELLULAR_700:
+        num8 = QCDM_CDMA_BAND_CLASS_7_CELLULAR_700;
+        break;
+    case CDMA_BAND_CLASS_8_1800:
+        num8 = QCDM_CDMA_BAND_CLASS_8_1800;
+        break;
+    case CDMA_BAND_CLASS_9_900:
+        num8 = QCDM_CDMA_BAND_CLASS_9_900;
+        break;
+    case CDMA_BAND_CLASS_10_SECONDARY_800:
+        num8 = QCDM_CDMA_BAND_CLASS_10_SECONDARY_800;
+        break;
+    case CDMA_BAND_CLASS_11_PAMR_400:
+        num8 = QCDM_CDMA_BAND_CLASS_11_PAMR_400;
+        break;
+    case CDMA_BAND_CLASS_12_PAMR_800:
+        num8 = QCDM_CDMA_BAND_CLASS_12_PAMR_800;
+        break;
+    default:
+        break;
+    }
+    qcdm_result_add_uint8 (result, QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_BAND_CLASS, num8);
+
+    qcdm_result_add_uint8 (result, QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_ERI, cdma->eri);
+
+    num8 = QCDM_HDR_REV_UNKNOWN;
+    switch (cdma->hdr_rev) {
+    case 0:
+        num8 = QCDM_HDR_REV_0;
+        break;
+    case 1:
+        num8 = QCDM_HDR_REV_A;
+        break;
+    default:
+        break;
+    }
+    qcdm_result_add_uint8 (result, QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_HDR_REV, num8);
+
+    return result;
+}
+
+/**********************************************************************/
+
diff --git a/libqcdm/src/commands.h b/libqcdm/src/commands.h
index 9481fe68..75e83a7a 100644
--- a/libqcdm/src/commands.h
+++ b/libqcdm/src/commands.h
@@ -24,6 +24,44 @@
 
 /**********************************************************************/
 
+/* Generic enums */
+
+enum {
+    QCDM_CDMA_PREV_UNKNOWN       = 0,
+    QCDM_CDMA_PREV_IS_95         = 1, /* and J_STD008 */
+    QCDM_CDMA_PREV_IS_95A        = 2,
+    QCDM_CDMA_PREV_IS_95A_TSB74  = 3,
+    QCDM_CDMA_PREV_IS_95B_PHASE1 = 4,
+    QCDM_CDMA_PREV_IS_95B_PHASE2 = 5,
+    QCDM_CDMA_PREV_IS2000_REL0   = 6,
+    QCDM_CDMA_PREV_IS2000_RELA   = 7
+};
+
+enum {
+    QCDM_CDMA_BAND_CLASS_UNKNOWN          = 0,
+    QCDM_CDMA_BAND_CLASS_0_CELLULAR_800   = 1,  /* US cellular 850MHz */
+    QCDM_CDMA_BAND_CLASS_1_PCS            = 2,  /* US PCS 1900MHz */
+    QCDM_CDMA_BAND_CLASS_2_TACS           = 3,
+    QCDM_CDMA_BAND_CLASS_3_JTACS          = 4,  /* Japanese TACS */
+    QCDM_CDMA_BAND_CLASS_4_KOREAN_PCS     = 5,
+    QCDM_CDMA_BAND_CLASS_5_NMT450         = 6,
+    QCDM_CDMA_BAND_CLASS_6_IMT2000        = 7,  /* 2100HMz */
+    QCDM_CDMA_BAND_CLASS_7_CELLULAR_700   = 8,
+    QCDM_CDMA_BAND_CLASS_8_1800           = 9,
+    QCDM_CDMA_BAND_CLASS_9_900            = 10,
+    QCDM_CDMA_BAND_CLASS_10_SECONDARY_800 = 11,
+    QCDM_CDMA_BAND_CLASS_11_PAMR_400      = 12,
+    QCDM_CDMA_BAND_CLASS_12_PAMR_800      = 13
+};
+
+enum {
+    QCDM_HDR_REV_UNKNOWN = 0x00,
+    QCDM_HDR_REV_0 = 0x01,
+    QCDM_HDR_REV_A = 0x02
+};
+
+/**********************************************************************/
+
 #define QCDM_CMD_VERSION_INFO_ITEM_COMP_DATE "comp-date"
 #define QCDM_CMD_VERSION_INFO_ITEM_COMP_TIME "comp-time"
 #define QCDM_CMD_VERSION_INFO_ITEM_RELEASE_DATE "release-date"
@@ -366,4 +404,34 @@ QCDMResult *qcdm_cmd_zte_subsys_status_result (const char *buf,
 
 /**********************************************************************/
 
+#define QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_RSSI       "rssi"
+
+/* One of QCDM_CDMA_PREV_* */
+#define QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_PREV       "prev"
+
+/* One of QCDM_CDMA_BAND_CLASS_* */
+#define QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_BAND_CLASS "band-class"
+
+#define QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_ERI        "eri"
+
+/* One of QCDM_HDR_REV_* */
+#define QCDM_CMD_NW_SUBSYS_MODEM_SNAPSHOT_CDMA_ITEM_HDR_REV    "hdr-rev"
+
+enum {
+    QCDM_NW_CHIPSET_UNKNOWN = 0,
+    QCDM_NW_CHIPSET_6500 = 1,
+    QCDM_NW_CHIPSET_6800 = 2,
+};
+
+gsize       qcdm_cmd_nw_subsys_modem_snapshot_cdma_new    (char *buf,
+                                                           gsize len,
+                                                           guint8 chipset,
+                                                           GError **error);
+
+QCDMResult *qcdm_cmd_nw_subsys_modem_snapshot_cdma_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 2faf6461..cfc98f79 100644
--- a/libqcdm/src/dm-commands.h
+++ b/libqcdm/src/dm-commands.h
@@ -137,22 +137,49 @@ enum {
 
 /* NW_CONTROL subsystem command codes (only for Novatel Wireless devices) */
 enum {
-    DIAG_SUBSYS_NW_CONTROL_AT_REQUEST   = 3, /* AT commands via diag */
-    DIAG_SUBSYS_NW_CONTROL_AT_RESPONSE  = 4,
-    DIAG_SUBSYS_NW_CONTROL_MODEM_STATUS = 7, /* Modem status */
-    DIAG_SUBSYS_NW_CONTROL_ERI          = 8, /* Extended Roaming Indicator */
-    DIAG_SUBSYS_NW_CONTROL_PRL          = 12,
+    DIAG_SUBSYS_NW_CONTROL_AT_REQUEST     = 3, /* AT commands via diag */
+    DIAG_SUBSYS_NW_CONTROL_AT_RESPONSE    = 4,
+    DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT = 7,
+    DIAG_SUBSYS_NW_CONTROL_ERI            = 8, /* Extended Roaming Indicator */
+    DIAG_SUBSYS_NW_CONTROL_PRL            = 12,
 };
 
 enum {
-    DIAG_SUBSYS_NW_CONTROL_MODEM_STATUS_CDMA = 7,
-    DIAG_SUBSYS_NW_CONTROL_MODEM_STATUS_WCDMA = 20,
+    DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT_TECH_CDMA_EVDO = 7,
+    DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT_TECH_WCDMA = 20,
 };
 
 enum {
     DIAG_SUBSYS_ZTE_STATUS = 0,
 };
 
+enum {
+    CDMA_PREV_UNKNOWN       = 0,
+    CDMA_PREV_IS_95         = 1, /* and J_STD008 */
+    CDMA_PREV_IS_95A        = 2,
+    CDMA_PREV_IS_95A_TSB74  = 3,
+    CDMA_PREV_IS_95B_PHASE1 = 4,
+    CDMA_PREV_IS_95B_PHASE2 = 5,
+    CDMA_PREV_IS2000_REL0   = 6,
+    CDMA_PREV_IS2000_RELA   = 7
+};
+
+enum {
+    CDMA_BAND_CLASS_0_CELLULAR_800   = 0,  /* US cellular 850MHz */
+    CDMA_BAND_CLASS_1_PCS            = 1,  /* US PCS 1900MHz */
+    CDMA_BAND_CLASS_2_TACS           = 2,
+    CDMA_BAND_CLASS_3_JTACS          = 3,  /* Japanese TACS */
+    CDMA_BAND_CLASS_4_KOREAN_PCS     = 4,
+    CDMA_BAND_CLASS_5_NMT450         = 5,
+    CDMA_BAND_CLASS_6_IMT2000        = 6,  /* 2100HMz */
+    CDMA_BAND_CLASS_7_CELLULAR_700   = 7,
+    CDMA_BAND_CLASS_8_1800           = 8,
+    CDMA_BAND_CLASS_9_900            = 9,
+    CDMA_BAND_CLASS_10_SECONDARY_800 = 10,
+    CDMA_BAND_CLASS_11_PAMR_400      = 11,
+    CDMA_BAND_CLASS_12_PAMR_800      = 12
+};
+
 /* Generic DM command header */
 struct DMCmdHeader {
     guint8 code;
@@ -296,5 +323,48 @@ struct DMCmdPilotSetsRsp {
 } __attribute__ ((packed));
 typedef struct DMCmdPilotSetsRsp DMCmdPilotSetsRsp;
 
+/* DIAG_SUBSYS_NW_CONTROL_* subsys command */
+struct DMCmdSubsysNwSnapshotReq {
+    DMCmdSubsysHeader hdr;
+    guint8 technology;        /* DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT_TECH_* */
+    guint32 snapshot_mask;
+} __attribute__ ((packed));
+typedef struct DMCmdSubsysNwSnapshotReq DMCmdSubsysNwSnapshotReq;
+
+/* DIAG_SUBSYS_NW_CONTROL_MODEM_SNAPSHOT response */
+struct DMCmdSubsysNwSnapshotRsp {
+    DMCmdSubsysHeader hdr;
+    guint8 response_code;
+    guint32 bitfield1;
+    guint32 bitfield2;
+    guint8 data[100];
+} __attribute__ ((packed));
+typedef struct DMCmdSubsysNwSnapshotRsp DMCmdSubsysNwSnapshotRsp;
+
+struct DMCmdSubsysNwSnapshotCdma {
+    guint32 rssi;
+    guint32 battery_level;
+    guint8 call_info;
+    guint8 new_sms_ind;
+    guint8 missed_calls;
+    guint32 voicemail_ind;
+    guint8 pkt_call_ctrl_state;
+    guint8 mip_rrp_err_code;
+    guint8 cur_packet_zone_id;
+    guint8 prev;
+    guint8 band_class;
+    guint8 eri;
+    guint8 eri_alert_id;
+    guint32 cur_call_total_time;
+    guint32 cur_call_active_time;
+    guint32 cur_call_tx_ip_bytes;
+    guint32 cur_call_rx_ip_bytes;
+    guint8 connection_status;
+    guint16 dominant_pn;
+    guint8 wdisable_mask;
+    guint8 hdr_rev;
+} __attribute__ ((packed));
+typedef struct DMCmdSubsysNwSnapshotCdma DMCmdSubsysNwSnapshotCdma;
+
 #endif  /* LIBQCDM_DM_COMMANDS_H */