From 75cccffd10e5bbd8e34881ec530a9ed2b671c288 Mon Sep 17 00:00:00 2001
From: "xinxin.li" <xinxin.li@263.com>
Date: Wed, 27 Sep 2023 20:29:13 +0800
Subject: [PATCH] 1. add cpri map struct; 2. modify struct stFrontHaulDrvPara;

---
 inc/drv_rfm.h                                       | 13 +++++++------
 public/common/driver/inc/phy_para.h                 |  2 +-
 public/ecs_rfm_spu1/driver/inc/rfm1_drv.h           |  2 +-
 public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c         |  2 +-
 public/ecs_rfm_spu1/top/src/phy_init.s.c            |  4 ++--
 .../case14/fronthaul/src/ecs_rfm_spu1_test.s.c      |  4 ++--
 .../case20/fronthaul/src/ecs_rfm_spu1_test.s.c      |  4 ++--
 .../case21/fronthaul/src/fh_test_case21.s.c         |  4 ++--
 .../case34/fronthaul/src/cpri_test_case34.s.c       |  4 ++--
 .../case40/fronthaul/src/jesd_test_case40.s.c       |  4 ++--
 .../case43/fronthaul/src/jesd_test_case43.s.c       |  4 ++--
 .../case44/fronthaul/src/jesd_test_case44.s.c       |  4 ++--
 .../case47/fronthaul/src/jesd_test_case47.s.c       |  4 ++--
 .../case48/fronthaul/src/jesd_test_case48.s.c       |  4 ++--
 .../case49/fronthaul/src/jesd_test_case49.s.c       |  4 ++--
 15 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/inc/drv_rfm.h b/inc/drv_rfm.h
index 37bfb45..8891ff0 100644
--- a/inc/drv_rfm.h
+++ b/inc/drv_rfm.h
@@ -31,10 +31,11 @@ typedef enum _tagCpriOptionID
 // cpri map模式
 typedef enum _tagCpriMapType
 {
-	NR4T4R_7DS2U = 0,
-	NR4T4R_LTE2T2R_FDD,
-	NR2_4T4R_7DS2U
+	OTIC_MAP_FIGURE10 = 0, //option8,双模，4T4R NR小区 + 2T2R LTE小区
+	OTIC_MAP_FIGURE12,     //option8,NR 4T4R单小区	
+	OTIC_MAP_FIGURE16      //option10,NR 4T4R的2小区 
 }CpriMapType;
+
 
 // ecpri option模式，决定接口速率
 typedef enum _tagEcpriOptionID
@@ -48,14 +49,14 @@ typedef struct _tagFrontHaulDrvPara
 	uint32_t protocolSel;	// numProtoID
 	uint32_t rateOption;	// CpriOptID/EcpriOptID
 	uint32_t mapOption;		// CpriMapType
-}stForntHaulDrvPara;
+}stFrontHaulDrvPara;
 
 /*
     函数名称：fronthaul_drv_cfg
-    函数入参：stForntHaulDrvPara* pFhDrvPara ：前传接口配置参数
+    函数入参：stFrontHaulDrvPara* pFhDrvPara ：前传接口配置参数
     函数功能：前传接口驱动配置
 */
