diff options
-rw-r--r-- | libqcdm/src/commands.c | 68 | ||||
-rw-r--r-- | libqcdm/src/commands.h | 19 | ||||
-rw-r--r-- | libqcdm/src/dm-commands.h | 16 | ||||
-rw-r--r-- | libqcdm/tests/test-qcdm-com.c | 112 | ||||
-rw-r--r-- | libqcdm/tests/test-qcdm-com.h | 10 | ||||
-rw-r--r-- | libqcdm/tests/test-qcdm.c | 9 |
6 files changed, 220 insertions, 14 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 */ diff --git a/libqcdm/tests/test-qcdm-com.c b/libqcdm/tests/test-qcdm-com.c index 927fa1a4..89f3007e 100644 --- a/libqcdm/tests/test-qcdm-com.c +++ b/libqcdm/tests/test-qcdm-com.c @@ -199,16 +199,11 @@ wait_reply (TestComData *d, char *buf, gsize len) } void -test_com (void *f, void *data) +test_com_port_init (void *f, void *data) { TestComData *d = data; - gboolean success; GError *error = NULL; - char buf[512]; - const char *str; - gint len; - QCDMResult *result; - gsize reply_len; + gboolean success; success = qcdm_port_setup (d->fd, &error); if (!success) { @@ -218,8 +213,19 @@ test_com (void *f, void *data) error && error->message ? error->message : "(unknown)"); } g_assert (success); +} - /*** Get the device's firmware version information ***/ +void +test_com_version_info (void *f, void *data) +{ + TestComData *d = data; + gboolean success; + GError *error = NULL; + char buf[512]; + const char *str; + gint len; + QCDMResult *result; + gsize reply_len; len = qcdm_cmd_version_info_new (buf, sizeof (buf), NULL); g_assert (len == 4); @@ -256,8 +262,19 @@ test_com (void *f, void *data) g_message ("%s: Model: %s", __func__, str); qcdm_result_unref (result); +} - /*** Get the device's ESN ***/ +void +test_com_esn (void *f, void *data) +{ + TestComData *d = data; + gboolean success; + GError *error = NULL; + char buf[512]; + const char *str; + gint len; + QCDMResult *result; + gsize reply_len; len = qcdm_cmd_esn_new (buf, sizeof (buf), NULL); g_assert (len == 4); @@ -278,9 +295,19 @@ test_com (void *f, void *data) g_message ("%s: ESN: %s", __func__, str); qcdm_result_unref (result); +} - - /*** Get the device's phone number ***/ +void +test_com_mdn (void *f, void *data) +{ + TestComData *d = data; + gboolean success; + GError *error = NULL; + char buf[512]; + const char *str; + gint len; + QCDMResult *result; + gsize reply_len; len = qcdm_cmd_nv_get_mdn_new (buf, sizeof (buf), 0, NULL); g_assert (len > 0); @@ -303,3 +330,66 @@ test_com (void *f, void *data) qcdm_result_unref (result); } +void +test_com_status (void *f, void *data) +{ + TestComData *d = data; + gboolean success; + GError *error = NULL; + char buf[100]; + const char *str; + gint len; + QCDMResult *result; + gsize reply_len; + guint32 n32; + guint8 n8; + + len = qcdm_cmd_cdma_status_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_cdma_status_result (buf, reply_len, &error); + g_assert (result); + + str = NULL; + qcdm_result_get_string (result, QCDM_CMD_CDMA_STATUS_ITEM_ESN, &str); + g_message ("%s: ESN: %s", __func__, str); + + n32 = 0; + qcdm_result_get_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_RX_STATE, &n32); + g_message ("%s: CDMA RX State: %u", __func__, n32); + + n32 = 0; + qcdm_result_get_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_ENTRY_REASON, &n32); + g_message ("%s: Entry Reason: %u", __func__, n32); + + n32 = 0; + qcdm_result_get_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_CURRENT_CHANNEL, &n32); + g_message ("%s: Current Channel: %u", __func__, n32); + + n8 = 0; + qcdm_result_get_uint8 (result, QCDM_CMD_CDMA_STATUS_ITEM_CODE_CHANNEL, &n8); + g_message ("%s: Code Channel: %u", __func__, n8); + + n32 = 0; + qcdm_result_get_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_PILOT_BASE, &n32); + g_message ("%s: Pilot Base: %u", __func__, n32); + + n32 = 0; + qcdm_result_get_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_SID, &n32); + g_message ("%s: CDMA System ID: %u", __func__, n32); + + n32 = 0; + qcdm_result_get_uint32 (result, QCDM_CMD_CDMA_STATUS_ITEM_NID, &n32); + g_message ("%s: CDMA Network ID: %u", __func__, n32); + + qcdm_result_unref (result); +} + diff --git a/libqcdm/tests/test-qcdm-com.h b/libqcdm/tests/test-qcdm-com.h index 26067386..93a43dcc 100644 --- a/libqcdm/tests/test-qcdm-com.h +++ b/libqcdm/tests/test-qcdm-com.h @@ -21,7 +21,15 @@ gpointer test_com_setup (const char *port); void test_com_teardown (gpointer d); -void test_com (void *f, void *data); +void test_com_port_init (void *f, void *data); + +void test_com_version_info (void *f, void *data); + +void test_com_esn (void *f, void *data); + +void test_com_mdn (void *f, void *data); + +void test_com_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 c8581957..e6b0787a 100644 --- a/libqcdm/tests/test-qcdm.c +++ b/libqcdm/tests/test-qcdm.c @@ -83,8 +83,13 @@ int main (int argc, char **argv) g_test_suite_add (suite, TESTCASE (test_escape_unescape, NULL)); /* Live tests */ - if (port) - g_test_suite_add (suite, TESTCASE (test_com, data->com_data)); + if (port) { + g_test_suite_add (suite, TESTCASE (test_com_port_init, data->com_data)); + g_test_suite_add (suite, TESTCASE (test_com_version_info, data->com_data)); + 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)); + } result = g_test_run (); |