diff --git a/README.md b/README.md index b82d3b5..2feaea2 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,24 @@ compile: +.out stage1: config ./public/make - MaPU_TC_HOME := /home/ittc/Software/mcstudio/toolchain + MaPU_TC_HOME := /home/ittc/Software/toolchain stage2: ./build.sh --jesd --pcie --test 52 --mask 255 stage3: build res path: ./build + #得到 + #ecs_rfm_spu0.out + #ecs_rfm_spu1.out + #pet_rfm_spu0.out + #pet_rfm_spu1.out + +.a +stage1: + ./build.sh --jesd --pcie + + #得到 + #libape_spu.a + +#以上全部放到APE工程Platform/build \ No newline at end of file diff --git a/public/ecs_rfm_spu1/driver/inc/jesd_csu_lte_fdd.h b/public/ecs_rfm_spu1/driver/inc/jesd_csu_lte_fdd.h index 6a70c46..9b4324d 100644 --- a/public/ecs_rfm_spu1/driver/inc/jesd_csu_lte_fdd.h +++ b/public/ecs_rfm_spu1/driver/inc/jesd_csu_lte_fdd.h @@ -4,8 +4,8 @@ #include "typedef.h" // 4 ant, LTE -#define JESD_LTEFDD_ANT_NUM 4 // 2 -#define JESD_LTEFDD_MARGIN 5 +#define JESD_LTEFDD_ANT_NUM 2// +#define JESD_LTEFDD_MARGIN 6 #define JESD_LTEFDD_SLOT_NUM 10 #define JESD_LTEFDD_TX_NODENUM 10 diff --git a/public/ecs_rfm_spu1/driver/inc/jesd_csu_nr_fdd.h b/public/ecs_rfm_spu1/driver/inc/jesd_csu_nr_fdd.h index 7aa6722..b283ae3 100644 --- a/public/ecs_rfm_spu1/driver/inc/jesd_csu_nr_fdd.h +++ b/public/ecs_rfm_spu1/driver/inc/jesd_csu_nr_fdd.h @@ -3,11 +3,11 @@ #include "typedef.h" -//#define JESD_SAMP_FREQ_245760K +#define JESD_SAMP_FREQ_245760K // 4 ant, NR -#define JESD_NRFDD_ANT_NUM 4 // 2 // -#define JESD_NRFDD_MARGIN 5 +#define JESD_NRFDD_ANT_NUM 4//4 +#define JESD_NRFDD_MARGIN 6//5 #define JESD_NRFDD_SLOT_NUM 10 #define JESD_NRFDD_TX_NODENUM 10 @@ -29,8 +29,8 @@ #define JESD_NR7DS2U_TX_SLOT_EVEN_B7SYMBOL_ADDR 0xA380000 // SM5 #define JESD_NR7DS2U_TX_SLOT_ODD_B7SYMBOL_ADDR 0xA290400 // SM4 #else -#define JESD_NRFDD_TX_SLOT_EVEN_DATA_ADDR 0x60F00000 // 0x1E0000 -#define JESD_NRFDD_TX_SLOT_ODD_DATA_ADDR 0x610E0000 // 0x1E0000 +#define JESD_NRFDD_TX_SLOT_EVEN_DATA_ADDR 0x0A200000 // 0x1E0000 +#define JESD_NRFDD_TX_SLOT_ODD_DATA_ADDR 0x0A278000 // 0x1E0000 #endif #define JESD_NRFDD_RX_SLOT_EVEN_DATA_ADDR 0x6BC00000 // 0x9F00000 // 0x1E0000 diff --git a/public/ecs_rfm_spu1/driver/src/jesd_csu_nr_fdd.s.c b/public/ecs_rfm_spu1/driver/src/jesd_csu_nr_fdd.s.c index af76bcf..a073177 100644 --- a/public/ecs_rfm_spu1/driver/src/jesd_csu_nr_fdd.s.c +++ b/public/ecs_rfm_spu1/driver/src/jesd_csu_nr_fdd.s.c @@ -19,7 +19,7 @@ int32_t jesd_csu_init_nr_fdd() if (0 == (i&0x1)) { txCsuNode[i].dataAddr = JESD_NRFDD_TX_SLOT_EVEN_DATA_ADDR; - txCsuNode[i].yStep = (JESD_NRFDD_SLOT_SAM_CNT<<2); + txCsuNode[i].yStep = (0); txCsuNode[i].allNum = (JESD_NRFDD_SLOT_SAM_CNT<<2)*JESD_NRFDD_ANT_NUM; rxCsuNode[i].dataAddr = JESD_NRFDD_RX_SLOT_EVEN_DATA_ADDR; @@ -29,7 +29,7 @@ int32_t jesd_csu_init_nr_fdd() else if (1 == (i&0x1)) { txCsuNode[i].dataAddr = JESD_NRFDD_TX_SLOT_ODD_DATA_ADDR; - txCsuNode[i].yStep = (JESD_NRFDD_SLOT_SAM_CNT<<2); + txCsuNode[i].yStep = (0); txCsuNode[i].allNum = (JESD_NRFDD_SLOT_SAM_CNT<<2)*JESD_NRFDD_ANT_NUM; rxCsuNode[i].dataAddr = JESD_NRFDD_RX_SLOT_ODD_DATA_ADDR; diff --git a/public/make/makefile.toolchain b/public/make/makefile.toolchain index 9ff6c9a..6ebca82 100644 --- a/public/make/makefile.toolchain +++ b/public/make/makefile.toolchain @@ -7,7 +7,7 @@ # ============================================================================== #MaPU_TC_HOME ?= /public/lixinxin/MaPUIDE/toolchain -MaPU_TC_HOME := /home/ittc/Software/mcstudio/toolchain +MaPU_TC_HOME := /home/ittc/Software/toolchain $(info "MaPU_TC_HOME=" $(MaPU_TC_HOME)) UCP_CC := $(MaPU_TC_HOME)/bin/ucp2 diff --git a/public/test/testcases/case52/fronthaul/src/jesd_test_case52.s.c b/public/test/testcases/case52/fronthaul/src/jesd_test_case52.s.c index 64c0474..e02acf7 100644 --- a/public/test/testcases/case52/fronthaul/src/jesd_test_case52.s.c +++ b/public/test/testcases/case52/fronthaul/src/jesd_test_case52.s.c @@ -80,7 +80,7 @@ void fh_data_check(uint32_t times) void jesd_tx_data_init() { - uint8_t antNum = JESD_NRFDD_ANT_NUM; + uint8_t antNum = 1; uint8_t idAnt = 0; uint8_t idSlot = 0; uint32_t srcAddr = 0;