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

stk: Rip out the HELP stuff for now 

We're not supporting it in the current API and doing so is actually
very painful.
This commit is contained in:
Denis Kenzior 2010-08-04 14:46:47 -05:00
parent 7241a0e314
commit 9b284c7c35
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/stk.c
View File

@ -1167,7 +1167,6 @@ static void request_confirmation_cb(enum stk_agent_result result,
struct ofono_stk *stk = user_data;
static struct ofono_error error = { .type = OFONO_ERROR_TYPE_FAILURE };
struct stk_command_get_inkey *cmd = &stk->pending_cmd->get_inkey;
uint8_t qualifier = stk->pending_cmd->qualifier;
struct stk_response rsp;
switch (result) {
@ -1197,20 +1196,7 @@ static void request_confirmation_cb(enum stk_agent_result result,
send_simple_response(stk, STK_RESULT_TYPE_NO_RESPONSE);
break;
case STK_AGENT_RESULT_HELP:
if ((qualifier & (1 << 7)) == 0) {
ofono_error("Help requested but not available");
send_simple_response(stk,
STK_RESULT_TYPE_USER_TERMINATED);
break;
}
send_simple_response(stk, STK_RESULT_TYPE_HELP_REQUESTED);
break;
case STK_AGENT_RESULT_TERMINATE:
default:
send_simple_response(stk, STK_RESULT_TYPE_USER_TERMINATED);
break;
}
@ -1222,7 +1208,6 @@ static void request_key_cb(enum stk_agent_result result, char *string,
struct ofono_stk *stk = user_data;
static struct ofono_error error = { .type = OFONO_ERROR_TYPE_FAILURE };
struct stk_command_get_inkey *cmd = &stk->pending_cmd->get_inkey;
uint8_t qualifier = stk->pending_cmd->qualifier;
struct stk_response rsp;
switch (result) {
@ -1251,20 +1236,7 @@ static void request_key_cb(enum stk_agent_result result, char *string,
send_simple_response(stk, STK_RESULT_TYPE_NO_RESPONSE);
break;
case STK_AGENT_RESULT_HELP:
if ((qualifier & (1 << 7)) == 0) {
ofono_error("Help requested but not available");
send_simple_response(stk,
STK_RESULT_TYPE_USER_TERMINATED);
break;
}
send_simple_response(stk, STK_RESULT_TYPE_HELP_REQUESTED);
break;
case STK_AGENT_RESULT_TERMINATE:
default:
send_simple_response(stk, STK_RESULT_TYPE_USER_TERMINATED);
break;
}
@ -1359,20 +1331,7 @@ static void request_string_cb(enum stk_agent_result result, char *string,
send_simple_response(stk, STK_RESULT_TYPE_NO_RESPONSE);
break;
case STK_AGENT_RESULT_HELP:
if ((qualifier & (1 << 7)) == 0) {
ofono_error("Help requested but not available");
send_simple_response(stk,
STK_RESULT_TYPE_USER_TERMINATED);
break;
}
send_simple_response(stk, STK_RESULT_TYPE_HELP_REQUESTED);
break;
case STK_AGENT_RESULT_TERMINATE:
default:
send_simple_response(stk, STK_RESULT_TYPE_USER_TERMINATED);
break;
}

1
src/stkagent.h
View File

@ -25,7 +25,6 @@ enum stk_agent_result {
STK_AGENT_RESULT_OK,
STK_AGENT_RESULT_BACK,
STK_AGENT_RESULT_TERMINATE,
STK_AGENT_RESULT_HELP,
STK_AGENT_RESULT_TIMEOUT,
};