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.
This commit is contained in:
Denis Kenzior
2010-03-25 10:29:01 -05:00
parent 9390dbaf31
commit 1e783b33d9
2 changed files with 12 additions and 16 deletions

View File

@@ -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]

View File

@@ -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 "";
}