From 1e783b33d94e88c4f53e96609cbd4bca0c5e396c Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 25 Mar 2010 10:29:01 -0500 Subject: Refactor: Simplify Technology values Applications don't really understand our current values very well and would need to look up the spec. Instead we change to much more commonly accepted terms. --- doc/network-api.txt | 12 ++++-------- src/common.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/doc/network-api.txt b/doc/network-api.txt index 13f91b31..cc77360a 100644 --- a/doc/network-api.txt +++ b/doc/network-api.txt @@ -100,10 +100,8 @@ Properties string Mode [readonly] Contains the technology of the current network. - The possible values are: "GSM", "GSMCompact", "UTRAN", - "GSM+EGPS", "UTRAN+HSDPA", - "UTRAN+HSUPA", - "UTRAN+HSDPA+HSUPA" + The possible values are: "gsm", "edge", "umts", "hspa", + "lte" TODO: Values for CDMA and EVDO based networks. @@ -197,10 +195,8 @@ Properties string Name [readonly] Contains a list of technologies currently available from this network provider. - The possible values are: "GSM", "GSMCompact", "UTRAN", - "GSM+EGPS", "UTRAN+HSDPA", - "UTRAN+HSUPA", - "UTRAN+HSDPA+HSUPA" + The possible values are: "gsm", "edge", "umts", "hspa", + "lte" string AdditionalInformation [readonly, optional] diff --git a/src/common.c b/src/common.c index b58d9bee..d3a57ece 100644 --- a/src/common.c +++ b/src/common.c @@ -641,21 +641,21 @@ const char *registration_tech_to_string(int tech) { switch (tech) { case ACCESS_TECHNOLOGY_GSM: - return "GSM"; + return "gsm"; case ACCESS_TECHNOLOGY_GSM_COMPACT: - return "GSMCompact"; + return "gsm"; case ACCESS_TECHNOLOGY_UTRAN: - return "UTRAN"; + return "umts"; case ACCESS_TECHNOLOGY_GSM_EGPRS: - return "GSM+EGPRS"; + return "edge"; case ACCESS_TECHNOLOGY_UTRAN_HSDPA: - return "UTRAN+HSDPA"; + return "hspa"; case ACCESS_TECHNOLOGY_UTRAN_HSUPA: - return "UTRAN+HSUPA"; + return "hspa"; case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA: - return "UTRAN+HSDPA+HSUPA"; + return "hspa"; case ACCESS_TECHNOLOGY_EUTRAN: - return "EUTRAN"; + return "lte"; default: return ""; } -- cgit v1.2.3