diff --git a/APELib/Receiver_symb/src/channelEquImpl.s.c b/APELib/Receiver_symb/src/channelEquImpl.s.c index 6d8a782..89c4cf7 100644 --- a/APELib/Receiver_symb/src/channelEquImpl.s.c +++ b/APELib/Receiver_symb/src/channelEquImpl.s.c @@ -37,11 +37,12 @@ void ChannelEquImpl( ){ volatile int a = 1; - int numSym = 7 ; ///7; + int numSym = 7; int Scale = 13; int NRE=4096; int ShiftFactor[] = {7,1,0,0,0,0,0,0,0,0,0,0}; int NumCB = 2; + CfgAgcShift[0] = 1; for(int i=0;isfn, para_dm_ptr->slot, para_dm_ptr->num_data_section, @@ -108,32 +108,18 @@ void Receiver_Symb_Proc( TRACE_MAX(TRACE_RECEIVER_SYMB_ADDR, 8, time1 -time0); time0 = time1; -// #ifdef IDE_TEST -// printf("DataTrans"); -// #endif -//return ; - +#ifdef IDE_TEST + printf("DataTrans"); +#endif + + return ; //7.核间消息to APE2 //需要定义结构体 - - //更新buffer - g_symb2bit_buffer_sel = (g_symb2bit_buffer_sel + 1) & 0x1; - - data_send2bit_task.proc_id = para_dm_ptr->proc_id; - data_send2bit_task.sfn = para_dm_ptr->sfn; - data_send2bit_task.slot = para_dm_ptr->slot; - data_send2bit_task.data_ptr = cur_out_ddr_ptr; - data_send2bit_task.data_length = 57344;//TODO:待确认,单位WORD - //LOG_ERROR_S("%d 0x%08x %d\n",data_send2bit_task.proc_id, data_send2bit_task.data_ptr, g_symb2bit_buffer_sel); -#ifdef CORE_ODD - uint8_t cur_core_id = APE3_CORE_ID; -#else - uint8_t cur_core_id = APE5_CORE_ID; -#endif + receiver_symb2bit_t data_send2bit_task; phy_et_msg_send((uint32_t)(&data_send2bit_task), sizeof(receiver_symb2bit_t), UCP4008_KERNEL_INTER, - cur_core_id, + APE5_CORE_ID, APE6_CORE_ID, PHY_TASK_RECEIVER_SYMB, PHY_TASK_RECEIVER_BIT); diff --git a/MicroCode/Fre_est/src/mpu0/freOffEstAsm.m0.asm b/MicroCode/Fre_est/src/mpu0/freOffEstAsm.m0.asm index 9ed94af..41df066 100644 --- a/MicroCode/Fre_est/src/mpu0/freOffEstAsm.m0.asm +++ b/MicroCode/Fre_est/src/mpu0/freOffEstAsm.m0.asm @@ -45,10 +45,15 @@ freOffEstAsm: IMA0: ReadMR(L) -> IMA0.T0; // real IMA0: ReadMR(H) -> IMA1.T0; // imag NOP;NOP;NOP;NOP; + IMA0: T0 >> 12(W) -> IMA0.T0 || IMA1: T0 >> 12(W) -> IMA1.T0; NOP;NOP; IMA0: RAdd(T0)(W)(SlipMode1) -> SHU0.T2; + NOP; + NOP; + NOP; + NOP; IMA1: RAdd(T0)(W)(SlipMode1) -> SHU1.T2; SHU1: VImm(0) -> SHU1.T0; IMA0: V(0) -> IMA0.T1; @@ -56,7 +61,8 @@ freOffEstAsm: SHU0: Index(T2,T6) -> IMA3.T1; SHU1: Index(T2,T6) -> IMA3.T0; - NOP;NOP; + NOP;NOP;NOP;NOP; + IMA3: RAdd(T0)(W)(SlipMode1) -> IMA3.T0; IMA3: RAdd(T1)(W)(SlipMode1) -> IMA3.T1; @@ -66,8 +72,8 @@ freOffEstAsm: IMA3: T1 -> IMA2.T1; MFetch: REPEAT @(5); - //CORDIC ATAN2 + //CORDIC ATAN2 Mfetch: Lpto %ENDCORDIC @(KI1); IMA3: T0>>8(W) -> M[19]; @@ -78,10 +84,11 @@ freOffEstAsm: NOP;NOP;NOP;NOP; IMA3: T1 >> T4(W) -> IMA3.T2; IMA3: T0 >> T4(W) -> IMA3.T3; - NOP; + NOP;NOP;NOP;NOP;NOP;NOP;NOP; MFetch: IF(KI3>=KI11) JUMP %IFFI; + //IMA1: 0 -> T0; IMA3: 0 - T2(W) -> IMA3.T2; IMA0: 0 - T0(W) -> IMA0.T0; IMA3: 0 - T3(W) -> IMA3.T3; @@ -96,13 +103,11 @@ freOffEstAsm: ENDCORDIC: MFetch: REPEAT @(10); + IMA0: T1 -> BIU2.T0(Mode0); NOP;NOP;NOP;NOP; BIU2: Store(T0,T1)(A++); - - - - + MFetch: REPEAT @(15); MFetch:MPU.STOP;