FreeCalypso > hg > fc-tourmaline
diff src/ui/bmi/mmiSimToolkit.c @ 92:c0052fe355d3
src/ui/bmi/*.[ch]: rm trailing white space
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sun, 08 Nov 2020 06:39:16 +0000 |
| parents | 67bfe9f274f6 |
| children | adae850f9857 |
line wrap: on
line diff
--- a/src/ui/bmi/mmiSimToolkit.c Sun Nov 08 05:12:05 2020 +0000 +++ b/src/ui/bmi/mmiSimToolkit.c Sun Nov 08 06:39:16 2020 +0000 @@ -27,7 +27,7 @@ ******************************************************************************** $History: MmiSimToolkit.c - + Apr 18, 2006 Ref:OMAPS00116309 R.Prabakar (a0393213) CT-GCF[27.22.4.7.1]- MMI crashes on REFERSH seq 1.2 Solution : Data type mismatch between ACI and MMI sorted out @@ -41,9 +41,9 @@ Description: CT PTCRB - TC27.22.4.22.2 SET UP IDLE MODE TEXT (Icon support) - Unexpected TERMINAL RESPONSE performed Solution: Set satResult as unknownData icon is not present. - + Nov 17, 2006 REF:DR:OMAPS00104580 x0039928 - Description: CT GCF - TC27.22.4.13.1 Seq 1.10 - PROACTIVE SIM COMMANDS: + Description: CT GCF - TC27.22.4.13.1 Seq 1.10 - PROACTIVE SIM COMMANDS: SET UP CALL (NORMAL) - Call Set-up Failed Solution: Removed the Redial flag enabling code. @@ -54,25 +54,25 @@ 06 Oct 2006, Ref OMAPS00095263, Archana(x0047075) Description : CT-GCF[27.22.4.24.1]-MS Resets Solution : Editor dialog is destroyed on destroy event instead of timeout. - + Nov 07, 2006 ER:OMAPS00070661 R.Prabakar(a0393213) R99 network compliancy : Implemented Language Notification and Provide Local Information (Language setting) SAT proactive commands and Language Selection SAT event - + 10 Jul 2006, Ref OMAPS00077654, R.Prabakar(a0393213) Description : Cyrillic character support in MMI to pass GCF/PTCRB UCS2 TC (SATK) Solution : UCS2 display added to terminal profile. Made some changes for long idle screen text display and UCS2 display for SAT icon - + Jun 06, 2006 DR: OMAPS00080543 - xreddymn Changes to display long SAT messages correctly on idle screen. 29 May 2006 REF: OMAPS00071366, x0045876 - Description: IT3 verdict: FAIL, [Step 13] The ME did not display idle screen without the message + Description: IT3 verdict: FAIL, [Step 13] The ME did not display idle screen without the message "Idle Mode Text" as expected. xrashmic 16 Feb, 2006 OMAPS00064413 - When a SIM RESET occurs, while recreating the simtoolkit list view, the list win is also recreated. + When a SIM RESET occurs, while recreating the simtoolkit list view, the list win is also recreated. May 26, 2006 REF: OMAPS00076094, x0045876 Description: MMI's Terminal Profile (TP) setup is not in line with the SAT class e implementation @@ -84,19 +84,19 @@ May 09, 2006 REF: OMAPS00064076, x0045876 Description: SAT IDLE TEXT - UCS2 Display Solution: Added UCS2 support to display UCS2 characters in IDLE MODE. - + xrashmic 16 Feb, 2006 OMAPS00064413 - When a SIM RESET occurs, while recreating the simtoolkit list view, the list win is also recreated. + When a SIM RESET occurs, while recreating the simtoolkit list view, the list win is also recreated. Mar 11, 2006 REF:DR:OMAPS00061467 x0035544 Description: 27.22.4.13.3 SET UP CALL (display of icons) fails. - Solution: In the function sim_toolkit_exec() for the event SAT_SETUP_CALL copied the icon data which is + Solution: In the function sim_toolkit_exec() for the event SAT_SETUP_CALL copied the icon data which is got through the sat command on to the structures data->call_setup_parameter.iconInfo and to the data->call_setup_parameter.iconInfo2 appropriately.And For the event SAT_CALL_END freed the memory allocated for the icon data. - on to the - + on to the + Feb 02, 2006 DR: OMAPS00061468 - x0035544. - Description: SAT 27.22.4.22.2 SET UP IDLE MODE TEXT (Icon support) fails + Description: SAT 27.22.4.22.2 SET UP IDLE MODE TEXT (Icon support) fails Solution : SAT SET UP IDLE MODE TEXT (Icon) support added. Jan 16, 2006 DR: OMAPS00061460 - Shashi Shekar B.S. @@ -107,7 +107,7 @@ Bug: CT-TIB-GCF[27.22.4.24.1]-sequence 1.2 crashes Fix: Initialize the editor buffer. Initialization is taken care for DTMF and also for SS. - + xreddymn Sep-06-2005 MMI-SPR-33876: Initialize editor buffer when displaying message box in case of SAT_SEND_SMS @@ -120,12 +120,12 @@ 21/02/03 removed all calls to function sat_add_unicode_tag_if_needed() and the function itself 26-05-04 CRR 19656 Sandip and Deepa M.D - Fix for The Dsample doesn't display lines ( <CR> or <LF> ) in the SETUP IDLE + Fix for The Dsample doesn't display lines ( <CR> or <LF> ) in the SETUP IDLE TEXT command. - Fix for The idle screen is empty when a SETUP IDLE TEXT command is sent with + Fix for The idle screen is empty when a SETUP IDLE TEXT command is sent with a long text ( 239 characters ). - - + + $End *******************************************************************************/ @@ -415,14 +415,14 @@ #ifdef SAT_TP1_PRF_DNL (SAT_TP1_PRF_DNL | SAT_TP1_MENU_SEL), - + /* 26-05-2006, x0045876 (OMAPS00076094 - Removed SAT_TP2_UCS2_ENTRY, SAT_TP2_UCS2_DSPL, SAT_TP2_DSPL_EXT) */ /*10 Jul 2006, Ref OMAPS00077654, R.Prabakar(a0393213) Description : Cyrillic character support in MMI to pass GCF/PTCRB UCS2 TC (SATK) Solution : UCS2 display added to terminal profile*/ (SAT_TP2_CMD_RES|SAT_TP2_CC|SAT_TP2_ALPHA_ID| - SAT_TP2_UCS2_DSPL), + SAT_TP2_UCS2_DSPL), (SAT_TP3_DSPL_TXT|SAT_TP3_GET_INKEY|SAT_TP3_GET_INPUT| SAT_TP3_PLAY_TONE|SAT_TP3_REFRESH), @@ -436,10 +436,10 @@ (SAT_TP6_LANG_SEL), /*OMAPS00070661 R.Prabakar(a0393213) Language Selection Enabled */ #else 0x0, -#endif +#endif 0x0, - + (SAT_TP8_BIN_GET_INKEY | SAT_TP8_IDLE_TXT | SAT_TP8_AI2_SETUP_CALL), #if defined(FF_WAP) @@ -447,19 +447,19 @@ /*OMAPS00070661 R.Prabakar(a0393213) Language Notification and Local Information(language setting)*/ (SAT_TP9_SUST_DSPL_TXT|SAT_TP9_LAUNCH_BROWSER | SAT_TP9_PLI_LANG | SAT_TP9_LANG_NOTIFY), #else - (SAT_TP9_SUST_DSPL_TXT|SAT_TP9_LAUNCH_BROWSER), + (SAT_TP9_SUST_DSPL_TXT|SAT_TP9_LAUNCH_BROWSER), #endif #else #ifdef FF_MMI_R99_SAT_LANG /*OMAPS00070661 R.Prabakar(a0393213) Language Notification and Local Information(language setting)*/ (SAT_TP9_SUST_DSPL_TXT | SAT_TP9_PLI_LANG | SAT_TP9_LANG_NOTIFY), #else - SAT_TP9_SUST_DSPL_TXT, + SAT_TP9_SUST_DSPL_TXT, #endif #endif /* 26-05-2006, x0045876 (OMAPS00076094 - Added Softkeys) */ - 0x03, + 0x03, 0x0, @@ -477,7 +477,7 @@ #else 0x09, 0x7B, 0x97, 0x3F, 0x61, 0x00, 0x00, 0x58, 0x01, 0x03, 0x00 /*, 0x0F, 0x03*/ #endif - /* END: 11-05-2006, x0045876 (OMAPS00076094) */ + /* END: 11-05-2006, x0045876 (OMAPS00076094) */ #endif }; @@ -552,7 +552,7 @@ MfwSatCloseChannel| MfwSatSendData| MfwSatReceiveData| - MfwSatErrBusy /* SAT error handling */ + MfwSatErrBusy /* SAT error handling */ #ifdef FF_MMI_R99_SAT_LANG |MfwSatLangNotify | /*OMAPS00070661 (SAT-lang notify and local info(lang setting)) a0393213(R.Prabakar)*/ MfwSatLocalInfo @@ -676,14 +676,14 @@ switch (event) - { + { #ifdef FF_MMI_R99_SAT_LANG case SAT_LOCAL_INFO: /*OMAPS00070661(SAT-Local Info(lang setting)) a0393213(R.Prabakar)*/ TRACE_EVENT ("SAT Local Information "); if(sat_command->qual==LOCAL_INFO_LANG_SETTING_QUALIFIER)/*local information - language setting*/ { - UBYTE lang[2]; + UBYTE lang[2]; switch(Mmi_getCurrentLanguage()) { @@ -701,10 +701,10 @@ break; case GERMAN_LANGUAGE: lang [0] = ASCII_FOR_D; /* 'd' */ - lang [1] = ASCII_FOR_E; /* 'e' */ + lang [1] = ASCII_FOR_E; /* 'e' */ sat_res[SAT_ERR_INDEX] = SAT_RES_SUCCESS; sat_res[SAT_AI_INDEX] = SatResAiNoCause; - break; + break; default: sat_res[SAT_ERR_INDEX]=SAT_RES_MISSING; sat_res[SAT_AI_INDEX] = SatResAiNoService; @@ -713,14 +713,14 @@ satLocalInfo(sat_command, sat_res, sizeof(sat_res), lang, sizeof(lang)); } break; - case SAT_LANGUAGE_NOTIFY: + case SAT_LANGUAGE_NOTIFY: /*OMAPS00070661(SAT-Lang notify) a0393213(R.Prabakar)*/ TRACE_EVENT ("Language Notification "); - + /* Terminal Response to SIM - OK for getting the notification of language */ sat_res[SAT_ERR_INDEX] = SAT_RES_SUCCESS; sat_res[SAT_AI_INDEX] = SatResAiNoCause; - + if(sat_command->qual == LANG_NOTIFY_SPEC_LANG_QUALIFIER) /*specified language notification*/ { /* Check for language and set the respective language */ @@ -729,13 +729,13 @@ /* set as English */ Mmi_Set2Language(ENGLISH_LANGUAGE); } - else if ((sat_command->c.language.lang[0] == ASCII_FOR_D) && (sat_command->c.language.lang[1] == ASCII_FOR_E)) /* German */ + else if ((sat_command->c.language.lang[0] == ASCII_FOR_D) && (sat_command->c.language.lang[1] == ASCII_FOR_E)) /* German */ { /* Set as German */ - Mmi_Set2Language(GERMAN_LANGUAGE); + Mmi_Set2Language(GERMAN_LANGUAGE); } - else if ((sat_command->c.language.lang[0] == ASCII_FOR_Z) && (sat_command->c.language.lang[1] == ASCII_FOR_H)) /* Chineese */ + else if ((sat_command->c.language.lang[0] == ASCII_FOR_Z) && (sat_command->c.language.lang[1] == ASCII_FOR_H)) /* Chineese */ { /* Set as Chineese */ Mmi_Set2Language (CHINESE_LANGUAGE); @@ -754,8 +754,8 @@ { Mmi_Set2Language(ENGLISH_LANGUAGE); } - sat_done (sat_command, sat_res); - break; + sat_done (sat_command, sat_res); + break; #endif /*FF_MMI_R99_SAT_LANG*/ case SAT_DISPLAY_TEXT: TRACE_EVENT("SAT_DISPLAY_TEXT"); @@ -915,16 +915,16 @@ if(sat_command->c.sms.info.icon.qual != 0xFF) { /* Copy the icon data to the editor attributes*/ - data->editor_data.editor_attr.TitleIcon.width = sat_command->c.sms.info.iconInfo.width; - data->editor_data.editor_attr.TitleIcon.height = sat_command->c.sms.info.iconInfo.height; + data->editor_data.editor_attr.TitleIcon.width = sat_command->c.sms.info.iconInfo.width; + data->editor_data.editor_attr.TitleIcon.height = sat_command->c.sms.info.iconInfo.height; icon_length = sat_command->c.sms.info.iconInfo.width * sat_command->c.sms.info.iconInfo.height; - + data->editor_data.editor_attr.TitleIcon.data = (char *)ALLOC_MEMORY (icon_length); memcpy(data->editor_data.editor_attr.TitleIcon.data, sat_command->c.sms.info.iconInfo.dst, icon_length); data->editor_data.editor_attr.TitleIcon.isTitle = TRUE; - + /* Icon is self-explanatory. No need to display text for this case.*/ if(sat_command->c.sms.info.icon.qual == 0x00) { @@ -935,10 +935,10 @@ /* Free the memory of icon data that we got through the SATK command*/ mfwFree((U8 *)sat_command->c.sms.info.iconInfo.dst, icon_length); sat_command->c.sms.info.iconInfo.dst = NULL; - + } #endif - + data->info_win = AUI_edit_Start(win, &data->editor_data); #else /* NEW_EDITOR */ data->editor_data.LeftSoftKey = TxtNull; @@ -981,23 +981,23 @@ // Dec 23, 2005 REF: OMAPS00062166 x0039928 // Fix: Initialize the editor buffer AUI_edit_SetBuffer(&data->editor_data, ATB_DCS_ASCII, (UBYTE*)"", 1); - + // Shashi Shekar B.S., a0876501, Jan 16, 2006, DR: OMAPS00061460 #ifdef FF_MMI_SAT_ICON /*Check if the SAT command has icon*/ if(sat_command->c.ss.info.icon.qual != 0xFF) { /* Copy the icon data to the editor attributes*/ - data->editor_data.editor_attr.TitleIcon.width = sat_command->c.ss.info.iconInfo.width; - data->editor_data.editor_attr.TitleIcon.height = sat_command->c.ss.info.iconInfo.height; + data->editor_data.editor_attr.TitleIcon.width = sat_command->c.ss.info.iconInfo.width; + data->editor_data.editor_attr.TitleIcon.height = sat_command->c.ss.info.iconInfo.height; icon_length = sat_command->c.ss.info.iconInfo.width * sat_command->c.ss.info.iconInfo.height; - + data->editor_data.editor_attr.TitleIcon.data = (char *)ALLOC_MEMORY (icon_length); memcpy(data->editor_data.editor_attr.TitleIcon.data, sat_command->c.ss.info.iconInfo.dst, icon_length); data->editor_data.editor_attr.TitleIcon.isTitle = TRUE; - + /* Icon is self-explanatory. No need to display text for this case.*/ if(sat_command->c.ss.info.icon.qual == 0x00) { @@ -1008,10 +1008,10 @@ /* Free the memory of icon data that we got through the SATK command*/ mfwFree((U8 *)sat_command->c.ss.info.iconInfo.dst, icon_length); sat_command->c.ss.info.iconInfo.dst = NULL; - + } #endif - + data->info_win = AUI_edit_Start(win, &data->editor_data); #else /* NEW_EDITOR */ @@ -1040,7 +1040,7 @@ if(sat_command->c.ss.info.icon.qual != 0xFF) { /* Free the memory of icon data that we got through the SATK command*/ - mfwFree((U8 *)sat_command->c.ss.info.iconInfo.dst, sat_command->c.ss.info.iconInfo.width * + mfwFree((U8 *)sat_command->c.ss.info.iconInfo.dst, sat_command->c.ss.info.iconInfo.width * sat_command->c.ss.info.iconInfo.height); sat_command->c.ss.info.iconInfo.dst = NULL; } @@ -1079,23 +1079,23 @@ // Dec 23, 2005 REF: OMAPS00062166 x0039928 // Fix: Initialize the editor buffer AUI_edit_SetBuffer(&data->editor_data, ATB_DCS_ASCII, (UBYTE*)"", 1); - + // Shashi Shekar B.S., a0876501, Jan 16, 2006, DR: OMAPS00061460 #ifdef FF_MMI_SAT_ICON /*Check if the SAT command has icon*/ if(sat_command->c.cmd.info.icon.qual != 0xFF) { /* Copy the icon data to the editor attributes*/ - data->editor_data.editor_attr.TitleIcon.width = sat_command->c.cmd.info.iconInfo.width; - data->editor_data.editor_attr.TitleIcon.height = sat_command->c.cmd.info.iconInfo.height; + data->editor_data.editor_attr.TitleIcon.width = sat_command->c.cmd.info.iconInfo.width; + data->editor_data.editor_attr.TitleIcon.height = sat_command->c.cmd.info.iconInfo.height; icon_length = sat_command->c.cmd.info.iconInfo.width * sat_command->c.cmd.info.iconInfo.height; - + data->editor_data.editor_attr.TitleIcon.data = (char *)ALLOC_MEMORY (icon_length); memcpy(data->editor_data.editor_attr.TitleIcon.data, sat_command->c.cmd.info.iconInfo.dst, icon_length); data->editor_data.editor_attr.TitleIcon.isTitle = TRUE; - + /* Icon is self-explanatory. No need to display text for this case.*/ if(sat_command->c.cmd.info.icon.qual == 0x00) { @@ -1106,10 +1106,10 @@ /* Free the memory of icon data that we got through the SATK command*/ mfwFree((U8 *)sat_command->c.cmd.info.iconInfo.dst, icon_length); sat_command->c.cmd.info.iconInfo.dst = NULL; - + } #endif - + data->info_win = AUI_edit_Start(win, &data->editor_data); #else /* NEW_EDITOR */ @@ -1171,10 +1171,10 @@ //copy the icon data for the first alpha identifier #ifdef FF_MMI_SAT_ICON if (sat_command->c.call.info.icon.qual != 0xFF) - { + { data->call_setup_parameter->IconInfo.width = sat_command->c.call.info.iconInfo.width; data->call_setup_parameter->IconInfo.height= sat_command->c.call.info.iconInfo.height; - icon_length = sat_command->c.call.info.iconInfo.width * sat_command->c.call.info.iconInfo.height; + icon_length = sat_command->c.call.info.iconInfo.width * sat_command->c.call.info.iconInfo.height; if(sat_command->c.call.info.iconInfo.dst != NULL) { data->call_setup_parameter->IconInfo.dst = (char *)ALLOC_MEMORY (icon_length); @@ -1184,16 +1184,16 @@ { /* Icon is self-explanatory. Do not display the text*/ data->call_setup_parameter->IconInfo.selfExplanatory = TRUE; - + } else data->call_setup_parameter->IconInfo.selfExplanatory = FALSE; - + /* Free the memory of icon data that we got through the SATK command*/ if(sat_command->c.call.info.iconInfo.dst != NULL) { mfwFree((U8 *)sat_command->c.call.info.iconInfo.dst, icon_length); - sat_command->c.call.info.iconInfo.dst = NULL; + sat_command->c.call.info.iconInfo.dst = NULL; } } else @@ -1203,8 +1203,8 @@ data->call_setup_parameter->IconInfo.height = 0; data->call_setup_parameter->IconInfo.selfExplanatory = FALSE; } - - #endif + + #endif } else { @@ -1234,10 +1234,10 @@ TRACE_EVENT("call.info2 contains data."); data->call_setup_parameter->TextString2 = sat_create_TEXT_ASCIIZ(&sat_command->c.call.info2); //x0035544 Feb 07, 2006 DR:OMAPS00061467 - //copy the icon data for the second alpha identifier + //copy the icon data for the second alpha identifier #ifdef FF_MMI_SAT_ICON if (sat_command->c.call.info2.icon.qual != 0xFF) - { + { data->call_setup_parameter->IconInfo2.width= sat_command->c.call.info2.iconInfo.width; data->call_setup_parameter->IconInfo2.height = sat_command->c.call.info2.iconInfo.height; data->call_setup_parameter->IconInfo2.dst = data->call_setup_parameter->IconInfo.dst; @@ -1247,7 +1247,7 @@ data->call_setup_parameter->IconInfo2.selfExplanatory = TRUE; } else - data->call_setup_parameter->IconInfo2.selfExplanatory = FALSE; + data->call_setup_parameter->IconInfo2.selfExplanatory = FALSE; } else { @@ -1257,7 +1257,7 @@ data->call_setup_parameter->IconInfo2.selfExplanatory = FALSE; } - #endif + #endif #ifdef NO_ASCIIZ/*MC SPR 940/2 Add tag to Unicode strings so info dialogue displays them correctly*/ sat_add_unicode_tag_if_needed(data->call_setup_parameter->TextString2); #endif @@ -1484,11 +1484,11 @@ #ifdef FF_MMI_SAT_ICON if (data->call_setup_parameter->IconInfo.dst != NULL) { - FREE_MEMORY((U8 *)data->call_setup_parameter->IconInfo.dst, data->call_setup_parameter->IconInfo.width * + FREE_MEMORY((U8 *)data->call_setup_parameter->IconInfo.dst, data->call_setup_parameter->IconInfo.width * data->call_setup_parameter->IconInfo.height); data->call_setup_parameter->IconInfo.dst = NULL; } - + #endif FREE_MEMORY ((U8 *)data->call_setup_parameter, sizeof (T_SAT_call_setup_parameter)); data->call_setup_parameter = NULL; @@ -1577,12 +1577,12 @@ sat_command->c.text.iconInfo.height); sat_command->c.text.iconInfo.dst = NULL; } - + #else addSatMessage(NULL); #endif - /* 09-May-2006, x0045876 (OMAPS00064076 - By sending SatResUnKnownData, + /* 09-May-2006, x0045876 (OMAPS00064076 - By sending SatResUnKnownData, TC 27.22.4.22.1 SEQ 1.3 was failing. It was changed due to integration problem) */ /* 16 -Jan -2007 x0043642 OMAPS00110997 */ @@ -1592,13 +1592,13 @@ sat_res[SAT_ERR_INDEX] = SatResUnknownData; sat_res[SAT_AI_INDEX] = SatResAiNoCause; sat_done(sat_command, sat_res); - + } else #endif { - + sat_res[SAT_ERR_INDEX] = SatResSuccess; sat_res[SAT_AI_INDEX] = SatResAiNoCause; sat_done(sat_command, sat_res); @@ -1621,7 +1621,7 @@ if (!txtBuf) { - sat_res[SAT_ERR_INDEX] = SatResImpossible; + sat_res[SAT_ERR_INDEX] = SatResImpossible; sat_res[SAT_AI_INDEX] = SatResAiNoCause; sat_done(sat_command, sat_res); } @@ -1655,7 +1655,7 @@ TRACE_EVENT_P3("NDH >>> inDcs : %02x, outDCS : %02x, Text Len : %d", inText->code, outDCS, inText->len); - + if ((inText->code == 0x00) || ((inText->code & 0x0c) == 0x00)) // GSM 7-Bit { ATB_convert_String((char *)inText + inText->text, @@ -1669,10 +1669,10 @@ } else if ((inText->code & 0x0c) == 0x04) // ASCII 8-Bit { -/* xreddymn OMAPS00080543 Jun-06-2006 +/* xreddymn OMAPS00080543 Jun-06-2006 * Since long idle screen text display is now supported, we no longer * need to check length of the message. - */ + */ #if 0 if (outDCS == MFW_ASCII) { @@ -1684,7 +1684,7 @@ /* ** Display Text too long ... Send failure TR to SIM */ - sat_res[SAT_ERR_INDEX] = SatResImpossible; + sat_res[SAT_ERR_INDEX] = SatResImpossible; sat_res[SAT_AI_INDEX] = SatResAiNoCause; sat_done(sat_command, sat_res); @@ -1725,14 +1725,14 @@ } } else // UCS2 -/* xreddymn OMAPS00080543 Jun-06-2006 +/* xreddymn OMAPS00080543 Jun-06-2006 * Since long idle screen text display is now supported, we no longer * need to check length of the message. - */ + */ /*10 Jul 2006, Ref OMAPS00077654, R.Prabakar(a0393213) Description : Cyrillic character support in MMI to pass GCF/PTCRB UCS2 TC (SATK) Solution : #if 0 added for OMAPS00080543 moved*/ - + { if (outDCS == MFW_DCS_UCS2) @@ -1743,7 +1743,7 @@ /* ** Display Text too long ... Send failure TR to SIM */ - sat_res[SAT_ERR_INDEX] = SatResImpossible; + sat_res[SAT_ERR_INDEX] = SatResImpossible; sat_res[SAT_AI_INDEX] = SatResAiNoCause; sat_done(sat_command, sat_res); @@ -1754,7 +1754,7 @@ #endif { /*Oct 13, 2006 OMAPS00095266 a0393213(R.Prabakar) - Solution : Changes made as part of OMAPS00064076 undone. + Solution : Changes made as part of OMAPS00064076 undone. Before we were appending 0x80 and 0x7F to the original string to describe that the following text is UNICODE. Now since the attribute of the editor is already set to UNICODE, no need to append 0x80 and 0x7F*/ memcpy(txtBuf, (UBYTE*)inText+inText->text, inText->len); @@ -1776,7 +1776,7 @@ } TRACE_EVENT_P1("NDH >>> txtBuf is : %s", txtBuf); - + // 09-Dec-2005, Shashi Shekar B.S., a0876501, START #ifdef FF_MMI_SAT_ICON /*Check if the SAT command has icon*/ @@ -1792,26 +1792,26 @@ Before we were setting the first two bytes to 0x80 and 0x7F and sending the text from the third byte. Now we are not appending any string to the original string. So the buffer is sent right from the first byte*/ addSatMessage((char*)txtBuf, sat_command->c.text.iconInfo.width, sat_command->c.text.iconInfo.height, - (char *)sat_command->c.text.iconInfo.dst, TRUE, SAT_ICON_IDLEMODE_TEXT); + (char *)sat_command->c.text.iconInfo.dst, TRUE, SAT_ICON_IDLEMODE_TEXT); } else { addSatMessage((char*)txtBuf, sat_command->c.text.iconInfo.width, sat_command->c.text.iconInfo.height, - (char *)sat_command->c.text.iconInfo.dst, FALSE, SAT_ICON_IDLEMODE_TEXT); + (char *)sat_command->c.text.iconInfo.dst, FALSE, SAT_ICON_IDLEMODE_TEXT); } } else { - addSatMessage((char*)txtBuf, 0, 0, NULL, FALSE, SAT_ICON_NONE); + addSatMessage((char*)txtBuf, 0, 0, NULL, FALSE, SAT_ICON_NONE); } #else /* START: 09-May-2006, x0045876 (OMAPS00064076) */ addSatMessage((char*)txtBuf); /* END: 09-May-2006, x0045876 (OMAPS00064076) */ -#endif - - sat_res[SAT_ERR_INDEX] = SatResSuccess; +#endif + + sat_res[SAT_ERR_INDEX] = SatResSuccess; sat_res[SAT_AI_INDEX] = SatResAiNoCause; sat_done(sat_command, sat_res); // 09-Dec-2005, Shashi Shekar B.S., a0876501, START @@ -1936,7 +1936,7 @@ static int sim_toolkit_sat_cb ( T_MFW_EVENT event, T_MFW_SAT * sat_bits) { USHORT sat_event = 0; // RAVI - + TRACE_EVENT("sim_toolkit_sat_cb"); /* * check whether a decoded message is available @@ -2132,7 +2132,7 @@ { /* there's already an active SETUP MENU */ SEND_EVENT (sat_get_setup_menu_win(), SAT_EXIT, 0, NULL); /* SETUP_MENU shall selfdestroy */ - //xrashmic 16 Feb, 2006 OMAPS00064413 + //xrashmic 16 Feb, 2006 OMAPS00064413 //List win should be set to null, when destroying the setup menu. sat_set_setup_menu_listmnu_win(NULL); } @@ -2169,7 +2169,7 @@ sat_mainmenu_label[header_len] = '\0'; /*JVJ #1576 The SimToolkit Title string is set here */ res_set_SIMToolkit_title_string(sat_mainmenu_label); - } + } } /* unhide the SIM toolkit menu item in the main menu */ menuEnableSimMenu @@ -2293,11 +2293,11 @@ #ifdef FF_MMI_SAT_ICON if (info_data->editor_data.editor_attr.TitleIcon.data != NULL) { - FREE_MEMORY((U8 *)info_data->editor_data.editor_attr.TitleIcon.data, info_data->editor_data.editor_attr.TitleIcon.width * + FREE_MEMORY((U8 *)info_data->editor_data.editor_attr.TitleIcon.data, info_data->editor_data.editor_attr.TitleIcon.width * info_data->editor_data.editor_attr.TitleIcon.height); info_data->editor_data.editor_attr.TitleIcon.data = NULL; } -#endif +#endif switch(reason) { @@ -2330,11 +2330,11 @@ #ifdef FF_MMI_SAT_ICON if (info_data->editor_data.editor_attr.TitleIcon.data != NULL) { - FREE_MEMORY((U8 *)info_data->editor_data.editor_attr.TitleIcon.data, info_data->editor_data.editor_attr.TitleIcon.width * + FREE_MEMORY((U8 *)info_data->editor_data.editor_attr.TitleIcon.data, info_data->editor_data.editor_attr.TitleIcon.width * info_data->editor_data.editor_attr.TitleIcon.height); info_data->editor_data.editor_attr.TitleIcon.data = NULL; } -#endif +#endif /* SPR#1428 - SH - New Editor changes */ #ifdef NEW_EDITOR sat_destroy_TEXT_ASCIIZ((char*)info_data->editor_data.TitleString); /* displayed text */ @@ -2588,7 +2588,7 @@ { U16 i; TRACE_FUNCTION("sat_gsm_to_ascii"); - // Jun 02, 2004 REF: CRR 15747 xpradipg-SASKEN + // Jun 02, 2004 REF: CRR 15747 xpradipg-SASKEN // Fix: The string is terminated if the length is reached or if it encounters '0xFF' // gsm_string[i]!=0xFF is introduced to check if the string is terminated prior to the specified length for (i = 0; i < length && gsm_string[i]!= (char)0xFF; i++) @@ -2622,8 +2622,8 @@ case MFW_DCS_7bits: temp_buffer = (UBYTE *)ALLOC_MEMORY(((txt->len*8)/7)+1); utl_cvt7To8 ((UBYTE *)txt + txt->text, txt->len, temp_buffer,0); - - //Sandip CQ 16292 . commented + + //Sandip CQ 16292 . commented /*sat_gsm_to_ascii (destination, (char *)temp_buffer, len);*/ /*Sandip CQ 16292 . added this new function . Problem with current TI GSM 7-bit default function*/ DecodeGSM7ToASCII((unsigned char*)txt+txt->text, (unsigned char*) destination, txt->len); @@ -2665,9 +2665,9 @@ $Arguments: encoded - GSM string pointer plain - Buffer to hold the decoded ASCII string - Length - Length of the encoded GSM string - - + Length - Length of the encoded GSM string + + *******************************************************************************/ unsigned char DecodeGSM7ToASCII(U8 * encoded, U8 * plain, U8 Length) { @@ -2721,7 +2721,7 @@ { UBYTE * temp_buffer; - + char debug[50];