summaryrefslogtreecommitdiff
path: root/libnm-core/nm-setting-gsm.h
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-05-09 15:02:57 -0400
committerDan Winship <danw@gnome.org>2014-08-01 14:34:05 -0400
commit054c12ea30f7e41505ca54655c28abdc14fe05bc (patch)
tree66e2d2d16ae33880d6501d7681dd3a267e452ffe /libnm-core/nm-setting-gsm.h
parentb9fef07fff7ecc806563162b8311a070e98b23e6 (diff)
downloadNetworkManager-054c12ea30f7e41505ca54655c28abdc14fe05bc.tar.gz
libnm: remove all deprecated functions and types
Remove deprecated functions and enum types. For now, deprecated properties are still around, because removing them would cause warnings when talking to older implementations.
Diffstat (limited to 'libnm-core/nm-setting-gsm.h')
-rw-r--r--libnm-core/nm-setting-gsm.h102
1 files changed, 0 insertions, 102 deletions
diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h
index 564a8b4b9d..4675e409b7 100644
--- a/libnm-core/nm-setting-gsm.h
+++ b/libnm-core/nm-setting-gsm.h
@@ -69,102 +69,6 @@ GQuark nm_setting_gsm_error_quark (void);
#define NM_SETTING_GSM_ALLOWED_BANDS "allowed-bands"
#define NM_SETTING_GSM_NETWORK_TYPE "network-type"
-/**
- * NMSettingGsmNetworkType:
- * @NM_SETTING_GSM_NETWORK_TYPE_ANY: any access technology may be used
- * @NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: only 3G-type (UMTS and HSPA)
- * technologies may be used
- * @NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: only 2G-type (GPRS and EDGE)
- * technologies may be used
- * @NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 3G-type technologies are
- * preferred but 2G-type technologies may be used as a fallback
- * @NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 2G-type technologies are
- * preferred but 3G-type technologies may be used as a fallback
- * @NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: 4G/LTE-type technologies are
- * preferred but 3G/2/-type technologies may be used as a fallback
- * @NM_SETTING_GSM_NETWORK_TYPE_4G: only 4G/LTE type
- * technologies may be used
- *
- * #NMSettingGsmNetworkType values indicate the allowed access technologies
- * the device may use when connecting to this network.
- *
- * Deprecated: 0.9.10: No longer used.
- */
-typedef enum {
- NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
- NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
- NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
- NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
- NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
- NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
- NM_SETTING_GSM_NETWORK_TYPE_4G = 5
-} NMSettingGsmNetworkType;
-
-/**
- * NMSettingGsmNetworkBand:
- * @NM_SETTING_GSM_BAND_UNKNOWN: unknown or no band specified
- * @NM_SETTING_GSM_BAND_ANY: any band is allowed
- * @NM_SETTING_GSM_BAND_EGSM: 900 MHz original GSM band
- * @NM_SETTING_GSM_BAND_DCS: 1800 MHz DCS band
- * @NM_SETTING_GSM_BAND_PCS: US 1900 MHz PCS band
- * @NM_SETTING_GSM_BAND_G850: US 850 MHz Cellular band
- * @NM_SETTING_GSM_BAND_U2100: WCDMA 3GPP UMTS 2100 MHz (Class I)
- * @NM_SETTING_GSM_BAND_U1800: WCDMA 3GPP UMTS 1800 MHz (Class III)
- * @NM_SETTING_GSM_BAND_U17IV: WCDMA 3GPP AWS 1700/2100 MHz (Class IV)
- * @NM_SETTING_GSM_BAND_U800: WCDMA 3GPP UMTS 800 MHz (Class VI)
- * @NM_SETTING_GSM_BAND_U850: WCDMA 3GPP UMTS 850 MHz (Class V)
- * @NM_SETTING_GSM_BAND_U900: WCDMA 3GPP UMTS 900 MHz (Class VIII)
- * @NM_SETTING_GSM_BAND_U17IX: WCDMA 3GPP UMTS 1700 MHz (Class IX)
- * @NM_SETTING_GSM_BAND_U1900: WCDMA 3GPP UMTS 1900 MHz (Class II)
- * @NM_SETTING_GSM_BAND_U2600: WCDMA 3GPP UMTS 2600 MHz (Class VII, internal)
- *
- * #NMSettingGsmNetworkBand values indicate the allowed frequency bands
- * the device may use when connecting to this network.
- *
- * Deprecated: 0.9.10: No longer used.
- */
-typedef enum {
- NM_SETTING_GSM_BAND_UNKNOWN = 0x00000000,
- NM_SETTING_GSM_BAND_ANY = 0x00000001,
- NM_SETTING_GSM_BAND_EGSM = 0x00000002, /* 900 MHz */
- NM_SETTING_GSM_BAND_DCS = 0x00000004, /* 1800 MHz */
- NM_SETTING_GSM_BAND_PCS = 0x00000008, /* 1900 MHz */
- NM_SETTING_GSM_BAND_G850 = 0x00000010, /* 850 MHz */
- NM_SETTING_GSM_BAND_U2100 = 0x00000020, /* WCDMA 3GPP UMTS 2100 MHz (Class I) */
- NM_SETTING_GSM_BAND_U1800 = 0x00000040, /* WCDMA 3GPP UMTS 1800 MHz (Class III) */
- NM_SETTING_GSM_BAND_U17IV = 0x00000080, /* WCDMA 3GPP AWS 1700/2100 MHz (Class IV) */
- NM_SETTING_GSM_BAND_U800 = 0x00000100, /* WCDMA 3GPP UMTS 800 MHz (Class VI) */
- NM_SETTING_GSM_BAND_U850 = 0x00000200, /* WCDMA 3GPP UMTS 850 MHz (Class V) */
- NM_SETTING_GSM_BAND_U900 = 0x00000400, /* WCDMA 3GPP UMTS 900 MHz (Class VIII) */
- NM_SETTING_GSM_BAND_U17IX = 0x00000800, /* WCDMA 3GPP UMTS 1700 MHz (Class IX) */
- NM_SETTING_GSM_BAND_U1900 = 0x00001000, /* WCDMA 3GPP UMTS 1900 MHz (Class II) */
- NM_SETTING_GSM_BAND_U2600 = 0x00002000, /* WCDMA 3GPP UMTS 2600 MHz (Class VII, internal) */
-} NMSettingGsmNetworkBand;
-
-/**
- * NM_SETTING_GSM_BANDS_MAX:
- *
- * #NM_SETTING_GSM_BANDS_MAX macro indicate the maximal value that can be used
- * as the allowed frequency bands (#NMSettingGsm:allowed-bands property).
- *
- * Deprecated: 0.9.10: No longer used.
- */
-#define NM_SETTING_GSM_BANDS_MAX ( NM_SETTING_GSM_BAND_UNKNOWN \
- | NM_SETTING_GSM_BAND_ANY \
- | NM_SETTING_GSM_BAND_EGSM \
- | NM_SETTING_GSM_BAND_DCS \
- | NM_SETTING_GSM_BAND_PCS \
- | NM_SETTING_GSM_BAND_G850 \
- | NM_SETTING_GSM_BAND_U2100 \
- | NM_SETTING_GSM_BAND_U1800 \
- | NM_SETTING_GSM_BAND_U17IV \
- | NM_SETTING_GSM_BAND_U800 \
- | NM_SETTING_GSM_BAND_U850 \
- | NM_SETTING_GSM_BAND_U900 \
- | NM_SETTING_GSM_BAND_U17IX \
- | NM_SETTING_GSM_BAND_U1900 \
- | NM_SETTING_GSM_BAND_U2600)
-
typedef struct {
NMSetting parent;
} NMSettingGsm;
@@ -193,12 +97,6 @@ gboolean nm_setting_gsm_get_home_only (NMSettingGsm *setting);
NMSettingSecretFlags nm_setting_gsm_get_pin_flags (NMSettingGsm *setting);
NMSettingSecretFlags nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
-/* Deprecated */
-NM_DEPRECATED_IN_0_9_10
-int nm_setting_gsm_get_network_type (NMSettingGsm *setting);
-NM_DEPRECATED_IN_0_9_10
-guint32 nm_setting_gsm_get_allowed_bands (NMSettingGsm *setting);
-
G_END_DECLS
#endif /* NM_SETTING_GSM_H */