
Instead of using a predefined set of string values for 'ip-type' in Modem.CreateBearer() and Simple.Connect(), we'll use an enumeration. The implementation will then need to convert the requested IP family type to e.g. the correct PDP type in 3GPP modems. This change also consolidates the use of enums in dictionary properties when possible to do so, as with the Rm Protocol.
82 lines
4.2 KiB
C
82 lines
4.2 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details:
|
|
*
|
|
* Copyright (C) 2011 - 2012 Google, Inc.
|
|
* Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
|
|
*/
|
|
|
|
#include <glib.h>
|
|
#include <ModemManager-enums.h>
|
|
|
|
#ifndef MM_COMMON_HELPERS_H
|
|
#define MM_COMMON_HELPERS_H
|
|
|
|
gchar *mm_common_build_bands_string (const MMModemBand *bands,
|
|
guint n_bands);
|
|
|
|
gchar *mm_common_build_sms_storages_string (const MMSmsStorage *storages,
|
|
guint n_storages);
|
|
|
|
MMModemMode mm_common_get_modes_from_string (const gchar *str,
|
|
GError **error);
|
|
void mm_common_get_bands_from_string (const gchar *str,
|
|
MMModemBand **bands,
|
|
guint *n_bands,
|
|
GError **error);
|
|
gboolean mm_common_get_boolean_from_string (const gchar *value,
|
|
GError **error);
|
|
MMModemCdmaRmProtocol mm_common_get_rm_protocol_from_string (const gchar *str,
|
|
GError **error);
|
|
MMBearerIpFamily mm_common_get_ip_type_from_string (const gchar *str,
|
|
GError **error);
|
|
|
|
GArray *mm_common_bands_variant_to_garray (GVariant *variant);
|
|
MMModemBand *mm_common_bands_variant_to_array (GVariant *variant,
|
|
guint *n_bands);
|
|
GVariant *mm_common_bands_array_to_variant (const MMModemBand *bands,
|
|
guint n_bands);
|
|
GVariant *mm_common_bands_garray_to_variant (GArray *array);
|
|
|
|
GVariant *mm_common_build_bands_any (void);
|
|
GVariant *mm_common_build_bands_unknown (void);
|
|
|
|
gboolean mm_common_bands_garray_cmp (GArray *a, GArray *b);
|
|
|
|
typedef gboolean (*MMParseKeyValueForeachFn) (const gchar *key,
|
|
const gchar *value,
|
|
gpointer user_data);
|
|
gboolean mm_common_parse_key_value_string (const gchar *str,
|
|
GError **error,
|
|
MMParseKeyValueForeachFn callback,
|
|
gpointer user_data);
|
|
|
|
/* Common parsers */
|
|
gboolean mm_get_int_from_str (const gchar *str,
|
|
gint *out);
|
|
gboolean mm_get_int_from_match_info (GMatchInfo *match_info,
|
|
guint32 match_index,
|
|
gint *out);
|
|
gboolean mm_get_uint_from_str (const gchar *str,
|
|
guint *out);
|
|
gboolean mm_get_uint_from_match_info (GMatchInfo *match_info,
|
|
guint32 match_index,
|
|
guint *out);
|
|
gboolean mm_get_double_from_str (const gchar *str,
|
|
gdouble *out);
|
|
gboolean mm_get_double_from_match_info (GMatchInfo *match_info,
|
|
guint32 match_index,
|
|
gdouble *out);
|
|
gchar *mm_get_string_unquoted_from_match_info (GMatchInfo *match_info,
|
|
guint32 match_index);
|
|
|
|
#endif /* MM_COMMON_HELPERS_H */
|