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

broadband-modem-qmi: try to use Band Preference for current caps if available

Browse Source 
The "NAS Get System Selection Preference" response may come without "Mode
Preference". If that is found, look for "Band Preference" and "LTE Band
Preference" TLVs and try to build capabilities from those.

This makes my UML290 properly report CDMA/EVDO+LTE capabilities:

ModemManager[16586]: [/dev/cdc-wdm0] Received message...
>>>>>> QMUX:
>>>>>>   length  = 55
>>>>>>   flags   = 0x80
>>>>>>   service = "nas"
>>>>>>   client  = 1
>>>>>> QMI:
>>>>>>   flags       = "response"
>>>>>>   transaction = 1
>>>>>>   tlv_length  = 43
>>>>>>   message     = "Get System Selection Preference" (0x0034)
>>>>>> TLV:
>>>>>>   type       = "Result" (0x02)
>>>>>>   length     = 4
>>>>>>   value      = 00:00:00:00
>>>>>>   translated = SUCCESS
>>>>>> TLV:
>>>>>>   type       = "Emergency mode" (0x10)
>>>>>>   length     = 1
>>>>>>   value      = 00
>>>>>>   translated = 0
>>>>>> TLV:
>>>>>>   type       = "Band Preference" (0x12)
>>>>>>   length     = 8
>>>>>>   value      = 07:00:00:00:00:00:00:00
>>>>>>   translated = 7
>>>>>> TLV:
>>>>>>   type       = "CDMA PRL Preference" (0x13)
>>>>>>   length     = 2
>>>>>>   value      = FF:3F
>>>>>>   translated = 16383
>>>>>> TLV:
>>>>>>   type       = "Roaming Preference" (0x14)
>>>>>>   length     = 2
>>>>>>   value      = FF:00
>>>>>>   translated = 255
>>>>>> TLV:
>>>>>>   type       = "LTE Band Preference" (0x15)
>>>>>>   length     = 8
>>>>>>   value      = 00:00:00:00:00:00:00:00
>>>>>>   translated = 0
ModemManager[16586]: KEY: 01:00:01:03:00:00:00:00
ModemManager[16586]:   Service: 03
ModemManager[16586]:   Client ID: 01
ModemManager[16586]:   Transaction ID: 01:00
ModemManager[16586]: <debug> [1347005734.979115] [mm-broadband-modem-qmi.c:321] load_current_capabilities_get_system_selection_preference_ready(): Mode preference not reported in system selection preference
ModemManager[16586]: <debug> [1347005734.979131] [mm-broadband-modem-qmi.c:333] load_current_capabilities_get_system_selection_preference_ready(): Valid bands reported in system selection preference: 'bc-0-a-system, bc-0-b-system, bc-1-all-blocks'
ModemManager[16586]: <debug> [1347005734.979141] [mm-broadband-modem-qmi.c:341] load_current_capabilities_get_system_selection_preference_ready(): LTE band preference found
ModemManager[16586]: [/dev/cdc-wdm0] Sending message...
<<<<<< QMUX:
<<<<<<   length  = 12
<<<<<<   flags   = 0x00
<<<<<<   service = "dms"
<<<<<<   client  = 1
<<<<<< QMI:
<<<<<<   flags       = "none"
<<<<<<   transaction = 1
<<<<<<   tlv_length  = 0
<<<<<<   message     = "Get Capabilities" (0x0020)
ModemManager[16586]: KEY: 01:00:01:02:00:00:00:00
ModemManager[16586]:   Service: 02
ModemManager[16586]:   Client ID: 01
ModemManager[16586]:   Transaction ID: 01:00
ModemManager[16586]: <debug> [1347005734.982676] [mm-at-serial-port.c:392] debug_log(): (ttyACM0): <-- '<CR><LF>OK<CR><LF>'
ModemManager[16586]: <debug> [1347005734.982751] [mm-serial-port.c:969] mm_serial_port_close(): (ttyACM0) device open count is 2 (close)
ModemManager[16586]: <debug> [1347005734.982797] [mm-at-serial-port.c:392] debug_log(): (ttyACM0): --> 'AT+CMEE=1<CR>'
ModemManager[16586]: [/dev/cdc-wdm0] Received message...
>>>>>> QMUX:
>>>>>>   length  = 38
>>>>>>   flags   = 0x80
>>>>>>   service = "dms"
>>>>>>   client  = 1
>>>>>> QMI:
>>>>>>   flags       = "response"
>>>>>>   transaction = 1
>>>>>>   tlv_length  = 26
>>>>>>   message     = "Get Capabilities" (0x0020)
>>>>>> TLV:
>>>>>>   type       = "Result" (0x02)
>>>>>>   length     = 4
>>>>>>   value      = 00:00:00:00
>>>>>>   translated = SUCCESS
>>>>>> TLV:
>>>>>>   type       = "Info" (0x01)
>>>>>>   length     = 16
>>>>>>   value      = B0:9D:57:00:00:DD:6D:00:03:02:05:01:02:04:05:08
>>>>>>   translated = [ max_tx_channel_rate = '5742000' max_rx_channel_rate = '7200000' data_service_capability = '3' sim_capability = '2' radio_interface_list = '{ [0] = '1 ' [1] = '2 ' [2] = '4 ' [3] = '5 ' [4] = '8 '}' ]
ModemManager[16586]: KEY: 01:00:01:02:00:00:00:00
ModemManager[16586]:   Service: 02
ModemManager[16586]:   Client ID: 01
ModemManager[16586]:   Transaction ID: 01:00
ModemManager[16586]: <debug> [1347005734.983353] [mm-broadband-modem-qmi.c:183] modem_load_current_capabilities_finish(): loaded current capabilities: cdma-evdo, lte
This commit is contained in:
Aleksander Morgado
2012-09-07 11:19:26 +02:00
parent c2952e0adc
commit 997848ef4f
3 changed files with 86 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-broadband-modem-qmi.c
+26
View File
@@ -316,7 +316,33 @@ load_current_capabilities_get_system_selection_preference_ready (QmiClientNas *c
output,
&mode_preference_mask,
NULL)) {
QmiNasBandPreference band_preference_mask;
mm_dbg ("Mode preference not reported in system selection preference");
if (qmi_message_nas_get_system_selection_preference_output_get_band_preference (
output,
&band_preference_mask,
NULL)) {
gchar *str;
str = qmi_nas_band_preference_build_string_from_mask (band_preference_mask);
ctx->capabilities = mm_modem_capability_from_qmi_band_preference (band_preference_mask);
mm_dbg ("%s bands reported in system selection preference: '%s'",
ctx->capabilities == MM_MODEM_CAPABILITY_NONE ? "Unsupported" : "Valid",
str);
g_free (str);
/* Just the presence of the LTE band preference tells us it's LTE */
if (qmi_message_nas_get_system_selection_preference_output_get_lte_band_preference (
output,
NULL,
NULL)) {
mm_dbg ("LTE band preference found");
ctx->capabilities |= MM_MODEM_CAPABILITY_LTE;
}
} else
mm_dbg ("Band preference not reported in system selection preference");
} else {
gchar *str;
src/mm-modem-helpers-qmi.c
+58
View File
@@ -687,6 +687,64 @@ mm_modem_capability_from_qmi_radio_technology_preference (QmiNasRadioTechnologyP
/*****************************************************************************/
#define ALL_3GPP2_BANDS \
(QMI_NAS_BAND_PREFERENCE_BC_0_A_SYSTEM | \
QMI_NAS_BAND_PREFERENCE_BC_0_B_SYSTEM | \
QMI_NAS_BAND_PREFERENCE_BC_1_ALL_BLOCKS | \
QMI_NAS_BAND_PREFERENCE_BC_2 | \
QMI_NAS_BAND_PREFERENCE_BC_3_A_SYSTEM | \
QMI_NAS_BAND_PREFERENCE_BC_4_ALL_BLOCKS | \
QMI_NAS_BAND_PREFERENCE_BC_5_ALL_BLOCKS | \
QMI_NAS_BAND_PREFERENCE_BC_6 | \
QMI_NAS_BAND_PREFERENCE_BC_7 | \
QMI_NAS_BAND_PREFERENCE_BC_8 | \
QMI_NAS_BAND_PREFERENCE_BC_9 | \
QMI_NAS_BAND_PREFERENCE_BC_10 | \
QMI_NAS_BAND_PREFERENCE_BC_11 | \
QMI_NAS_BAND_PREFERENCE_BC_12 | \
QMI_NAS_BAND_PREFERENCE_BC_14 | \
QMI_NAS_BAND_PREFERENCE_BC_15 | \
QMI_NAS_BAND_PREFERENCE_BC_16 | \
QMI_NAS_BAND_PREFERENCE_BC_17 | \
QMI_NAS_BAND_PREFERENCE_BC_18 | \
QMI_NAS_BAND_PREFERENCE_BC_19)
#define ALL_3GPP_BANDS \
(QMI_NAS_BAND_PREFERENCE_GSM_DCS_1800 | \
QMI_NAS_BAND_PREFERENCE_GSM_900_EXTENDED | \
QMI_NAS_BAND_PREFERENCE_GSM_900_PRIMARY | \
QMI_NAS_BAND_PREFERENCE_GSM_450 | \
QMI_NAS_BAND_PREFERENCE_GSM_480 | \
QMI_NAS_BAND_PREFERENCE_GSM_750 | \
QMI_NAS_BAND_PREFERENCE_GSM_850 | \
QMI_NAS_BAND_PREFERENCE_GSM_900_RAILWAYS | \
QMI_NAS_BAND_PREFERENCE_GSM_PCS_1900 | \
QMI_NAS_BAND_PREFERENCE_WCDMA_2100 | \
QMI_NAS_BAND_PREFERENCE_WCDMA_PCS_1900 | \
QMI_NAS_BAND_PREFERENCE_WCDMA_DCS_1800 | \
QMI_NAS_BAND_PREFERENCE_WCDMA_1700_US | \
QMI_NAS_BAND_PREFERENCE_WCDMA_850_US | \
QMI_NAS_BAND_PREFERENCE_WCDMA_800 | \
QMI_NAS_BAND_PREFERENCE_WCDMA_2600 | \
QMI_NAS_BAND_PREFERENCE_WCDMA_900 | \
QMI_NAS_BAND_PREFERENCE_WCDMA_1700_JAPAN)
MMModemCapability
mm_modem_capability_from_qmi_band_preference (QmiNasBandPreference qmi)
{
MMModemCapability caps = MM_MODEM_CAPABILITY_NONE;
if (qmi & ALL_3GPP_BANDS)
caps |= MM_MODEM_CAPABILITY_GSM_UMTS;
if (qmi & ALL_3GPP2_BANDS)
caps |= MM_MODEM_CAPABILITY_CDMA_EVDO;
return caps;
}
/*****************************************************************************/
MMModemMode
mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (QmiNasGsmWcdmaAcquisitionOrderPreference qmi)
{
src/mm-modem-helpers-qmi.h
+2
View File
@@ -56,6 +56,8 @@ MMModemCapability mm_modem_capability_from_qmi_rat_mode_preference (QmiNasRatMod
MMModemCapability mm_modem_capability_from_qmi_radio_technology_preference (QmiNasRadioTechnologyPreference qmi);
MMModemCapability mm_modem_capability_from_qmi_band_preference (QmiNasBandPreference qmi);
MMModemMode mm_modem_mode_from_qmi_gsm_wcdma_acquisition_order_preference (QmiNasGsmWcdmaAcquisitionOrderPreference qmi);
QmiNasGsmWcdmaAcquisitionOrderPreference mm_modem_mode_to_qmi_gsm_wcdma_acquisition_order_preference (MMModemMode mode);