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

netreg: add +COPS support for HFP emulator

This commit is contained in:
Frédéric Danis 2011-03-22 11:50:00 +01:00 committed by Denis Kenzior
parent bdb4c8d3db
commit 3c3d00dac8
1 changed files with 68 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/network.c
View File

@ -1693,6 +1693,13 @@ void ofono_netreg_driver_unregister(const struct ofono_netreg_driver *d)
g_drivers = g_slist_remove(g_drivers, (void *) d);
}
static void emulator_remove_handler(struct ofono_atom *atom, void *data)
{
struct ofono_emulator *em = __ofono_atom_get_data(atom);
ofono_emulator_remove_handler(em, data);
}
static void netreg_unregister(struct ofono_atom *atom)
{
struct ofono_netreg *netreg = __ofono_atom_get_data(atom);
@ -1707,6 +1714,9 @@ static void netreg_unregister(struct ofono_atom *atom)
__ofono_modem_foreach_atom(modem, OFONO_ATOM_TYPE_EMULATOR_HFP,
notify_emulator_strength, GINT_TO_POINTER(0));
__ofono_modem_foreach_atom(modem, OFONO_ATOM_TYPE_EMULATOR_HFP,
emulator_remove_handler, "+COPS");
__ofono_modem_remove_atom_watch(modem, netreg->hfp_watch);
__ofono_watchlist_free(netreg->status_watches);
@ -1890,21 +1900,65 @@ static void sim_spn_spdi_changed(int id, void *userdata)
sim_spn_read_cb, netreg);
}
static void emulator_cops_cb(struct ofono_emulator *em,
struct ofono_emulator_request *req, void *userdata)
{
struct ofono_netreg *netreg = userdata;
struct ofono_error result;
int val;
char name[17];
char buf[32];
result.error = 0;
switch (ofono_emulator_request_get_type(req)) {
case OFONO_EMULATOR_REQUEST_TYPE_SET:
ofono_emulator_request_next_number(req, &val);
if (val != 3)
goto fail;
ofono_emulator_request_next_number(req, &val);
if (val != 0)
goto fail;
result.type = OFONO_ERROR_TYPE_NO_ERROR;
ofono_emulator_send_final(em, &result);
break;
case OFONO_EMULATOR_REQUEST_TYPE_QUERY:
strncpy(name, get_operator_display_name(netreg), 16);
name[16] = '\0';
sprintf(buf, "+COPS: %d,0,\"%s\"", netreg->mode, name);
ofono_emulator_send_info(em, buf, TRUE);
result.type = OFONO_ERROR_TYPE_NO_ERROR;
ofono_emulator_send_final(em, &result);
break;
default:
fail:
result.type = OFONO_ERROR_TYPE_FAILURE;
ofono_emulator_send_final(em, &result);
};
}
static void emulator_hfp_init(struct ofono_atom *atom, void *data)
{
struct ofono_netreg *netreg = data;
struct ofono_emulator *em = __ofono_atom_get_data(atom);
notify_emulator_status(atom, GINT_TO_POINTER(netreg->status));
notify_emulator_strength(atom,
GINT_TO_POINTER(netreg->signal_strength));
ofono_emulator_add_handler(em, "+COPS", emulator_cops_cb, data, NULL);
}
static void emulator_hfp_watch(struct ofono_atom *atom,
enum ofono_atom_watch_condition cond,
void *data)
{
struct ofono_netreg *netreg = data;
struct ofono_modem *modem = __ofono_atom_get_modem(netreg->atom);
if (cond == OFONO_ATOM_WATCH_CONDITION_REGISTERED) {
__ofono_modem_foreach_atom(modem, OFONO_ATOM_TYPE_EMULATOR_HFP,
notify_emulator_status,
GINT_TO_POINTER(netreg->status));
__ofono_modem_foreach_atom(modem, OFONO_ATOM_TYPE_EMULATOR_HFP,
notify_emulator_strength,
GINT_TO_POINTER(netreg->signal_strength));
}
if (cond == OFONO_ATOM_WATCH_CONDITION_REGISTERED)
emulator_hfp_init(atom, data);
}
void ofono_netreg_register(struct ofono_netreg *netreg)
@ -1968,6 +2022,9 @@ void ofono_netreg_register(struct ofono_netreg *netreg)
netreg->hfp_watch = __ofono_modem_add_atom_watch(modem,
OFONO_ATOM_TYPE_EMULATOR_HFP,
emulator_hfp_watch, netreg, NULL);
__ofono_modem_foreach_atom(modem, OFONO_ATOM_TYPE_EMULATOR_HFP,
emulator_hfp_init, netreg);
}
void ofono_netreg_remove(struct ofono_netreg *netreg)