diff options
Diffstat (limited to 'libmm-glib/mm-cell-info-lte.c')
| -rw-r--r-- | libmm-glib/mm-cell-info-lte.c | 132 |
1 files changed, 100 insertions, 32 deletions
diff --git a/libmm-glib/mm-cell-info-lte.c b/libmm-glib/mm-cell-info-lte.c index 1768c04f..3af4f6a3 100644 --- a/libmm-glib/mm-cell-info-lte.c +++ b/libmm-glib/mm-cell-info-lte.c @@ -36,14 +36,16 @@ G_DEFINE_TYPE (MMCellInfoLte, mm_cell_info_lte, MM_TYPE_CELL_INFO) -#define PROPERTY_OPERATOR_ID "operator-id" -#define PROPERTY_TAC "tac" -#define PROPERTY_CI "ci" -#define PROPERTY_PHYSICAL_CI "physical-ci" -#define PROPERTY_EARFCN "earfcn" -#define PROPERTY_RSRP "rsrp" -#define PROPERTY_RSRQ "rsrq" -#define PROPERTY_TIMING_ADVANCE "timing-advance" +#define PROPERTY_OPERATOR_ID "operator-id" +#define PROPERTY_TAC "tac" +#define PROPERTY_CI "ci" +#define PROPERTY_PHYSICAL_CI "physical-ci" +#define PROPERTY_EARFCN "earfcn" +#define PROPERTY_RSRP "rsrp" +#define PROPERTY_RSRQ "rsrq" +#define PROPERTY_TIMING_ADVANCE "timing-advance" +#define PROPERTY_SERVING_CELL_TYPE "serving-cell-type" +#define PROPERTY_BANDWIDTH "bandwidth" struct _MMCellInfoLtePrivate { @@ -55,6 +57,8 @@ struct _MMCellInfoLtePrivate { gdouble rsrp; gdouble rsrq; guint timing_advance; + guint serving_cell_type; + guint bandwidth; }; /*****************************************************************************/ @@ -296,6 +300,62 @@ mm_cell_info_lte_set_timing_advance (MMCellInfoLte *self, self->priv->timing_advance = timing_advance; } +/** + * mm_cell_info_lte_get_serving_cell_type: + * @self: a #MMCellInfoLte. + * + * Get the serving cell type. + * + * Returns: the serving cell type, or %MM_SERVING_CELL_TYPE_INVALID if not available. + * + * Since: 1.22 + */ +MMServingCellType +mm_cell_info_lte_get_serving_cell_type (MMCellInfoLte *self) +{ + g_return_val_if_fail (MM_IS_CELL_INFO_LTE (self), MM_SERVING_CELL_TYPE_INVALID); + + return self->priv->serving_cell_type; +} + +/** + * mm_cell_info_lte_set_serving_cell_type: (skip) + */ +void +mm_cell_info_lte_set_serving_cell_type (MMCellInfoLte *self, + MMServingCellType cell_type) +{ + self->priv->serving_cell_type = cell_type; +} + +/** + * mm_cell_info_lte_get_bandwidth: + * @self: a #MMCellInfoLte. + * + * Get the bandwidth of the particular carrier in downlink. + * + * Returns: the bandwidth, or %G_MAXUINT if not available. + * + * Since: 1.22 + */ +guint +mm_cell_info_lte_get_bandwidth (MMCellInfoLte *self) +{ + g_return_val_if_fail (MM_IS_CELL_INFO_LTE (self), G_MAXUINT); + + return self->priv->bandwidth; +} + +/** + * mm_cell_info_lte_set_bandwidth: (skip) + */ +void +mm_cell_info_lte_set_bandwidth (MMCellInfoLte *self, + guint bandwidth) +{ + self->priv->bandwidth = bandwidth; +} + /*****************************************************************************/ static GString * @@ -306,14 +366,16 @@ build_string (MMCellInfo *_self) str = g_string_new (NULL); - MM_CELL_INFO_BUILD_STRING_APPEND ("operator id", "%s", operator_id, NULL); - MM_CELL_INFO_BUILD_STRING_APPEND ("tac", "%s", tac, NULL); - MM_CELL_INFO_BUILD_STRING_APPEND ("ci", "%s", ci, NULL); - MM_CELL_INFO_BUILD_STRING_APPEND ("physical ci", "%s", physical_ci, NULL); - MM_CELL_INFO_BUILD_STRING_APPEND ("earfcn", "%u", earfcn, G_MAXUINT); - MM_CELL_INFO_BUILD_STRING_APPEND ("rsrp", "%lf", rsrp, -G_MAXDOUBLE); - MM_CELL_INFO_BUILD_STRING_APPEND ("rsrq", "%lf", rsrq, -G_MAXDOUBLE); - MM_CELL_INFO_BUILD_STRING_APPEND ("timing advance", "%u", timing_advance, G_MAXUINT); + MM_CELL_INFO_BUILD_STRING_APPEND ("operator id", "%s", operator_id, NULL); + MM_CELL_INFO_BUILD_STRING_APPEND ("tac", "%s", tac, NULL); + MM_CELL_INFO_BUILD_STRING_APPEND ("ci", "%s", ci, NULL); + MM_CELL_INFO_BUILD_STRING_APPEND ("physical ci", "%s", physical_ci, NULL); + MM_CELL_INFO_BUILD_STRING_APPEND ("earfcn", "%u", earfcn, G_MAXUINT); + MM_CELL_INFO_BUILD_STRING_APPEND ("rsrp", "%lf", rsrp, -G_MAXDOUBLE); + MM_CELL_INFO_BUILD_STRING_APPEND ("rsrq", "%lf", rsrq, -G_MAXDOUBLE); + MM_CELL_INFO_BUILD_STRING_APPEND ("timing advance", "%u", timing_advance, G_MAXUINT); + MM_CELL_INFO_BUILD_STRING_APPEND ("serving cell type", "%u", serving_cell_type, MM_SERVING_CELL_TYPE_INVALID); + MM_CELL_INFO_BUILD_STRING_APPEND ("bandwidth", "%u", bandwidth, G_MAXUINT); return str; } @@ -331,14 +393,16 @@ get_dictionary (MMCellInfo *_self) dict = g_variant_dict_new (NULL); - MM_CELL_INFO_GET_DICTIONARY_INSERT (OPERATOR_ID, operator_id, string, NULL); - MM_CELL_INFO_GET_DICTIONARY_INSERT (TAC, tac, string, NULL); - MM_CELL_INFO_GET_DICTIONARY_INSERT (CI, ci, string, NULL); - MM_CELL_INFO_GET_DICTIONARY_INSERT (PHYSICAL_CI, physical_ci, string, NULL); - MM_CELL_INFO_GET_DICTIONARY_INSERT (EARFCN, earfcn, uint32, G_MAXUINT); - MM_CELL_INFO_GET_DICTIONARY_INSERT (RSRP, rsrp, double, -G_MAXDOUBLE); - MM_CELL_INFO_GET_DICTIONARY_INSERT (RSRQ, rsrq, double, -G_MAXDOUBLE); - MM_CELL_INFO_GET_DICTIONARY_INSERT (TIMING_ADVANCE, timing_advance, uint32, G_MAXUINT); + MM_CELL_INFO_GET_DICTIONARY_INSERT (OPERATOR_ID, operator_id, string, NULL); + MM_CELL_INFO_GET_DICTIONARY_INSERT (TAC, tac, string, NULL); + MM_CELL_INFO_GET_DICTIONARY_INSERT (CI, ci, string, NULL); + MM_CELL_INFO_GET_DICTIONARY_INSERT (PHYSICAL_CI, physical_ci, string, NULL); + MM_CELL_INFO_GET_DICTIONARY_INSERT (EARFCN, earfcn, uint32, G_MAXUINT); + MM_CELL_INFO_GET_DICTIONARY_INSERT (RSRP, rsrp, double, -G_MAXDOUBLE); + MM_CELL_INFO_GET_DICTIONARY_INSERT (RSRQ, rsrq, double, -G_MAXDOUBLE); + MM_CELL_INFO_GET_DICTIONARY_INSERT (TIMING_ADVANCE, timing_advance, uint32, G_MAXUINT); + MM_CELL_INFO_GET_DICTIONARY_INSERT (SERVING_CELL_TYPE, serving_cell_type, uint32, MM_SERVING_CELL_TYPE_INVALID); + MM_CELL_INFO_GET_DICTIONARY_INSERT (BANDWIDTH, bandwidth, uint32, G_MAXUINT); return dict; } @@ -361,10 +425,12 @@ mm_cell_info_lte_new_from_dictionary (GVariantDict *dict) MM_CELL_INFO_NEW_FROM_DICTIONARY_STRING_SET (lte, CI, ci); MM_CELL_INFO_NEW_FROM_DICTIONARY_STRING_SET (lte, PHYSICAL_CI, physical_ci); - MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, EARFCN, earfcn, UINT32, uint32); - MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, RSRP, rsrp, DOUBLE, double); - MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, RSRQ, rsrq, DOUBLE, double); - MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, TIMING_ADVANCE, timing_advance, UINT32, uint32); + MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, EARFCN, earfcn, UINT32, uint32); + MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, RSRP, rsrp, DOUBLE, double); + MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, RSRQ, rsrq, DOUBLE, double); + MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, TIMING_ADVANCE, timing_advance, UINT32, uint32); + MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, SERVING_CELL_TYPE, serving_cell_type, UINT32, uint32); + MM_CELL_INFO_NEW_FROM_DICTIONARY_NUM_SET (lte, BANDWIDTH, bandwidth, UINT32, uint32); } return MM_CELL_INFO (self); @@ -376,10 +442,12 @@ static void mm_cell_info_lte_init (MMCellInfoLte *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MM_TYPE_CELL_INFO_LTE, MMCellInfoLtePrivate); - self->priv->earfcn = G_MAXUINT; - self->priv->rsrp = -G_MAXDOUBLE; - self->priv->rsrq = -G_MAXDOUBLE; - self->priv->timing_advance = G_MAXUINT; + self->priv->earfcn = G_MAXUINT; + self->priv->rsrp = -G_MAXDOUBLE; + self->priv->rsrq = -G_MAXDOUBLE; + self->priv->timing_advance = G_MAXUINT; + self->priv->serving_cell_type = MM_SERVING_CELL_TYPE_INVALID; + self->priv->bandwidth = G_MAXUINT; } static void |