diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-08-04 14:46:47 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-08-04 14:47:38 -0500 |
| commit | 9b284c7c3572b4bd489b804b36ecf50c89f56c82 (patch) | |
| tree | c7318064c7d6f668d7c87cea3667c81e29dfd848 /src | |
| parent | 7241a0e314222dda49668669f79bfd8e7fcadfed (diff) | |
| download | ofono-9b284c7c3572b4bd489b804b36ecf50c89f56c82.tar.bz2 | |
stk: Rip out the HELP stuff for now
We're not supporting it in the current API and doing so is actually
very painful.
Diffstat (limited to 'src')
| -rw-r--r-- | src/stk.c | 41 | ||||
| -rw-r--r-- | src/stkagent.h | 1 |
2 files changed, 0 insertions, 42 deletions
@@ -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; } diff --git a/src/stkagent.h b/src/stkagent.h index 3faabe7b..70f1f885 100644 --- a/src/stkagent.h +++ b/src/stkagent.h @@ -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, }; |