Merge branch 'PCIE_PILOT_FIX' of http://47.100.68.68:3000/jinhong/YB_TX_RX_SPU into PCIE_PILOT_FIX

This commit is contained in:
HUOHUO 2025-05-27 10:04:14 -07:00
commit 35d7fd7814
7 changed files with 46 additions and 44 deletions

View File

@ -39,7 +39,7 @@ void ape4_event_task(uint32_t addr, uint32_t size)
osp_task_create(&mgr_task2); osp_task_create(&mgr_task2);
TRACE(TRACE_RECV_INIT_ADDR, 3, 1); TRACE(TRACE_RECV_INIT_ADDR, 3, 1);
LOG_INFO_S("APE4 finish task create!\n"); //LOG_INFO_S("APE4 finish task create!\n");
osp_timer_sync(1); osp_timer_sync(1);
TRACE(TRACE_RECV_INIT_ADDR, 4, 1); TRACE(TRACE_RECV_INIT_ADDR, 4, 1);

View File

@ -62,30 +62,30 @@ void Receiver_Bit_Init()
ret = osp_get_cfgfile("Receiver_Bit_cfg_dm0.dat", ret = osp_get_cfgfile("Receiver_Bit_cfg_dm0.dat",
(uint32_t *)&(g_receiver_bit_table_param.receiver_bit_config0_ddr_ptr), (uint32_t *)&(g_receiver_bit_table_param.receiver_bit_config0_ddr_ptr),
(int32_t *)&(g_receiver_bit_table_param.receiver_bit_config0_length)); (int32_t *)&(g_receiver_bit_table_param.receiver_bit_config0_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Bit_cfg_dm0.dat not found!\n"); //LOG_ERROR_S("Receiver_Bit_cfg_dm0.dat not found!\n");
} }
ret = osp_get_cfgfile("Receiver_Bit_cfg_dm1.dat", ret = osp_get_cfgfile("Receiver_Bit_cfg_dm1.dat",
(uint32_t *)&(g_receiver_bit_table_param.receiver_bit_config1_ddr_ptr), (uint32_t *)&(g_receiver_bit_table_param.receiver_bit_config1_ddr_ptr),
(int32_t *)&(g_receiver_bit_table_param.receiver_bit_config1_length)); (int32_t *)&(g_receiver_bit_table_param.receiver_bit_config1_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Bit_cfg_dm1.dat not found!\n"); //LOG_ERROR_S("Receiver_Bit_cfg_dm1.dat not found!\n");
} }
ret = osp_get_cfgfile("Receiver_Bit_cfg_dm2.dat", ret = osp_get_cfgfile("Receiver_Bit_cfg_dm2.dat",
(uint32_t *)&(g_receiver_bit_table_param.receiver_bit_config2_ddr_ptr), (uint32_t *)&(g_receiver_bit_table_param.receiver_bit_config2_ddr_ptr),
(int32_t *)&(g_receiver_bit_table_param.receiver_bit_config2_length)); (int32_t *)&(g_receiver_bit_table_param.receiver_bit_config2_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Bit_cfg_dm2.dat not found!\n"); //LOG_ERROR_S("Receiver_Bit_cfg_dm2.dat not found!\n");
} }
ret = osp_get_cfgfile("Receiver_Bit_cfg_dm3.dat", ret = osp_get_cfgfile("Receiver_Bit_cfg_dm3.dat",
(uint32_t *)&(g_receiver_bit_table_param.receiver_bit_config3_ddr_ptr), (uint32_t *)&(g_receiver_bit_table_param.receiver_bit_config3_ddr_ptr),
(int32_t *)&(g_receiver_bit_table_param.receiver_bit_config3_length)); (int32_t *)&(g_receiver_bit_table_param.receiver_bit_config3_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Bit_cfg_dm3.dat not found!\n"); //LOG_ERROR_S("Receiver_Bit_cfg_dm3.dat not found!\n");
} }
//10.输入测试数据 //10.输入测试数据
uint32_t timedata_ptr; uint32_t timedata_ptr;
@ -93,18 +93,18 @@ void Receiver_Bit_Init()
ret = osp_get_cfgfile("timedata.dat", ret = osp_get_cfgfile("timedata.dat",
(uint32_t *)&(timedata_ptr), (uint32_t *)&(timedata_ptr),
(int32_t *)&(timedata_len)); (int32_t *)&(timedata_len));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("timedata.dat not found!\n"); //LOG_ERROR_S("timedata.dat not found!\n");
} }
uint32_t gain_mmse_test_ptr; uint32_t gain_mmse_test_ptr;
int32_t gain_mmse_test_len; int32_t gain_mmse_test_len;
ret = osp_get_cfgfile("gain_test.dat", ret = osp_get_cfgfile("gain_test.dat",
(uint32_t *)&(gain_mmse_test_ptr), (uint32_t *)&(gain_mmse_test_ptr),
(int32_t *)&(gain_mmse_test_len)); (int32_t *)&(gain_mmse_test_len));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("gain_test.dat not found!\n"); //LOG_ERROR_S("gain_test.dat not found!\n");
} }
int* param_ptr = (int *)RECEIVER_BIT_CFG_BASE; int* param_ptr = (int *)RECEIVER_BIT_CFG_BASE;
STORE_EX_W(param_ptr, timedata_ptr); STORE_EX_W(param_ptr, timedata_ptr);

