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

stk: Check for USSD atom before others 

For efficiency (and consistency) we should check for the USSD atom
before checking CallForwarding, CallBarring, and CallSettings atoms.
This commit is contained in:
Denis Kenzior 2011-04-05 00:16:23 -05:00
parent d77f0ff799
commit 73b9e06c40
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/stk.c
View File

@ -1966,12 +1966,6 @@ static gboolean handle_command_send_ussd(const struct stk_command *cmd,
struct ofono_ussd *ussd;
int err;
if (ss_is_busy(modem)) {
ADD_ERROR_RESULT(rsp->result, STK_RESULT_TYPE_TERMINAL_BUSY,
busy_on_ss_result);
return TRUE;
}
atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_USSD);
if (atom == NULL || !__ofono_atom_get_registered(atom)) {
rsp->result.type = STK_RESULT_TYPE_NOT_CAPABLE;
@ -1985,6 +1979,12 @@ static gboolean handle_command_send_ussd(const struct stk_command *cmd,
return TRUE;
}
if (ss_is_busy(modem)) {
ADD_ERROR_RESULT(rsp->result, STK_RESULT_TYPE_TERMINAL_BUSY,
busy_on_ss_result);
return TRUE;
}
err = __ofono_ussd_initiate(ussd, cmd->send_ussd.ussd_string.dcs,
cmd->send_ussd.ussd_string.string,
cmd->send_ussd.ussd_string.len,