colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcdm: GSM MCC, MNC, LAC and CI don't seem to valid in WCDMA mode

Browse Source 
So don't bother trying to parse them.
This commit is contained in:
Dan Williams
2012-01-18 13:44:20 -06:00
parent e08e46fb1a
commit 43e6039cee
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libqcdm/src/commands.c
View File

@@ -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))) if (imxi_to_bcd_string (rsp->imsi, imxi, sizeof (imxi)))
qcdm_result_add_string (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_IMSI, 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_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_OP_MODE, rsp->cm_opmode);
qcdm_result_add_u8 (result, QCDM_CMD_GSM_SUBSYS_STATE_INFO_ITEM_CM_SYS_MODE, rsp->cm_sysmode); 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; return result;
} }