FreeCalypso > hg > freecalypso-sw
changeset 731:68693b72670b
gsm-fw/g23m-gsm/rr: initial *.h preen
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Sun, 05 Oct 2014 01:27:32 +0000 |
| parents | af82698f039e |
| children | a6f45d948d22 |
| files | gsm-fw/g23m-gsm/rr/rr.h gsm-fw/g23m-gsm/rr/rr_attp.c |
| diffstat | 2 files changed, 25 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/g23m-gsm/rr/rr.h Sat Oct 04 23:30:42 2014 +0000 +++ b/gsm-fw/g23m-gsm/rr/rr.h Sun Oct 05 01:27:32 2014 +0000 @@ -96,7 +96,7 @@ /* * look at explanations at rr_data->mode_after_dedi! -*/ + */ #define ARRAY_TRACE #if defined(_SIMULATION_) @@ -614,12 +614,12 @@ typedef enum { CR_STATUS_OFF = 0, CR_STATUS_ON - } T_CR; +} T_CR; typedef enum { MOB_ALLOC_BEFORE = 0, MOB_ALLOC_AFTER - } T_MOB_ALLOC_TYPE; +} T_MOB_ALLOC_TYPE; /* @@ -983,16 +983,19 @@ T_mob_ident imei; /* IMEI */ UBYTE operation_mode; /* Operation Parameters from MM*/ - /* - * The purpose of 'parallel_net_plmn_search_type?and ‘current_plmn_search_type? * is to record the request for a parallel search (i.e. to action a network - * search whilst an existing search (for a limited/plmn) is already underway) - * - * The original request is stored in ‘current_plmn_search_type?and the parallel - * net search request is stored in ‘parallel_net_plmn_search_type? - * - * When the NET search is completed, ‘parallel_net_plmn_search_type?is cleared - * and ‘mm_req_service?is set the stored search value in ‘current_plmn_search_type? - */ + /* + * The purpose of 'parallel_net_plmn_search_type' and + * 'current_plmn_search_type' is to record the request for a parallel search + * (i.e. to action a network search whilst an existing search (for a + * limited/plmn) is already underway) + * + * The original request is stored in 'current_plmn_search_type' and the + * parallel net search request is stored in 'parallel_net_plmn_search_type' + * + * When the NET search is completed, 'parallel_net_plmn_search_type' is + * cleared and 'mm_req_service' is set the stored search value in + * 'current_plmn_search_type' + */ UBYTE parallel_net_plmn_search_type; UBYTE current_plmn_search_type; @@ -1269,9 +1272,9 @@ UBYTE max_arfcn; /* number of valid channels */ UBYTE act_index; /* actual index */ BOOL check_hplmn; /* check HPLMN */ - USHORT arfcn [MAX_CHANNELS]; /* channel number */ - UBYTE rxlev [MAX_CHANNELS]; /* fieldstrength */ - UBYTE attributes[MAX_CHANNELS]; /* attributes of channel */ + USHORT arfcn [MAX_CHANNELS]; /* channel number */ + UBYTE rxlev [MAX_CHANNELS]; /* fieldstrength */ + UBYTE attributes[MAX_CHANNELS]; /* attributes of channel */ /* Bit 7 Bcch Info List Flag 0 : not member of the BCCH info List 1 : member of the BCCH info List @@ -1304,7 +1307,7 @@ U8 black_list_search_pending; U8 region; /* This stores the region */ BOOL all_freq_area; /* Identifies presence of both Euro and American coverage */ - T_plmn last_reg_plmn; /* Stores the last registered PLMN */ + T_plmn last_reg_plmn; /* Stores the last registered PLMN */ } T_CS_DATA; /* CSI-LLD Section 3.8 @@ -1566,15 +1569,12 @@ T_D_SYS_INFO_1 *sys_info_1, T_LIST *cell_chan_desc); - - EXTERN void att_for_sysinfo_type2_2bis (USHORT arfcn, T_VOID_STRUCT *sys_info_2_2bis, T_LIST *new_2_2bis_list, UBYTE ncell_ext, T_SI_TYPE si_type); - EXTERN void att_for_sysinfo_type2ter (USHORT arfcn, T_D_SYS_INFO_2TER *sys_info_2ter, T_LIST *new_2ter_list); @@ -1583,16 +1583,12 @@ EXTERN void att_for_sysinfo_type4 (USHORT arfcn, T_D_SYS_INFO_4 *sys_info_4); - - EXTERN void att_for_sysinfo_type5_5bis (USHORT arfcn, T_LIST *new_5_5bis_list, UBYTE old_index, UBYTE ncell_ext, T_SI_TYPE si_type); - - EXTERN void att_for_sysinfo_type5ter (USHORT arfcn, T_LIST *new_5ter_list); EXTERN void att_for_sysinfo_type6 (USHORT arfcn, @@ -1680,7 +1676,6 @@ EXTERN void att_copy_c2_parameter_si4 (UBYTE index, T_si4_rest_oct *rest_oct); - EXTERN void att_handle_rr_act_req (UBYTE initial_act, T_RR_ACTIVATE_REQ *rr_activate_req); EXTERN void att_increase_power_on_time (USHORT inc); @@ -1717,19 +1712,14 @@ EXTERN void att_start_cr_in_pl (UBYTE index); EXTERN void att_start_cell_selection (BOOL originator, BOOL parallel, U8 search_mode); - EXTERN void att_remove_multiple_channels(void); EXTERN void att_mph_identity_req (void); EXTERN void att_start_registration_timer(void); EXTERN void att_set_func (UBYTE func); - EXTERN void att_copy_cr_data (void); EXTERN void att_init_cr_data (void); - - - EXTERN void att_check_reestablishment (void); EXTERN UBYTE att_get_power (void); EXTERN void att_return_to_idle (void); @@ -1860,7 +1850,6 @@ EXTERN void dat_code_ext_meas_report (T_MPH_EMO_MEAS_IND *mph_emo_meas_ind); EXTERN void dat_emo_stop (BOOL send_ncell_req); - EXTERN void dat_code_mph_chan_mode_req (T_D_CHAN_MOD *chan_mod); EXTERN void dat_code_mph_ciphering_req (UBYTE ciph_on, UBYTE algo, @@ -1955,7 +1944,7 @@ EXTERN void for_check_and_configure_si2quater (UBYTE index); EXTERN void for_att_update_ba2bsic_mapping (T_rr_enh_para *p_enh); EXTERN BOOL for_dat_process_common_emr_data (T_gprs_rep_prio *p_rep, - T_gprs_bsic *p_bl, + T_gprs_bsic *p_bl, UBYTE msg_index, BOOL ba_available); EXTERN void for_dat_spd_unitdata_req (T_DL_SHORT_UNITDATA_REQ *p_msg); @@ -2216,7 +2205,8 @@ #define MAX_NO_ACS 0x04 /*#define MAX_CODEC_MODES 0x03*/ -#if !defined(_FILE10_) +/* FreeCalypso change: same as in ../dl/dl.h */ +#if 0 && !defined(_FILE10_) #define __FILE10__ (__FILE__+sizeof(__FILE__)-11) #endif /* !_FILE10_ */ @@ -2301,7 +2291,7 @@ #define TRACE_EVENT_WIN_P9(s,a1,a2,a3,a4,a5,a6,a7,a8,a9) #define att_code_rr_abort_ind_trace(c) \ -{ TRACE_EVENT_P4 ("att_code_rr_abort_ind(%x=%s) #%u %s", c, #c, __LINE__, __FILE10__);\ +{ TRACE_EVENT_P4 ("att_code_rr_abort_ind(%x=%s) #%u %s", c, #c, __LINE__, __FILE__);\ att_code_rr_abort_ind_original(rr_data, c);}
--- a/gsm-fw/g23m-gsm/rr/rr_attp.c Sat Oct 04 23:30:42 2014 +0000 +++ b/gsm-fw/g23m-gsm/rr/rr_attp.c Sun Oct 05 01:27:32 2014 +0000 @@ -1006,7 +1006,7 @@ #if defined(DL_TRACE_ENABLED) { sprintf (dl_trace_buf, "sync_req cs=%04x ->mode=%u #%u:%s", - rr_sync_req->synccs, rr_data->mode_after_dedi, __LINE__, __FILE10__); + rr_sync_req->synccs, rr_data->mode_after_dedi, __LINE__, __FILE__); DL_OFFLINE_TRACE (dl_trace_buf); } #endif /* DL_TRACE_ENABLED */