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

samsung: allow getting more than one band

Browse Source
This commit is contained in:
Aleksander Morgado
2011-04-28 12:49:32 +02:00
parent bb827c3ef7
commit fc1f35baf6
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
plugins/mm-modem-samsung-gsm.c
View File

@@ -196,32 +196,31 @@ parse_ipbm (const char *reply, MMModemGsmBand *band)
if (sscanf (reply, "\"ANY\": %d\r\n\"EGSM\": %d\r\n\"DCS\": %d\r\n\"PCS\": %d\r\n\"G850\": %d\r\n\"FDD_BAND_I\": %d\r\n\"FDD_BAND_II\": %d\r\n\"FDD_BAND_III\": %d\r\n\"FDD_BAND_IV\": %d\r\n\"FDD_BAND_V\": %d\r\n\"FDD_BAND_VI\": %d\r\n\"FDD_BAND_VIII\": %d", &enable[0], &enable[1], &enable[2], &enable[3], &enable[4], &enable[5], &enable[6], &enable[7], &enable[8], &enable[9], &enable[10], &enable[11]) != 12) if (sscanf (reply, "\"ANY\": %d\r\n\"EGSM\": %d\r\n\"DCS\": %d\r\n\"PCS\": %d\r\n\"G850\": %d\r\n\"FDD_BAND_I\": %d\r\n\"FDD_BAND_II\": %d\r\n\"FDD_BAND_III\": %d\r\n\"FDD_BAND_IV\": %d\r\n\"FDD_BAND_V\": %d\r\n\"FDD_BAND_VI\": %d\r\n\"FDD_BAND_VIII\": %d", &enable[0], &enable[1], &enable[2], &enable[3], &enable[4], &enable[5], &enable[6], &enable[7], &enable[8], &enable[9], &enable[10], &enable[11]) != 12)
return FALSE; return FALSE;
*band = 0;
if (enable[5] == 1) if (enable[5] == 1)
*band = MM_MODEM_GSM_BAND_U2100; *band |= MM_MODEM_GSM_BAND_U2100;
else if (enable[6] == 1) if (enable[6] == 1)
*band = MM_MODEM_GSM_BAND_U1900; *band |= MM_MODEM_GSM_BAND_U1900;
else if (enable[7] == 1) if (enable[7] == 1)
*band = MM_MODEM_GSM_BAND_U1800; *band |= MM_MODEM_GSM_BAND_U1800;
else if (enable[8] == 1) if (enable[8] == 1)
*band = MM_MODEM_GSM_BAND_U17IV; *band |= MM_MODEM_GSM_BAND_U17IV;
else if (enable[9] == 1) if (enable[9] == 1)
*band = MM_MODEM_GSM_BAND_U850; *band |= MM_MODEM_GSM_BAND_U850;
else if (enable[10] == 1) if (enable[10] == 1)
*band = MM_MODEM_GSM_BAND_U800; *band |= MM_MODEM_GSM_BAND_U800;
else if (enable[11] == 1) if (enable[11] == 1)
*band = MM_MODEM_GSM_BAND_U900; *band |= MM_MODEM_GSM_BAND_U900;
else if (enable[1] == 1) if (enable[1] == 1)
*band = MM_MODEM_GSM_BAND_EGSM; *band |= MM_MODEM_GSM_BAND_EGSM;
else if (enable[2] == 1) if (enable[2] == 1)
*band = MM_MODEM_GSM_BAND_DCS; *band |= MM_MODEM_GSM_BAND_DCS;
else if (enable[3] == 1) if (enable[3] == 1)
*band = MM_MODEM_GSM_BAND_PCS; *band |= MM_MODEM_GSM_BAND_PCS;
else if (enable[4] == 1) if (enable[4] == 1)
*band = MM_MODEM_GSM_BAND_G850; *band |= MM_MODEM_GSM_BAND_G850;
else
*band = MM_MODEM_GSM_BAND_ANY;
return FALSE; return (*band > 0 ? TRUE : FALSE);
} }
static void static void