sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Refactor: Move network registration status utils 

Move the status to string functions to common.c so that they can be
reused in data connection related network registration code.
This commit is contained in:
Andrzej Zaborowski 2009-10-12 22:37:14 +02:00 committed by Denis Kenzior
parent e6b8550328
commit 5773e30373
3 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/common.c
View File

@ -597,3 +597,47 @@ gboolean is_valid_pin(const char *pin)
return TRUE;
}
const char *registration_status_to_string(int status)
{
switch (status) {
case NETWORK_REGISTRATION_STATUS_NOT_REGISTERED:
return "unregistered";
case NETWORK_REGISTRATION_STATUS_REGISTERED:
return "registered";
case NETWORK_REGISTRATION_STATUS_SEARCHING:
return "searching";
case NETWORK_REGISTRATION_STATUS_DENIED:
return "denied";
case NETWORK_REGISTRATION_STATUS_UNKNOWN:
return "unknown";
case NETWORK_REGISTRATION_STATUS_ROAMING:
return "roaming";
}
return "";
}
const char *registration_tech_to_string(int tech)
{
switch (tech) {
case ACCESS_TECHNOLOGY_GSM:
return "GSM";
case ACCESS_TECHNOLOGY_GSM_COMPACT:
return "GSMCompact";
case ACCESS_TECHNOLOGY_UTRAN:
return "UTRAN";
case ACCESS_TECHNOLOGY_GSM_EGPRS:
return "GSM+EGPRS";
case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
return "UTRAN+HSDPA";
case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
return "UTRAN+HSUPA";
case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
return "UTRAN+HSDPA+HSUPA";
case ACCESS_TECHNOLOGY_EUTRAN:
return "EUTRAN";
default:
return "";
}
}

3
src/common.h
View File

@ -135,3 +135,6 @@ const char *ss_control_type_to_string(enum ss_control_type type);
const char *bearer_class_to_string(enum bearer_class cls);
gboolean is_valid_pin(const char *pin);
const char *registration_status_to_string(int status);
const char *registration_tech_to_string(int tech);

44
src/network.c
View File

@ -117,50 +117,6 @@ static inline const char *network_operator_status_to_string(int status)
return "unknown";
}
static inline const char *registration_status_to_string(int status)
{
switch (status) {
case NETWORK_REGISTRATION_STATUS_NOT_REGISTERED:
return "unregistered";
case NETWORK_REGISTRATION_STATUS_REGISTERED:
return "registered";
case NETWORK_REGISTRATION_STATUS_SEARCHING:
return "searching";
case NETWORK_REGISTRATION_STATUS_DENIED:
return "denied";
case NETWORK_REGISTRATION_STATUS_UNKNOWN:
return "unknown";
case NETWORK_REGISTRATION_STATUS_ROAMING:
return "roaming";
}
return "";
}
static inline const char *registration_tech_to_string(int tech)
{
switch (tech) {
case ACCESS_TECHNOLOGY_GSM:
return "GSM";
case ACCESS_TECHNOLOGY_GSM_COMPACT:
return "GSMCompact";
case ACCESS_TECHNOLOGY_UTRAN:
return "UTRAN";
case ACCESS_TECHNOLOGY_GSM_EGPRS:
return "GSM+EGPRS";
case ACCESS_TECHNOLOGY_UTRAN_HSDPA:
return "UTRAN+HSDPA";
case ACCESS_TECHNOLOGY_UTRAN_HSUPA:
return "UTRAN+HSUPA";
case ACCESS_TECHNOLOGY_UTRAN_HSDPA_HSUPA:
return "UTRAN+HSDPA+HSUPA";
case ACCESS_TECHNOLOGY_EUTRAN:
return "EUTRAN";
default:
return "";
}
}
static void register_callback(const struct ofono_error *error, void *data)
{
struct ofono_netreg *netreg = data;