stkutil: Make get inkey parser use its own struct

This commit is contained in:
Yang Gu 2010-04-27 17:47:12 +08:00 committed by Denis Kenzior
parent 1bd755bcdc
commit c5023690b7
2 changed files with 11 additions and 5 deletions

View File

@ -2116,7 +2116,7 @@ static void destroy_get_inkey(struct stk_command *command)
static gboolean parse_get_inkey(struct stk_command *command,
struct comprehension_tlv_iter *iter)
{
struct stk_command_display_text *obj = &command->get_inkey;
struct stk_command_get_inkey *obj = &command->get_inkey;
gboolean ret;
if (command->src != STK_DEVICE_IDENTITY_TYPE_UICC)
@ -2130,12 +2130,10 @@ static gboolean parse_get_inkey(struct stk_command *command,
&obj->text,
STK_DATA_OBJECT_TYPE_ICON_ID, 0,
&obj->icon_id,
STK_DATA_OBJECT_TYPE_IMMEDIATE_RESPONSE, 0,
&obj->immediate_response,
STK_DATA_OBJECT_TYPE_DURATION, 0,
&obj->duration,
STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0,
&obj->text_attribute,
&obj->text_attr,
STK_DATA_OBJECT_TYPE_FRAME_ID, 0,
&obj->frame_id,
STK_DATA_OBJECT_TYPE_INVALID);

View File

@ -798,6 +798,14 @@ struct stk_command_display_text {
struct stk_frame_id frame_id;
};
struct stk_command_get_inkey {
char *text;
struct stk_icon_id icon_id;
struct stk_duration duration;
struct stk_text_attribute text_attr;
struct stk_frame_id frame_id;
};
struct stk_command_get_input {
char *text;
struct stk_response_length response_length;
@ -825,7 +833,7 @@ struct stk_command {
union {
struct stk_command_display_text display_text;
struct stk_command_display_text get_inkey;
struct stk_command_get_inkey get_inkey;
struct stk_command_get_input get_input;
struct stk_command_send_sms send_sms;
};