View File

@ -38,30 +38,30 @@ void Receiver_Symb_Init()
ret = osp_get_cfgfile("Receiver_Symb_cfg_dm0.dat", ret = osp_get_cfgfile("Receiver_Symb_cfg_dm0.dat",
(uint32_t *)&(g_receiver_symb_table_param.receiver_symb_config0_ddr_ptr), (uint32_t *)&(g_receiver_symb_table_param.receiver_symb_config0_ddr_ptr),
(int32_t *)&(g_receiver_symb_table_param.receiver_symb_config0_length)); (int32_t *)&(g_receiver_symb_table_param.receiver_symb_config0_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Symb_cfg_dm0.dat not found!\n"); //LOG_ERROR_S("Receiver_Symb_cfg_dm0.dat not found!\n");
} }
ret = osp_get_cfgfile("Receiver_Symb_cfg_dm1.dat", ret = osp_get_cfgfile("Receiver_Symb_cfg_dm1.dat",
(uint32_t *)&(g_receiver_symb_table_param.receiver_symb_config1_ddr_ptr), (uint32_t *)&(g_receiver_symb_table_param.receiver_symb_config1_ddr_ptr),
(int32_t *)&(g_receiver_symb_table_param.receiver_symb_config1_length)); (int32_t *)&(g_receiver_symb_table_param.receiver_symb_config1_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Symb_cfg_dm1.dat not found!\n"); //LOG_ERROR_S("Receiver_Symb_cfg_dm1.dat not found!\n");
} }
ret = osp_get_cfgfile("Receiver_Symb_cfg_dm2.dat", ret = osp_get_cfgfile("Receiver_Symb_cfg_dm2.dat",
(uint32_t *)&(g_receiver_symb_table_param.receiver_symb_config2_ddr_ptr), (uint32_t *)&(g_receiver_symb_table_param.receiver_symb_config2_ddr_ptr),
(int32_t *)&(g_receiver_symb_table_param.receiver_symb_config2_length)); (int32_t *)&(g_receiver_symb_table_param.receiver_symb_config2_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Symb_cfg_dm2.dat not found!\n"); //LOG_ERROR_S("Receiver_Symb_cfg_dm2.dat not found!\n");
} }
ret = osp_get_cfgfile("Receiver_Symb_cfg_dm3.dat", ret = osp_get_cfgfile("Receiver_Symb_cfg_dm3.dat",
(uint32_t *)&(g_receiver_symb_table_param.receiver_symb_config3_ddr_ptr), (uint32_t *)&(g_receiver_symb_table_param.receiver_symb_config3_ddr_ptr),
(int32_t *)&(g_receiver_symb_table_param.receiver_symb_config3_length)); (int32_t *)&(g_receiver_symb_table_param.receiver_symb_config3_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Symb_cfg_dm3.dat not found!\n"); //LOG_ERROR_S("Receiver_Symb_cfg_dm3.dat not found!\n");
} }

View File

