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

api: MMModemBand is now an enum, not flags

Browse Source 
We don't want to handle bands as flags, in order to avoid the need of 64-bits
for the enum. This change implies that setting allowed bands will be done by
giving an array of uint32 values, signature "au".
This commit is contained in:
Aleksander Morgado
2011-12-26 18:50:16 +01:00
parent a142a209ec
commit 9d7e3de4cd
11 changed files with 258 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
include/ModemManager-enums.h
View File

@@ -236,45 +236,45 @@ typedef enum { /*< underscore_name=mm_modem_mode >*/
* the device and the radio bands the device is allowed to use when
* connecting to a mobile network.
*/
typedef enum { /*< skip >*/
typedef enum { /*< underscore_name=mm_modem_band >*/
MM_MODEM_BAND_UNKNOWN = 0,
/* GSM/UMTS/3GPP bands */
MM_MODEM_BAND_EGSM = 1 << 0,
MM_MODEM_BAND_DCS = 1 << 1,
MM_MODEM_BAND_PCS = 1 << 2,
MM_MODEM_BAND_G850 = 1 << 3,
MM_MODEM_BAND_U2100 = 1 << 4,
MM_MODEM_BAND_U1800 = 1 << 5,
MM_MODEM_BAND_U17IV = 1 << 6,
MM_MODEM_BAND_U800 = 1 << 7,
MM_MODEM_BAND_U850 = 1 << 8,
MM_MODEM_BAND_U900 = 1 << 9,
MM_MODEM_BAND_U17IX = 1 << 10,
MM_MODEM_BAND_U1900 = 1 << 11,
MM_MODEM_BAND_U2600 = 1 << 12,
MM_MODEM_BAND_EGSM = 1,
MM_MODEM_BAND_DCS = 2,
MM_MODEM_BAND_PCS = 3,
MM_MODEM_BAND_G850 = 4,
MM_MODEM_BAND_U2100 = 5,
MM_MODEM_BAND_U1800 = 6,
MM_MODEM_BAND_U17IV = 7,
MM_MODEM_BAND_U800 = 8,
MM_MODEM_BAND_U850 = 9,
MM_MODEM_BAND_U900 = 10,
MM_MODEM_BAND_U17IX = 11,
MM_MODEM_BAND_U1900 = 12,
MM_MODEM_BAND_U2600 = 13,
/* CDMA Band Classes (see 3GPP2 C.S0057-C) */
MM_MODEM_BAND_CDMA_BC0_CELLULAR_800 = 1ULL << 32,
MM_MODEM_BAND_CDMA_BC1_PCS_1900 = 1ULL << 33,
MM_MODEM_BAND_CDMA_BC2_TACS = 1ULL << 34,
MM_MODEM_BAND_CDMA_BC3_JTACS = 1ULL << 35,
MM_MODEM_BAND_CDMA_BC4_KOREAN_PCS = 1ULL << 36,
MM_MODEM_BAND_CDMA_BC5_NMT450 = 1ULL << 37,
MM_MODEM_BAND_CDMA_BC6_IMT2000 = 1ULL << 38,
MM_MODEM_BAND_CDMA_BC7_CELLULAR_700 = 1ULL << 49,
MM_MODEM_BAND_CDMA_BC8_1800 = 1ULL << 40,
MM_MODEM_BAND_CDMA_BC9_900 = 1ULL << 41,
MM_MODEM_BAND_CDMA_BC10_SECONDARY_800 = 1ULL << 42,
MM_MODEM_BAND_CDMA_BC11_PAMR_400 = 1ULL << 43,
MM_MODEM_BAND_CDMA_BC12_PAMR_800 = 1ULL << 44,
MM_MODEM_BAND_CDMA_BC13_IMT2000_2500 = 1ULL << 45,
MM_MODEM_BAND_CDMA_BC14_PCS2_1900 = 1ULL << 46,
MM_MODEM_BAND_CDMA_BC15_AWS = 1ULL << 47,
MM_MODEM_BAND_CDMA_BC16_US_2500 = 1ULL << 48,
MM_MODEM_BAND_CDMA_BC17_US_FLO_2500 = 1ULL << 49,
MM_MODEM_BAND_CDMA_BC18_US_PS_700 = 1ULL << 50,
MM_MODEM_BAND_CDMA_BC19_US_LOWER_700 = 1ULL << 51,
MM_MODEM_BAND_CDMA_BC0_CELLULAR_800 = 128,
MM_MODEM_BAND_CDMA_BC1_PCS_1900 = 129,
MM_MODEM_BAND_CDMA_BC2_TACS = 130,
MM_MODEM_BAND_CDMA_BC3_JTACS = 131,
MM_MODEM_BAND_CDMA_BC4_KOREAN_PCS = 132,
MM_MODEM_BAND_CDMA_BC5_NMT450 = 134,
MM_MODEM_BAND_CDMA_BC6_IMT2000 = 135,
MM_MODEM_BAND_CDMA_BC7_CELLULAR_700 = 136,
MM_MODEM_BAND_CDMA_BC8_1800 = 137,
MM_MODEM_BAND_CDMA_BC9_900 = 138,
MM_MODEM_BAND_CDMA_BC10_SECONDARY_800 = 139,
MM_MODEM_BAND_CDMA_BC11_PAMR_400 = 140,
MM_MODEM_BAND_CDMA_BC12_PAMR_800 = 141,
MM_MODEM_BAND_CDMA_BC13_IMT2000_2500 = 142,
MM_MODEM_BAND_CDMA_BC14_PCS2_1900 = 143,
MM_MODEM_BAND_CDMA_BC15_AWS = 144,
MM_MODEM_BAND_CDMA_BC16_US_2500 = 145,
MM_MODEM_BAND_CDMA_BC17_US_FLO_2500 = 146,
MM_MODEM_BAND_CDMA_BC18_US_PS_700 = 147,
MM_MODEM_BAND_CDMA_BC19_US_LOWER_700 = 148,
/* All/Any */
MM_MODEM_BAND_ANY = 0xFFFFFFFFFFFFFFFF
MM_MODEM_BAND_ANY = 256
} MMModemBand;
/**