# HG changeset patch # User Mychaela Falconia # Date 1605506023 0 # Node ID 24ea5d2ad89b5b633d85e6bda85207c951149a8f # Parent 1075ec44accafb46cb23a8fdd0bee19c81c79c57 mmiEm.c: bogotab fixes diff -r 1075ec44acca -r 24ea5d2ad89b src/ui/bmi/mmiEm.c --- a/src/ui/bmi/mmiEm.c Mon Nov 16 05:47:02 2020 +0000 +++ b/src/ui/bmi/mmiEm.c Mon Nov 16 05:53:43 2020 +0000 @@ -1,6 +1,6 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -9,14 +9,14 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: MMI - $File: MmiEm.c - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: MMI + $File: MmiEm.c + $Revision: 1.0 - $Author: Condat(UK) - $Date: 23/09/02 + $Author: Condat(UK) + $Date: 23/09/02 ******************************************************************************** @@ -32,14 +32,11 @@ Solution: Added new engineering mode functionalities to satisfy Neptune engineering mode requirements. - - 23/09/02 Original Condat(UK) BMI version. + 23/09/02 Original Condat(UK) BMI version. $End - - ******************************************************************************* Include Files @@ -164,20 +161,20 @@ /* associated handlers */ T_MFW_HND kbd; /*keyboard handler*/ - T_MFW_HND tim; /*timer handler*/ + T_MFW_HND tim; /*timer handler*/ /* SPR#1428 - SH - New Editor changes */ #ifdef NEW_EDITOR - T_ED_DATA * editor; - T_ED_ATTR editor_attr; + T_ED_DATA * editor; + T_ED_ATTR editor_attr; #else /* NEW_EDITOR */ T_MFW_HND edt; /*mfw editor handler*/ - MfwEdtAttr editor_data; /*editor config data*/ + MfwEdtAttr editor_data; /*editor config data*/ #endif /* NEW_EDITOR */ /* internal data */ char edtBuffer[EM_EDITOR_SIZE*2];/*SPR 1757*//*editor contentbuffer*/ - MfwEmDataType CurrentWindow; /*type of data being displayed*/ + MfwEmDataType CurrentWindow; /*type of data being displayed*/ } tEmData; @@ -193,8 +190,6 @@ void Mmi_em_tim_cb(T_MFW_EVENT event,T_MFW_TIM * t); //Handles the timer events. - - /* **************************************Public functions**************************************** */ @@ -202,55 +197,53 @@ /******************************************************************************* - $Function: mmi_em_init() + $Function: mmi_em_init() - $Description: initialise Engineering Mode module + $Description: initialise Engineering Mode module - $Returns: None + $Returns: None - $Arguments: None + $Arguments: None *******************************************************************************/ void mmi_em_init(void) { - Mfw_em_init(); - + Mfw_em_init(); } /******************************************************************************* - $Function: mmi_em_enit() + $Function: mmi_em_enit() - $Description: exit Engineering Mode module + $Description: exit Engineering Mode module - $Returns: None + $Returns: None - $Arguments: None + $Arguments: None *******************************************************************************/ void mmi_em_exit(void) { - Mfw_em_exit(); + Mfw_em_exit(); } //#ifdef TI_PS_FF_EM #if defined (TI_PS_FF_EM) || defined (MMI_EM_ENABLED) /******************************************************************************* - $Function: mmi_em_start_eng_mode_menus() + $Function: mmi_em_start_eng_mode_menus() - $Description: starts the emergency mode menu + $Description: starts the emergency mode menu - $Returns: None + $Returns: None - $Arguments: parent window + $Arguments: parent window *******************************************************************************/ void mmi_em_start_eng_mode_menus(T_MFW_HND parent) { - TRACE_EVENT("mmi_em_start_eng_mode_menus"); - bookMenuStart(parent, EngModeAttributes(), NULL); - + TRACE_EVENT("mmi_em_start_eng_mode_menus"); + bookMenuStart(parent, EngModeAttributes(), NULL); } #endif @@ -258,120 +251,119 @@ /******************************************************************************* - $Function: Mmi_em_display_mobile_info_data() + $Function: Mmi_em_display_mobile_info_data() - $Description: Called from menu; begins process to display Mobile Information + $Description: Called from menu; begins process to display Mobile Information - $Returns: status integer + $Returns: status integer - $Arguments: menu and item (not used) + $Arguments: menu and item (not used) *******************************************************************************/ +int Mmi_em_display_mobile_info_data(MfwMnu* m, MfwMnuItem* i) +{ T_MFW_HND parent = mfwParent( mfw_header()); + TRACE_EVENT_P1("Mmi_em_display_mobile_info(), parent win %d", parent); + TRACE_EVENT_P1("Memory left:%d", mfwCheckMemoryLeft()); + Mmi_em_create(parent, EM_MOBILE_INFO); -int Mmi_em_display_mobile_info_data(MfwMnu* m, MfwMnuItem* i) -{ T_MFW_HND parent = mfwParent( mfw_header()); - TRACE_EVENT_P1("Mmi_em_display_mobile_info(), parent win %d", parent); - TRACE_EVENT_P1("Memory left:%d", mfwCheckMemoryLeft()); - Mmi_em_create(parent, EM_MOBILE_INFO); - - return MFW_EVENT_CONSUMED; + return MFW_EVENT_CONSUMED; } /******************************************************************************* - $Function: Mmi_em_display_serving_cell_params() + $Function: Mmi_em_display_serving_cell_params() - $Description: Called from menu; begins process to display Serving Cell parameters + $Description: Called from menu; begins process to display Serving Cell parameters - $Returns: status integer + $Returns: status integer - $Arguments: menu and item (not used) + $Arguments: menu and item (not used) *******************************************************************************/ int Mmi_em_display_serving_cell_params(MfwMnu* m, MfwMnuItem* i) -{ T_MFW_HND parent = mfwParent( mfw_header()); - TRACE_EVENT_P1("MMiEm, Memory left:%d", mfwCheckMemoryLeft()); - Mmi_em_create(parent, EM_SERVING_CELL_PARAMS); +{ T_MFW_HND parent = mfwParent( mfw_header()); + TRACE_EVENT_P1("MMiEm, Memory left:%d", mfwCheckMemoryLeft()); + Mmi_em_create(parent, EM_SERVING_CELL_PARAMS); - return MFW_EVENT_CONSUMED; + return MFW_EVENT_CONSUMED; } /******************************************************************************* - $Function: Mmi_em_display_neighbour_cell_params() + $Function: Mmi_em_display_neighbour_cell_params() - $Description: Called from menu; begins process to display Neighbouring Cell parameters + $Description: Called from menu; begins process to display Neighbouring Cell parameters - $Returns: status integer + $Returns: status integer - $Arguments: menu and item (not used) + $Arguments: menu and item (not used) *******************************************************************************/ int Mmi_em_display_neighbour_cell_params(MfwMnu* m, MfwMnuItem* i) -{ T_MFW_HND parent = mfwParent( mfw_header()); - TRACE_EVENT_P1("MMiEm, Memory left:%d", mfwCheckMemoryLeft()); - Mmi_em_create(parent, EM_NEIGHBOURING_CELL_PARAMS); +{ T_MFW_HND parent = mfwParent( mfw_header()); + TRACE_EVENT_P1("MMiEm, Memory left:%d", mfwCheckMemoryLeft()); + Mmi_em_create(parent, EM_NEIGHBOURING_CELL_PARAMS); - return MFW_EVENT_CONSUMED; + return MFW_EVENT_CONSUMED; } /******************************************************************************* - $Function: Mmi_em_display_location_params() + $Function: Mmi_em_display_location_params() - $Description: Called from menu; begins process to display Locationparameters + $Description: Called from menu; begins process to display Locationparameters - $Returns: status integer + $Returns: status integer - $Arguments: menu and item (not used) + $Arguments: menu and item (not used) *******************************************************************************/ int Mmi_em_display_location_params(MfwMnu* m, MfwMnuItem*i ) -{ T_MFW_HND parent = mfwParent( mfw_header()); +{ T_MFW_HND parent = mfwParent( mfw_header()); - Mmi_em_create(parent, EM_LOCATION_PARAMS); + Mmi_em_create(parent, EM_LOCATION_PARAMS); - return MFW_EVENT_CONSUMED; + return MFW_EVENT_CONSUMED; } /******************************************************************************* - $Function: Mmi_em_display_ciph_hop_DTX_params() + $Function: Mmi_em_display_ciph_hop_DTX_params() - $Description: Called from menu; begins process to display Ciphering, hopping and + $Description: Called from menu; begins process to display Ciphering, hopping and discontinuous transmission parameters - $Returns: status integer + $Returns: status integer - $Arguments: menu and item (not used) + $Arguments: menu and item (not used) *******************************************************************************/ int Mmi_em_display_ciph_hop_DTX_params(MfwMnu* m, MfwMnuItem* i) -{ T_MFW_HND parent = mfwParent( mfw_header()); - TRACE_EVENT_P1("MMiEm, Memory left:%d", mfwCheckMemoryLeft()); - Mmi_em_create(parent, EM_CIPH_HOP_DTX_PARAMS); +{ T_MFW_HND parent = mfwParent( mfw_header()); + TRACE_EVENT_P1("MMiEm, Memory left:%d", mfwCheckMemoryLeft()); + Mmi_em_create(parent, EM_CIPH_HOP_DTX_PARAMS); - return MFW_EVENT_CONSUMED; + return MFW_EVENT_CONSUMED; } /******************************************************************************* - $Function: Mmi_em_display_GPRS_params() + $Function: Mmi_em_display_GPRS_params() - $Description: Called from menu; begins process to display GPRS specific parameters + $Description: Called from menu; begins process to display GPRS specific parameters - $Returns: status integer + $Returns: status integer - $Arguments: menu and item (not used) + $Arguments: menu and item (not used) *******************************************************************************/ int Mmi_em_display_GPRS_params(MfwMnu* m, MfwMnuItem* i) -{ T_MFW_HND parent = mfwParent( mfw_header()); - TRACE_EVENT_P1("MMiEm, Memory left:%d", mfwCheckMemoryLeft()); - Mmi_em_create(parent, EM_GPRS_PARAMS); +{ T_MFW_HND parent = mfwParent( mfw_header()); + TRACE_EVENT_P1("MMiEm, Memory left:%d", mfwCheckMemoryLeft()); + Mmi_em_create(parent, EM_GPRS_PARAMS); - return MFW_EVENT_CONSUMED; + return MFW_EVENT_CONSUMED; } #else /* if NEPTUNE_BOARD */ @@ -396,7 +388,6 @@ return MFW_EVENT_CONSUMED; } - #endif /* ifndef NEPTUNE_BOARD */ /* ************************************Internal Functions************************************** @@ -404,13 +395,13 @@ /******************************************************************************* - $Function: Mmi_em_create() + $Function: Mmi_em_create() - $Description: Creates emergency mode display window + $Description: Creates emergency mode display window - $Returns: window handle + $Returns: window handle - $Arguments: parent window, kind of data to be displayed + $Arguments: parent window, kind of data to be displayed *******************************************************************************/ @@ -441,7 +432,7 @@ /*Mobile Info is the only data screen which doesn't need to be updated every second*/ if (data_type != EM_MOBILE_INFO) { - data->tim = tim_create(data->win, EM_UPDATE_RATE, (T_MFW_CB)Mmi_em_tim_cb); + data->tim = tim_create(data->win, EM_UPDATE_RATE, (T_MFW_CB)Mmi_em_tim_cb); timStart(data->tim);//start timer } #endif @@ -476,18 +467,17 @@ Mfw_em_get_data(data_type);/*ask MFW for the required data*/ win_show(data->win);/*show the screen*/ return data->win; - } /******************************************************************************* - $Function: Mmi_em_event_cb() + $Function: Mmi_em_event_cb() - $Description: Handles events coming from the MFW + $Description: Handles events coming from the MFW - $Returns: status integer + $Returns: status integer - $Arguments: event type, pointer to data + $Arguments: event type, pointer to data *******************************************************************************/ int Mmi_em_event_cb(T_MFW_EVENT event,void* para) @@ -518,10 +508,10 @@ TRACE_EVENT_P1("Mmi_em_event_cb(), event:%d", event); temp_buffer=(char*)malloc(EM_EDITOR_SIZE*2*sizeof(char)); /*a0393213 lint warnings removal - dynamically allocated*/ if(temp_buffer==NULL) - { - TRACE_ERROR("Mmi_em_event_cb():No memory"); - return MFW_EVENT_CONSUMED; - } + { + TRACE_ERROR("Mmi_em_event_cb():No memory"); + return MFW_EVENT_CONSUMED; + } memset(temp_buffer, 0, EM_EDITOR_SIZE*2); @@ -531,7 +521,7 @@ if(fd < 0 ) { TRACE_EVENT("Error in Openning File"); - free(temp_buffer); + free(temp_buffer); return FALSE; } @@ -560,28 +550,28 @@ mob_info->TMSI); /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ #ifdef NEW_EDITOR - /*SPR 1757 Insert temp buffer into editor*/ - temp_text.data = (UBYTE*)temp_buffer; - temp_text.dcs = ATB_DCS_ASCII; - ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ - ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ - ATB_edit_Refresh(data->editor); + /*SPR 1757 Insert temp buffer into editor*/ + temp_text.data = (UBYTE*)temp_buffer; + temp_text.dcs = ATB_DCS_ASCII; + ATB_string_Length(&temp_text); + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ClearAll(data->editor); + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ - strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ + strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ #endif - win_show(data->win);/*show data*/ - } - break; + win_show(data->win);/*show data*/ + } + break; #endif - case EM_SERVING_CELL_PARAMS: - { + case EM_SERVING_CELL_PARAMS: + { #ifndef NEPTUNE_BOARD - sc_info = (MFW_EM_Serving_Cell_Parameters*)para;/*cast parameter to appropriate type*/ - sprintf(temp_buffer, "ARFCN:%d RSSI:%d RXQ:%d RLT:%d C1:%d C2:%d LAC:%d BSIC:%d TAV:%d",\ + sc_info = (MFW_EM_Serving_Cell_Parameters*)para;/*cast parameter to appropriate type*/ + sprintf(temp_buffer, "ARFCN:%d RSSI:%d RXQ:%d RLT:%d C1:%d C2:%d LAC:%d BSIC:%d TAV:%d",\ sc_info->arfcn, sc_info->RSSI, sc_info->RXQ, sc_info->RLT, sc_info->C1, sc_info->C2,\ sc_info->LAC, sc_info->BSIC, sc_info->TAV); #else @@ -613,30 +603,30 @@ #endif - /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ + /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ #ifdef NEW_EDITOR - /*SPR 1757 Insert temp buffer into editor*/ - temp_text.data = (UBYTE*)temp_buffer; - temp_text.dcs = ATB_DCS_ASCII; - ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ - ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ - ATB_edit_Refresh(data->editor); + /*SPR 1757 Insert temp buffer into editor*/ + temp_text.data = (UBYTE*)temp_buffer; + temp_text.dcs = ATB_DCS_ASCII; + ATB_string_Length(&temp_text); + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ClearAll(data->editor); + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ - strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ + strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ #endif - win_show(data->win); - } - break; + win_show(data->win); + } + break; - case EM_NEIGHBOURING_CELL_PARAMS: - { + case EM_NEIGHBOURING_CELL_PARAMS: + { #ifndef NEPTUNE_BOARD nc_info = (MFW_EM_Neighbour_Cell_Parameters*)para;/*cast parameter to appropriate type*/ - /*copy data to editor buffer*/ - sprintf(temp_buffer, "NUM:%d\nARFCN:RSSI:C2:LAC:BSIC\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n SC%4d%5d%5d%6d%5d",\ + /*copy data to editor buffer*/ + sprintf(temp_buffer, "NUM:%d\nARFCN:RSSI:C2:LAC:BSIC\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n %5d%5d%5d%6d%5d\n SC%4d%5d%5d%6d%5d",\ nc_info->NUM,\ nc_info->arfcn[0], nc_info->RSSI[0], nc_info->C2[0], nc_info->LAC_NC[0], nc_info->BSIC_NC[0],\ nc_info->arfcn[1], nc_info->RSSI[1], nc_info->C2[1], nc_info->LAC_NC[1], nc_info->BSIC_NC[1],\ @@ -645,9 +635,9 @@ nc_info->arfcn[4], nc_info->RSSI[4], nc_info->C2[4], nc_info->LAC_NC[4], nc_info->BSIC_NC[4],\ nc_info->arfcn[5], nc_info->RSSI[5], nc_info->C2[5], nc_info->LAC_NC[5], nc_info->BSIC_NC[5],\ nc_info->arfcn[6], nc_info->RSSI[6], nc_info->C2[6], nc_info->LAC_NC[6], nc_info->BSIC_NC[6]); - /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ - /*show the window*/ - win_show(data->win); + /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ + /*show the window*/ + win_show(data->win); #else /* NEPTUNE_BOARD*/ sprintf (temp_buffer, "NEIGHBOURING CELL\nNUM : %d\nBCCH <> %d \nBSIC <> %d %d %d %d %d %d \nRXLEV <> %d %d %d %d %d %d\nC1 <> %d %d %d %d %d %d\nC2 <> %d %d %d %d %d %d\nC31 <> %d %d %d %d %d %d\nC32 <> %d %d %d %d %d %d\nARFCN <> %d %d %d %d %d %d\nFRAME OFFSET <> %d %d %d %d %d %d\nTIME ALIGN <> %d %d %d %d %d %d", @@ -715,105 +705,105 @@ #endif #ifdef NEW_EDITOR - /*SPR 1757 Insert temp buffer into editor*/ - temp_text.data = (UBYTE*)temp_buffer; - temp_text.dcs = ATB_DCS_ASCII; - ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ - ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ - ATB_edit_Refresh(data->editor); + /*SPR 1757 Insert temp buffer into editor*/ + temp_text.data = (UBYTE*)temp_buffer; + temp_text.dcs = ATB_DCS_ASCII; + ATB_string_Length(&temp_text); + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ClearAll(data->editor); + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ - strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ + strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ #endif win_show(data->win); - } - break; + } + break; #ifndef NEPTUNE_BOARD case EM_LOCATION_PARAMS: - { + { loc_info = (MFW_EM_Location_Parameters*)para;/*cast parameter to appropriate type*/ - /*copy data to editor buffer*/ - /*MC, SPR 1554 Removed Cell id from editor string*/ - sprintf(temp_buffer, "LUP:%d MCC:%s MNC:%s LAC:%d ", loc_info->LUP, loc_info->MCC, loc_info->MNC, loc_info->LAC); - /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ + /*copy data to editor buffer*/ + /*MC, SPR 1554 Removed Cell id from editor string*/ + sprintf(temp_buffer, "LUP:%d MCC:%s MNC:%s LAC:%d ", loc_info->LUP, loc_info->MCC, loc_info->MNC, loc_info->LAC); + /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ #ifdef NEW_EDITOR - /*SPR 1757 Insert temp buffer into editor*/ - temp_text.data = (UBYTE*)temp_buffer; - temp_text.dcs = ATB_DCS_ASCII; - ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ - ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ - ATB_edit_Refresh(data->editor); + /*SPR 1757 Insert temp buffer into editor*/ + temp_text.data = (UBYTE*)temp_buffer; + temp_text.dcs = ATB_DCS_ASCII; + ATB_string_Length(&temp_text); + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ClearAll(data->editor); + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ - strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ + strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ #endif - /*show the window*/ - win_show(data->win); - } - break; + /*show the window*/ + win_show(data->win); + } + break; #endif #ifndef NEPTUNE_BOARD - case EM_CIPH_HOP_DTX_PARAMS: - { + case EM_CIPH_HOP_DTX_PARAMS: + { ciph_hop_dtx_info = (MFW_EM_Ciph_hop_DTX_Parameters*)para;/*cast parameter to appropriate type*/ - /*convert DTX status to string*/ - if (ciph_hop_dtx_info->DTX_status == FALSE) - DTX_Status = "Off"; - else - DTX_Status = "On"; - //copy data to editor - sprintf(temp_buffer, "STATUS:%d HSN:%d DTX:%s ", ciph_hop_dtx_info->ciph_status, ciph_hop_dtx_info->HSN, DTX_Status); - /*show the window*/ - /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ + /*convert DTX status to string*/ + if (ciph_hop_dtx_info->DTX_status == FALSE) + DTX_Status = "Off"; + else + DTX_Status = "On"; + //copy data to editor + sprintf(temp_buffer, "STATUS:%d HSN:%d DTX:%s ", ciph_hop_dtx_info->ciph_status, ciph_hop_dtx_info->HSN, DTX_Status); + /*show the window*/ + /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ #ifdef NEW_EDITOR - /*SPR 1757 Insert temp buffer into editor*/ - temp_text.data = (UBYTE*)temp_buffer; - temp_text.dcs = ATB_DCS_ASCII; - ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ - ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ - ATB_edit_Refresh(data->editor); + /*SPR 1757 Insert temp buffer into editor*/ + temp_text.data = (UBYTE*)temp_buffer; + temp_text.dcs = ATB_DCS_ASCII; + ATB_string_Length(&temp_text); + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ClearAll(data->editor); + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ - strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ + strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ #endif - win_show(data->win); - } - break; + win_show(data->win); + } + break; #endif #ifndef NEPTUNE_BOARD - case EM_GPRS_PARAMS: - { + case EM_GPRS_PARAMS: + { gprs_info = (MFW_EM_GPRS_Parameter*)para;//cast parameter to appropriate type - /*MC, SPR 1554 Changed ediotr string to show Network Mode of Operation*/ - sprintf(temp_buffer, "NMO:%d NDTS:%d RAC:%d C31:%d C32:%d",\ + /*MC, SPR 1554 Changed ediotr string to show Network Mode of Operation*/ + sprintf(temp_buffer, "NMO:%d NDTS:%d RAC:%d C31:%d C32:%d",\ gprs_info->NMO, gprs_info->NDTS, gprs_info->RAC, gprs_info->C31, gprs_info->C32); - //show the window - /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ + //show the window + /* SPR#1428 - SH - New Editor - string has changed, update word wrap */ #ifdef NEW_EDITOR - /*SPR 1757 Insert temp buffer into editor*/ - temp_text.data = (UBYTE*)temp_buffer; - temp_text.dcs = ATB_DCS_ASCII; - ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ - ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ - ATB_edit_Refresh(data->editor); + /*SPR 1757 Insert temp buffer into editor*/ + temp_text.data = (UBYTE*)temp_buffer; + temp_text.dcs = ATB_DCS_ASCII; + ATB_string_Length(&temp_text); + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ClearAll(data->editor); + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ - strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ + strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ #endif - win_show(data->win); - } - break; + win_show(data->win); + } + break; #endif @@ -842,10 +832,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -874,10 +864,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -906,10 +896,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -940,10 +930,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -968,10 +958,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -997,10 +987,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -1025,10 +1015,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -1059,10 +1049,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -1087,10 +1077,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -1116,10 +1106,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -1140,10 +1130,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -1163,10 +1153,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -1187,10 +1177,10 @@ temp_text.data = (UBYTE*)temp_buffer; temp_text.dcs = ATB_DCS_ASCII; ATB_string_Length(&temp_text); - ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ + ATB_edit_ResetMode(data->editor, ED_MODE_READONLY); /* Switch off read only to add text */ ATB_edit_ClearAll(data->editor); - ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ - ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ + ATB_edit_InsertString(data->editor, &temp_text); /* Insert name string */ + ATB_edit_SetMode(data->editor, ED_MODE_READONLY); /* Switch on read only again */ ATB_edit_Refresh(data->editor); #else /* !NEW_EDITOR */ strncpy(data->edtBuffer, temp_buffer, EM_EDITOR_SIZE);/*SPR 1757*/ @@ -1200,16 +1190,16 @@ break; #endif /*ifndef NEPTUNE BOARD */ - default: - free(temp_buffer); - return MFW_EVENT_REJECTED; - } - } - else - { - free(temp_buffer); - return MFW_EVENT_REJECTED; - } + default: + free(temp_buffer); + return MFW_EVENT_REJECTED; + } + } + else + { + free(temp_buffer); + return MFW_EVENT_REJECTED; + } #ifdef NEPTUNE_BOARD ffs_write(fd, "\n****************\n\n",20 ); @@ -1220,10 +1210,10 @@ } /******************************************************************************* - $Function: Mmi_em_destroy() - $Description: Delete the window - $Returns: none - $Arguments: window handle + $Function: Mmi_em_destroy() + $Description: Delete the window + $Returns: none + $Arguments: window handle *******************************************************************************/ void Mmi_em_destroy(T_MFW_HND own_window) { @@ -1234,8 +1224,8 @@ if (own_window == NULL) { - TRACE_EVENT ("Error :- Called with NULL Pointer"); - return; + TRACE_EVENT ("Error :- Called with NULL Pointer"); + return; } if (data) { @@ -1246,9 +1236,9 @@ tim_delete (data->tim); /* SPR#1428 - SH - New Editor changes */ #ifdef NEW_EDITOR - ATB_edit_Destroy(data->editor); + ATB_edit_Destroy(data->editor); #else - edt_delete(data->edt); + edt_delete(data->edt); #endif /* * Delete WIN Handler @@ -1264,13 +1254,13 @@ /******************************************************************************* - $Function: Mmi_em_kbd_cb() + $Function: Mmi_em_kbd_cb() - $Description: Keyboard handler + $Description: Keyboard handler - $Returns: status int + $Returns: status int - $Arguments: event, keyboard data + $Arguments: event, keyboard data *******************************************************************************/ int Mmi_em_kbd_cb(T_MFW_EVENT event,T_MFW_KBD * kc ) @@ -1385,7 +1375,7 @@ break; #endif - case KCD_HUP: /*destroy window*/ + case KCD_HUP: /*destroy window*/ case KCD_RIGHT: #ifdef NEPTUNE_BOARD EmRequest = NULL; @@ -1405,13 +1395,13 @@ /******************************************************************************* - $Function: Mmi_em_win_cb() + $Function: Mmi_em_win_cb() - $Description: Display handler + $Description: Display handler - $Returns: status int + $Returns: status int - $Arguments: event, window handle + $Arguments: event, window handle *******************************************************************************/ int Mmi_em_win_cb(T_MFW_EVENT event,T_MFW_WIN * win ) @@ -1448,13 +1438,13 @@ /******************************************************************************* - $Function: Mmi_em_tim_cb() + $Function: Mmi_em_tim_cb() - $Description: Timer handler (every second) + $Description: Timer handler (every second) - $Returns: none + $Returns: none - $Arguments: event, timer data + $Arguments: event, timer data *******************************************************************************/ void Mmi_em_tim_cb(T_MFW_EVENT event,T_MFW_TIM * t)