diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cb5bf95 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "files.associations": { + "jesd_csu_nr_fdd.h": "c", + "jesd_csu.h": "c", + "jesd_csu_lte_fdd.h": "c" + } +} \ No newline at end of file diff --git a/README.md b/README.md index 2feaea2..a302fa5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -compile: -.out +# compile: + +## .out + stage1: config ./public/make MaPU_TC_HOME := /home/ittc/Software/toolchain @@ -8,17 +10,18 @@ stage2: stage3: build res path: ./build - #得到 - #ecs_rfm_spu0.out - #ecs_rfm_spu1.out - #pet_rfm_spu0.out - #pet_rfm_spu1.out + 得到 + ecs_rfm_spu0.out + ecs_rfm_spu1.out + pet_rfm_spu0.out + pet_rfm_spu1.out + +## .a -.a stage1: ./build.sh --jesd --pcie - #得到 - #libape_spu.a +得到 +libape_spu.a -#以上全部放到APE工程Platform/build \ No newline at end of file +### 以上全部放到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 9b4324d..59b39f5 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,7 +4,7 @@ #include "typedef.h" // 4 ant, LTE -#define JESD_LTEFDD_ANT_NUM 2// +#define JESD_LTEFDD_ANT_NUM 4// #define JESD_LTEFDD_MARGIN 6 #define JESD_LTEFDD_SLOT_NUM 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 b283ae3..8298e06 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 @@ -7,7 +7,7 @@ // 4 ant, NR #define JESD_NRFDD_ANT_NUM 4//4 -#define JESD_NRFDD_MARGIN 6//5 +#define JESD_NRFDD_MARGIN 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 0x0A200000 // 0x1E0000 -#define JESD_NRFDD_TX_SLOT_ODD_DATA_ADDR 0x0A278000 // 0x1E0000 +#define JESD_NRFDD_TX_SLOT_EVEN_DATA_ADDR 0x60F00000 // 0x1E0000 +#define JESD_NRFDD_TX_SLOT_ODD_DATA_ADDR 0x610E0000 // 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 a073177..af76bcf 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 = (0); + txCsuNode[i].yStep = (JESD_NRFDD_SLOT_SAM_CNT<<2); 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 = (0); + txCsuNode[i].yStep = (JESD_NRFDD_SLOT_SAM_CNT<<2); 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/test/testcases/case52/fronthaul/src/jesd_test_case52.s.c b/public/test/testcases/case52/fronthaul/src/jesd_test_case52.s.c index e02acf7..64c0474 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 = 1; + uint8_t antNum = JESD_NRFDD_ANT_NUM; uint8_t idAnt = 0; uint8_t idSlot = 0; uint32_t srcAddr = 0;