-int32_t fronthaul_drv_cfg(stForntHaulDrvPara* pFhDrvPara);
+int32_t fronthaul_drv_cfg(stFrontHaulDrvPara* pFhDrvPara);
 
 /*
     函数名称：delay_us
diff --git a/public/common/driver/inc/phy_para.h b/public/common/driver/inc/phy_para.h
index c5ac6eb..0b07de7 100644
--- a/public/common/driver/inc/phy_para.h
+++ b/public/common/driver/inc/phy_para.h
@@ -193,7 +193,7 @@ typedef struct _tagFrontHaulDrvPara
 	uint32_t protocolSel;	// numProtoID
 	uint32_t rateOption;	// CpriOptID/EcpriOptID
 	uint32_t mapOption;		// CpriMapType
-}stForntHaulDrvPara;
+}stFrontHaulDrvPara;
 
 typedef struct phy_timer_config_ind_t
 {
diff --git a/public/ecs_rfm_spu1/driver/inc/rfm1_drv.h b/public/ecs_rfm_spu1/driver/inc/rfm1_drv.h
index bd577b6..0dd7ce5 100644
--- a/public/ecs_rfm_spu1/driver/inc/rfm1_drv.h
+++ b/public/ecs_rfm_spu1/driver/inc/rfm1_drv.h
@@ -9,7 +9,7 @@ void check_phy_cell(void);
 
 void check_10ms_offset(void);
 
-int32_t fronthaul_drv_cfg(stForntHaulDrvPara* pFhDrvPara);
+int32_t fronthaul_drv_cfg(stFrontHaulDrvPara* pFhDrvPara);
 
 
 #endif
diff --git a/public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c b/public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c
index e37cc91..f6915e6 100644
--- a/public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c
+++ b/public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c
@@ -165,7 +165,7 @@ void check_10ms_offset(void)
     }
 }
 
-int32_t fronthaul_drv_cfg(stForntHaulDrvPara* pFhDrvPara)
+int32_t fronthaul_drv_cfg(stFrontHaulDrvPara* pFhDrvPara)
 {
 	if (PROTOCOL_CPRI == pFhDrvPara->protocolSel)
 	{
diff --git a/public/ecs_rfm_spu1/top/src/phy_init.s.c b/public/ecs_rfm_spu1/top/src/phy_init.s.c
index a227a0b..614a632 100644
--- a/public/ecs_rfm_spu1/top/src/phy_init.s.c
+++ b/public/ecs_rfm_spu1/top/src/phy_init.s.c
@@ -29,8 +29,8 @@ uint8_t gu8_send_del_task_cnt = 0;
 
 int32_t phy_fh_drv_init()
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 #ifdef DISTRIBUTED_BS
 	fhDrvPara.protocolSel = PROTOCOL_CPRI;
diff --git a/public/test/testcases/case14/fronthaul/src/ecs_rfm_spu1_test.s.c b/public/test/testcases/case14/fronthaul/src/ecs_rfm_spu1_test.s.c
index bfd290c..7147aeb 100644
--- a/public/test/testcases/case14/fronthaul/src/ecs_rfm_spu1_test.s.c
+++ b/public/test/testcases/case14/fronthaul/src/ecs_rfm_spu1_test.s.c
@@ -29,8 +29,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init()
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 	fhDrvPara.protocolSel = PROTOCOL_CPRI;
 	fhDrvPara.rateOption = CPRI_OPTION_8;
diff --git a/public/test/testcases/case20/fronthaul/src/ecs_rfm_spu1_test.s.c b/public/test/testcases/case20/fronthaul/src/ecs_rfm_spu1_test.s.c
index 62c98b1..2a696ea 100644
--- a/public/test/testcases/case20/fronthaul/src/ecs_rfm_spu1_test.s.c
+++ b/public/test/testcases/case20/fronthaul/src/ecs_rfm_spu1_test.s.c
@@ -30,8 +30,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init()
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 	fhDrvPara.protocolSel = PROTOCOL_CPRI;
 	fhDrvPara.rateOption = CPRI_OPTION_8;
diff --git a/public/test/testcases/case21/fronthaul/src/fh_test_case21.s.c b/public/test/testcases/case21/fronthaul/src/fh_test_case21.s.c
index 8a57885..5ec8a4b 100644
--- a/public/test/testcases/case21/fronthaul/src/fh_test_case21.s.c
+++ b/public/test/testcases/case21/fronthaul/src/fh_test_case21.s.c
@@ -29,8 +29,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init()
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 #ifdef DISTRIBUTED_BS
 	fhDrvPara.protocolSel = PROTOCOL_CPRI;
diff --git a/public/test/testcases/case34/fronthaul/src/cpri_test_case34.s.c b/public/test/testcases/case34/fronthaul/src/cpri_test_case34.s.c
index 757bf8f..39ce18b 100644
--- a/public/test/testcases/case34/fronthaul/src/cpri_test_case34.s.c
+++ b/public/test/testcases/case34/fronthaul/src/cpri_test_case34.s.c
@@ -63,8 +63,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init(void)
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 
 	fhDrvPara.protocolSel = PROTOCOL_CPRI;
 	fhDrvPara.rateOption = CPRI_OPTION_8;
diff --git a/public/test/testcases/case40/fronthaul/src/jesd_test_case40.s.c b/public/test/testcases/case40/fronthaul/src/jesd_test_case40.s.c
index da322c0..df35fa2 100644
--- a/public/test/testcases/case40/fronthaul/src/jesd_test_case40.s.c
+++ b/public/test/testcases/case40/fronthaul/src/jesd_test_case40.s.c
@@ -44,8 +44,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init(void)
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 	fhDrvPara.protocolSel = PROTOCOL_JESD;
 
diff --git a/public/test/testcases/case43/fronthaul/src/jesd_test_case43.s.c b/public/test/testcases/case43/fronthaul/src/jesd_test_case43.s.c
index 66368b3..4b3916b 100644
--- a/public/test/testcases/case43/fronthaul/src/jesd_test_case43.s.c
+++ b/public/test/testcases/case43/fronthaul/src/jesd_test_case43.s.c
@@ -152,8 +152,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init(void)
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 	fhDrvPara.protocolSel = PROTOCOL_JESD;
 
diff --git a/public/test/testcases/case44/fronthaul/src/jesd_test_case44.s.c b/public/test/testcases/case44/fronthaul/src/jesd_test_case44.s.c
index 5b0f285..b606a12 100644
--- a/public/test/testcases/case44/fronthaul/src/jesd_test_case44.s.c
+++ b/public/test/testcases/case44/fronthaul/src/jesd_test_case44.s.c
@@ -44,8 +44,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init(void)
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 	fhDrvPara.protocolSel = PROTOCOL_JESD;
 
diff --git a/public/test/testcases/case47/fronthaul/src/jesd_test_case47.s.c b/public/test/testcases/case47/fronthaul/src/jesd_test_case47.s.c
index 1dfbf82..e5de451 100644
--- a/public/test/testcases/case47/fronthaul/src/jesd_test_case47.s.c
+++ b/public/test/testcases/case47/fronthaul/src/jesd_test_case47.s.c
@@ -43,8 +43,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init(void)
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 	fhDrvPara.protocolSel = PROTOCOL_JESD;
 
diff --git a/public/test/testcases/case48/fronthaul/src/jesd_test_case48.s.c b/public/test/testcases/case48/fronthaul/src/jesd_test_case48.s.c
index 528bfe1..adb93b7 100644
--- a/public/test/testcases/case48/fronthaul/src/jesd_test_case48.s.c
+++ b/public/test/testcases/case48/fronthaul/src/jesd_test_case48.s.c
@@ -44,8 +44,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init(void)
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 	fhDrvPara.protocolSel = PROTOCOL_JESD;
 
diff --git a/public/test/testcases/case49/fronthaul/src/jesd_test_case49.s.c b/public/test/testcases/case49/fronthaul/src/jesd_test_case49.s.c
index 641a775..5878b49 100644
--- a/public/test/testcases/case49/fronthaul/src/jesd_test_case49.s.c
+++ b/public/test/testcases/case49/fronthaul/src/jesd_test_case49.s.c
@@ -44,8 +44,8 @@ int32_t fh_data_init(void)
 
 int32_t fh_drv_init(void)
 {
-	stForntHaulDrvPara fhDrvPara;
-	memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara));
+	stFrontHaulDrvPara fhDrvPara;
+	memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
 	
 	fhDrvPara.protocolSel = PROTOCOL_JESD;