@ -60,17 +60,18 @@ void Receiver_Sync_Init()
(uint32_t *)&(g_receiver_sync_table_param.receiver_sync_config0_ddr_ptr), (uint32_t *)&(g_receiver_sync_table_param.receiver_sync_config0_ddr_ptr),
(int32_t *)&(g_receiver_sync_table_param.receiver_sync_config0_length)); (int32_t *)&(g_receiver_sync_table_param.receiver_sync_config0_length));
TRACE(TRACE_RECV_INIT_ADDR, 6, 2); TRACE(TRACE_RECV_INIT_ADDR, 6, 2);
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Sync_cfg_dm0.dat not found!\n"); //LOG_ERROR_S("Receiver_Sync_cfg_dm0.dat not found!\n");
} }
ret = osp_get_cfgfile("Recv_Pilot.dat", ret = osp_get_cfgfile("Recv_Pilot.dat",
(uint32_t *)&(g_receiver_sync_table_param.receiver_sync_pilot_ptr), (uint32_t *)&(g_receiver_sync_table_param.receiver_sync_pilot_ptr),
(int32_t *)&(g_receiver_sync_table_param.receiver_sync_pilot_length)); (int32_t *)&(g_receiver_sync_table_param.receiver_sync_pilot_length));
//LOG_ERROR_S("Recv_Pilot.dat %d %d %d\n", g_receiver_sync_table_param.receiver_sync_pilot_ptr, g_receiver_sync_table_param.receiver_sync_pilot_length, ret);
TRACE(TRACE_RECV_INIT_ADDR, 6, 3); TRACE(TRACE_RECV_INIT_ADDR, 6, 3);
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Recv_Pilot.dat not found!\n"); //LOG_ERROR_S("Recv_Pilot.dat not found!\n");
} }
// ret = osp_get_cfgfile("Receiver_Sync_cfg_dm1.dat", // ret = osp_get_cfgfile("Receiver_Sync_cfg_dm1.dat",
// (uint32_t *)&(g_receiver_sync_table_param.receiver_sync_config1_ddr_ptr), // (uint32_t *)&(g_receiver_sync_table_param.receiver_sync_config1_ddr_ptr),
@ -114,7 +115,7 @@ void Receiver_Sync_Init()
// (uint32_t *)&(dbg_addr), // (uint32_t *)&(dbg_addr),
// (int32_t *)&(dbg_len)); // (int32_t *)&(dbg_len));
// if(-1 == ret) // if(0 != ret)
// { // {
// //LOG_ERROR_S("frame_0x610e0000_245760.dat not found!\n"); // //LOG_ERROR_S("frame_0x610e0000_245760.dat not found!\n");
// LOG_ERROR_S("timedatasym.dat not found!\n"); // LOG_ERROR_S("timedatasym.dat not found!\n");
@ -139,13 +140,13 @@ ret = osp_get_cfgfile("even.dat",
(uint32_t *)&(dbg_addr0), (uint32_t *)&(dbg_addr0),
(int32_t *)&(dbg_len0)); (int32_t *)&(dbg_len0));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("even.dat not found!\n"); //LOG_ERROR_S("even.dat not found!\n");
} }
else else
{ {
LOG_ERROR_S("INIT DBG DDR 0x%08x %d\n",dbg_addr0,dbg_len0); //LOG_ERROR_S("INIT DBG DDR 0x%08x %d\n",dbg_addr0,dbg_len0);
ape_csu_dma_1D_G2L_ch2ch3_transfer((uint64_t)(dbg_addr0), ape_csu_dma_1D_G2L_ch2ch3_transfer((uint64_t)(dbg_addr0),
(uint64_t)JESD_NRFDD_RX_SLOT_EVEN_DATA_ADDR,//第一次固定搬移到dm0 (uint64_t)JESD_NRFDD_RX_SLOT_EVEN_DATA_ADDR,//第一次固定搬移到dm0
@ -159,7 +160,7 @@ ret = osp_get_cfgfile("odd.dat",
(uint32_t *)&(dbg_addr1), (uint32_t *)&(dbg_addr1),
(int32_t *)&(dbg_len1)); (int32_t *)&(dbg_len1));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("odd.dat not found!\n"); LOG_ERROR_S("odd.dat not found!\n");
} }

View File

@ -58,9 +58,10 @@ void Receiver_Sync_First_Init()
ret = osp_get_cfgfile("Receiver_Sync_First_cfg_dm0.dat", ret = osp_get_cfgfile("Receiver_Sync_First_cfg_dm0.dat",
(uint32_t *)&(g_receiver_sync_first_table_param.receiver_sync_first_config0_ddr_ptr), (uint32_t *)&(g_receiver_sync_first_table_param.receiver_sync_first_config0_ddr_ptr),
(int32_t *)&(g_receiver_sync_first_table_param.receiver_sync_first_config0_length)); (int32_t *)&(g_receiver_sync_first_table_param.receiver_sync_first_config0_length));
if(-1 == ret) if(0 != ret)
{ {
LOG_ERROR_S("Receiver_Sync_First_cfg_dm0.dat not found!\n");
//LOG_ERROR_S("Receiver_Sync_First_cfg_dm0.dat not found!\n");
} }
// ret = osp_get_cfgfile("Receiver_Sync_First_cfg_dm1.dat", // ret = osp_get_cfgfile("Receiver_Sync_First_cfg_dm1.dat",
// (uint32_t *)&(g_receiver_sync_first_table_param.receiver_sync_config1_ddr_ptr), // (uint32_t *)&(g_receiver_sync_first_table_param.receiver_sync_config1_ddr_ptr),

View File

@ -43,72 +43,72 @@ int transform_para_init(uint32_t thita1_init, uint32_t thita2_init, uint32_t thi
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("thita1.dat load fail!\n"); //LOG_ERROR_S("thita1.dat load fail!\n");
} }
ret = osp_get_cfgfile("thita2.dat", ret = osp_get_cfgfile("thita2.dat",
(uint32_t *)&(g_thita2_addr), (uint32_t *)&(g_thita2_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("thita2.dat load fail!\n"); //LOG_ERROR_S("thita2.dat load fail!\n");
} }
ret = osp_get_cfgfile("thita3.dat", ret = osp_get_cfgfile("thita3.dat",
(uint32_t *)&(g_thita3_addr), (uint32_t *)&(g_thita3_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("thita3.dat load fail!\n"); //LOG_ERROR_S("thita3.dat load fail!\n");
} }
ret = osp_get_cfgfile("thita4.dat", ret = osp_get_cfgfile("thita4.dat",
(uint32_t *)&(g_thita4_addr), (uint32_t *)&(g_thita4_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("thita4.dat load fail!\n"); //LOG_ERROR_S("thita4.dat load fail!\n");
} }
ret = osp_get_cfgfile("no1.dat", ret = osp_get_cfgfile("no1.dat",
(uint32_t *)&(g_no1_addr), (uint32_t *)&(g_no1_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("no1.dat load fail!\n"); //LOG_ERROR_S("no1.dat load fail!\n");
} }
ret = osp_get_cfgfile("no2.dat", ret = osp_get_cfgfile("no2.dat",
(uint32_t *)&(g_no2_addr), (uint32_t *)&(g_no2_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("no2.dat load fail!\n"); //LOG_ERROR_S("no2.dat load fail!\n");
} }
ret = osp_get_cfgfile("no3.dat", ret = osp_get_cfgfile("no3.dat",
(uint32_t *)&(g_no3_addr), (uint32_t *)&(g_no3_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("no3.dat load fail!\n"); //LOG_ERROR_S("no3.dat load fail!\n");
} }
ret = osp_get_cfgfile("nextstate9.dat", ret = osp_get_cfgfile("nextstate9.dat",
(uint32_t *)&(g_nxtstate9_addr), (uint32_t *)&(g_nxtstate9_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("nextstate9.dat load fail!\n"); //LOG_ERROR_S("nextstate9.dat load fail!\n");
} }
ret = osp_get_cfgfile("nextstate11.dat", ret = osp_get_cfgfile("nextstate11.dat",
(uint32_t *)&(g_nxtstate11_addr), (uint32_t *)&(g_nxtstate11_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("nextstate11.dat load fail!\n"); //LOG_ERROR_S("nextstate11.dat load fail!\n");
} }
ret = osp_get_cfgfile("nextstate13.dat", ret = osp_get_cfgfile("nextstate13.dat",
(uint32_t *)&(g_nxtstate13_addr), (uint32_t *)&(g_nxtstate13_addr),
(int32_t *)&(g_thita_len)); (int32_t *)&(g_thita_len));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("nextstate13.dat load fail!\n"); //LOG_ERROR_S("nextstate13.dat load fail!\n");
} }
LOG_INFO_S("trasnform para dat init & load finish!\n"); //LOG_INFO_S("trasnform para dat init & load finish!\n");
return 0; return 0;
} }

View File

@ -65,7 +65,7 @@ void Transmitter_Init()
(int32_t *)&(g_transmitter_table_param.transmitter_config1_length)); (int32_t *)&(g_transmitter_table_param.transmitter_config1_length));
if(0 != ret) if(0 != ret)
{ {
LOG_ERROR_S("Transmitter_cfg_dm1.dat not found!\n"); //LOG_ERROR_S("Transmitter_cfg_dm1.dat not found!\n");
} }
//ret = osp_get_cfgfile("Transmitter_cfg_dm2.dat", //ret = osp_get_cfgfile("Transmitter_cfg_dm2.dat",
// (uint32_t *)&(g_transmitter_table_param.transmitter_config2_ddr_ptr), // (uint32_t *)&(g_transmitter_table_param.transmitter_config2_ddr_ptr),