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

Add quirk for network-registration for calypso 

Support calypso-specific AT%CSQ notifications
This commit is contained in:
Denis Kenzior 2009-09-03 23:05:18 -05:00 committed by Denis Kenzior
parent 1a1f7d34d2
commit 23484524df
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/atmodem/network-registration.c
View File

@ -38,6 +38,7 @@
#include "gatresult.h" #include "gatresult.h"
#include "at.h" #include "at.h"
#include "vendor.h"
static const char *none_prefix[] = { NULL }; static const char *none_prefix[] = { NULL };
static const char *creg_prefix[] = { "+CREG:", NULL }; static const char *creg_prefix[] = { "+CREG:", NULL };
@ -48,6 +49,7 @@ struct netreg_data {
GAtChat *chat; GAtChat *chat;
char mcc[OFONO_MAX_MCC_LENGTH + 1]; char mcc[OFONO_MAX_MCC_LENGTH + 1];
char mnc[OFONO_MAX_MNC_LENGTH + 1]; char mnc[OFONO_MAX_MNC_LENGTH + 1];
unsigned int vendor;
}; };
static void extract_mcc_mnc(const char *str, char *mcc, char *mnc) static void extract_mcc_mnc(const char *str, char *mcc, char *mnc)
@ -495,6 +497,19 @@ error:
} }
} }
static inline void report_signal_strength(struct ofono_netreg *netreg,
int strength)
{
ofono_debug("csq_notify: %d", strength);
if (strength == 99)
strength = -1;
else
strength = strength * 100 / 31;
ofono_netreg_strength_notify(netreg, strength);
}
static void csq_notify(GAtResult *result, gpointer user_data) static void csq_notify(GAtResult *result, gpointer user_data)
{ {
struct ofono_netreg *netreg = user_data; struct ofono_netreg *netreg = user_data;
@ -511,14 +526,26 @@ static void csq_notify(GAtResult *result, gpointer user_data)
if (!g_at_result_iter_next_number(&iter, &strength)) if (!g_at_result_iter_next_number(&iter, &strength))
return; return;
ofono_debug("csq_notify: %d", strength); report_signal_strength(netreg, strength);
}
if (strength == 99) static void calypso_csq_notify(GAtResult *result, gpointer user_data)
strength = -1; {
else struct ofono_netreg *netreg = user_data;
strength = strength * 100 / 31; int strength;
GAtResultIter iter;
ofono_netreg_strength_notify(netreg, strength); dump_response("calypso_csq_notify", TRUE, result);
g_at_result_iter_init(&iter, result);
if (!g_at_result_iter_next(&iter, "%CSQ:"))
return;
if (!g_at_result_iter_next_number(&iter, &strength))
return;
report_signal_strength(netreg, strength);
} }
static void csq_cb(gboolean ok, GAtResult *result, gpointer user_data) static void csq_cb(gboolean ok, GAtResult *result, gpointer user_data)
@ -633,6 +660,10 @@ static void at_network_registration_initialized(gboolean ok, GAtResult *result,
g_at_chat_register(nd->chat, "+CSQ:", g_at_chat_register(nd->chat, "+CSQ:",
csq_notify, FALSE, netreg, NULL); csq_notify, FALSE, netreg, NULL);
if (nd->vendor == OFONO_VENDOR_CALYPSO)
g_at_chat_register(nd->chat, "%CSQ:", calypso_csq_notify,
FALSE, netreg, NULL);
ofono_netreg_register(netreg); ofono_netreg_register(netreg);
} }
@ -645,8 +676,12 @@ static int at_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
nd = g_new0(struct netreg_data, 1); nd = g_new0(struct netreg_data, 1);
nd->chat = chat; nd->chat = chat;
nd->vendor = vendor;
ofono_netreg_set_data(netreg, nd); ofono_netreg_set_data(netreg, nd);
if (nd->vendor == OFONO_VENDOR_CALYPSO)
g_at_chat_send(chat, "AT%CSQ=1", NULL, NULL, NULL, NULL);
g_at_chat_send(chat, "AT+CREG=2", NULL, g_at_chat_send(chat, "AT+CREG=2", NULL,
at_network_registration_initialized, at_network_registration_initialized,
netreg, NULL); netreg, NULL);

3
drivers/atmodem/vendor.h
View File

@ -21,5 +21,6 @@
enum ofono_vendor { enum ofono_vendor {
OFONO_VENDOR_GENERIC = 0, OFONO_VENDOR_GENERIC = 0,
OFONO_VENDOR_HTC_G1 = 1, OFONO_VENDOR_HTC_G1,
OFONO_VENDOR_CALYPSO,
}; };