# HG changeset patch
# User Mychaela Falconia <falcon@ivan.Harhan.ORG>
# Date 1463370619 0
# Node ID 9113e3ab99116d82872dc2210ff0e90830a7cee6
# Parent  ef14dccecd98927d9cda862ac28f92859fea4c06
l1_sync.c: l1s_merge_manager() reconstructed

diff -r ef14dccecd98 -r 9113e3ab9911 chipsetsw/layer1/cfile/l1_sync.c
--- a/chipsetsw/layer1/cfile/l1_sync.c	Mon May 16 03:10:42 2016 +0000
+++ b/chipsetsw/layer1/cfile/l1_sync.c	Mon May 16 03:50:19 2016 +0000
@@ -4789,11 +4789,14 @@
            (l1s.task_status[SMSCB].current_status == INACTIVE)       &&
            (((l1a_l1s_com.mode != PACKET_TRANSFER_MODE) ||
                ((l1s.task_status[NBCCHS].current_status == INACTIVE) &&
-               (l1s.task_status[EBCCHS].current_status == INACTIVE) &&
-	       (l1s.task_status[PNP].current_status == INACTIVE) &&
-               (l1s.task_status[PEP].current_status == INACTIVE) &&
-               (l1s.task_status[NP].current_status == INACTIVE) &&
-               (l1s.task_status[EP].current_status == INACTIVE)))))
+               (l1s.task_status[EBCCHS].current_status == INACTIVE)
+           #if 0	/* FreeCalypso TCS211 reconstruction */
+	       && (l1s.task_status[PNP].current_status == INACTIVE)
+               && (l1s.task_status[PEP].current_status == INACTIVE)
+               && (l1s.task_status[NP].current_status == INACTIVE)
+               && (l1s.task_status[EP].current_status == INACTIVE)
+           #endif
+           ))))
 
        #else
          if (l1s.task_status[SMSCB].current_status == INACTIVE)