# HG changeset patch # User Mychaela Falconia # Date 1459053422 0 # Node ID 66bf9aa6a4b0dd36e182d47c9d227fa1b62e5bfe # Parent 69893185fdd52b6e56c3b25d8b777194f07e03c7 l1_async.c: l1a_dedic6_process() fully reconstructed diff -r 69893185fdd5 -r 66bf9aa6a4b0 chipsetsw/layer1/cfile/l1_async.c --- a/chipsetsw/layer1/cfile/l1_async.c Fri Mar 25 02:37:09 2016 +0000 +++ b/chipsetsw/layer1/cfile/l1_async.c Sun Mar 27 04:37:02 2016 +0000 @@ -8050,8 +8050,8 @@ case NSYNC_CONFIG: { UWORD8 neigh_id = l1a_l1s_com.nsync.first_in_list; - UWORD32 time_alignmt =0; //omaps00090550 - UWORD32 fn_offset=0; //omaps00090550; + UWORD32 time_alignmt; + UWORD32 fn_offset; // Request to acquire FB/SB or to confirm FB or SB from one ncell. //---------------------------------------------------------------- @@ -8337,6 +8337,12 @@ // disable all tasks l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[FB51] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[FB26] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[SB51] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[SB26] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[SBCNF26] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[SBCNF51] = TASK_DISABLED; // Set semaphores for all neighbor relative task. l1a_l1s_com.task_param[NSYNC]= SEMAPHORE_SET; // Set NSYNC task semaphore. @@ -8969,6 +8975,12 @@ // Disable neighbor sync. tasks. l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[FB51] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[FB26] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[SB51] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[SB26] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[SBCNF26] = TASK_DISABLED; + l1a_l1s_com.l1s_en_task[SBCNF51] = TASK_DISABLED; if(array_size != NBR_NEIGHBOURS) { @@ -8991,8 +9003,10 @@ { l1a_l1s_com.nsync.list[j].status = NSYNC_FREE; l1a_l1s_com.nsync.current_list_size --; - if (l1a_l1s_com.nsync.list[l1a_l1s_com.nsync.active_fb_id].radio_freq == radio_freq) - l1a_l1s_com.l1s_en_task[FB26] = TASK_DISABLED; + #if 0 /* FreeCalypso: match TCS211 object */ + if (l1a_l1s_com.nsync.list[l1a_l1s_com.nsync.active_fb_id].radio_freq == radio_freq) + l1a_l1s_com.l1s_en_task[FB26] = TASK_DISABLED; + #endif } } } @@ -9069,6 +9083,7 @@ (l1a.confirm_SignalCode == MPHC_ASYNC_HO_CON) || (l1a.confirm_SignalCode == MPHC_HANDOVER_FAIL_CON)) ) { + #if 0 /* LoCosto L1 code, doesn't match TCS211 */ l1a_l1s_com.l1s_en_task[NSYNC] = TASK_DISABLED; l1a_l1s_com.l1s_en_task[FB51] = TASK_DISABLED; l1a_l1s_com.l1s_en_task[FB26] = TASK_DISABLED; @@ -9126,6 +9141,17 @@ // Enable neighbour sync task. l1a_l1s_com.l1s_en_task[NSYNC] = TASK_ENABLED; } // if + #else + /* code from TSM30 version, matches TCS211 object */ + #if (L1_EOTD ==1) + // FN and time reference are WRONG for remaining neigbours.... + // --> abort all. + l1a_l1s_com.nsync.eotd_meas_session = FALSE; + #endif + // Step in state machine. + *state = STOP_NSYNC; + break; + #endif } // if else diff -r 69893185fdd5 -r 66bf9aa6a4b0 g23m/objdiff/l1_ext/disasm.sh --- a/g23m/objdiff/l1_ext/disasm.sh Fri Mar 25 02:37:09 2016 +0000 +++ b/g23m/objdiff/l1_ext/disasm.sh Sun Mar 27 04:37:02 2016 +0000 @@ -7,4 +7,5 @@ tiobjd ../../blobs/l1_ext/$i.obj disasm -gl > $i.orig tiobjd ../../blobs/l1_ext.upd/$i.obj disasm -gl > $i.tiupd tiobjd ../../__out__/gsm*/obj/l1_ext/$i.obj disasm -gl > $i.new + tiobjd ../../__out__/gsm*/obj/l1_ext/$i.obj disasm -gll > $i.newln done