diff options
| author | Dan Williams <dcbw@redhat.com> | 2012-01-18 13:44:20 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2012-01-18 13:44:20 -0600 |
| commit | 43e6039cee57f70b18119a8a68305ec8017f46fb (patch) | |
| tree | 10cd6c5e10a23e8d9f0c6367335b81291ddee895 /libqcdm | |
| parent | e08e46fb1a77c61c45cb4e350595fbfbb252d784 (diff) | |
qcdm: GSM MCC, MNC, LAC and CI don't seem to valid in WCDMA mode
So don't bother trying to parse them.
Diffstat (limited to 'libqcdm')
| -rw-r--r-- | libqcdm/src/commands.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/libqcdm/src/commands.c b/libqcdm/src/commands.c index 1d67603b..2b229af2 100644 --- a/libqcdm/src/commands.c +++ b/libqcdm/src/commands.c @@ -1738,28 +1738,32 @@ qcdm_cmd_gsm_subsys_state_info_result (const char *buf, size_t len, int *out_err if (imxi_to_bcd_string (rsp->imsi, imxi, sizeof (imxi))) qcdm_result_add_string (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_IMSI, imxi); - /* Quick convert BCD LAI into MCC/MNC/LAC */ - mcc = (rsp->lai[0] & 0xF) * 100; - mcc += ((rsp->lai[0] >> 4) & 0xF) * 10; - mcc += rsp->lai[1] & 0xF; - qcdm_result_add_u32 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_LAI_MCC, mcc); - - mnc = (rsp->lai[2] & 0XF) * 100; - mnc += ((rsp->lai[2] >> 4) & 0xF) * 10; - mnc3 = (rsp->lai[1] >> 4) & 0xF; - if (mnc3 != 0xF) - mnc += mnc3; - qcdm_result_add_u32 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_LAI_MNC, mnc); - - qcdm_result_add_u32 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_LAI_LAC, - le16toh (*(u_int16_t *)(&rsp->lai[3]))); - - qcdm_result_add_u32 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_CELLID, le16toh (rsp->cellid)); - qcdm_result_add_u8 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_CM_CALL_STATE, rsp->cm_call_state); qcdm_result_add_u8 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_CM_OP_MODE, rsp->cm_opmode); qcdm_result_add_u8 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_CM_SYS_MODE, rsp->cm_sysmode); + /* MCC/MNC, LAC, and CI don't seem to be valid when the modem is not in GSM mode */ + if ( rsp->cm_sysmode == QCDM_CMD_CM_SUBSYS_STATE_INFO_SYSTEM_MODE_GSM + || rsp->cm_sysmode == QCDM_CMD_CM_SUBSYS_STATE_INFO_SYSTEM_MODE_GW) { + /* Quick convert BCD LAI into MCC/MNC/LAC */ + mcc = (rsp->lai[0] & 0xF) * 100; + mcc += ((rsp->lai[0] >> 4) & 0xF) * 10; + mcc += rsp->lai[1] & 0xF; + qcdm_result_add_u32 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_LAI_MCC, mcc); + + mnc = (rsp->lai[2] & 0XF) * 100; + mnc += ((rsp->lai[2] >> 4) & 0xF) * 10; + mnc3 = (rsp->lai[1] >> 4) & 0xF; + if (mnc3 != 0xF) + mnc += mnc3; + qcdm_result_add_u32 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_LAI_MNC, mnc); + + qcdm_result_add_u32 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_LAI_LAC, + le16toh (*(u_int16_t *)(&rsp->lai[3]))); + + qcdm_result_add_u32 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_CELLID, le16toh (rsp->cellid)); + } + return result; } |