Merge branch 'dev_ck_v2.1_NewFeature#1684' into 'dev_ck_v2.1'

/inc/修改drv_rfm.h中的结构体CpriMapType,增加RJ的Mapping模式(漏合补合)

See merge request ucp/driver/ucp4008_platform_spu!101
This commit is contained in:
Weihua Li 2024-04-07 05:40:23 +00:00
commit cf8397b522

View File

@ -9,48 +9,49 @@
/**************************************************/ /**************************************************/
/* 前传接口驱动初始化相关 */ /* 前传接口驱动初始化相关 */
/**************************************************/ /**************************************************/
// 前传接口类型 // 前传接口类型
typedef enum _tagProtocolID typedef enum _tagProtocolID
{ {
PROTOCOL_NULL = 0, PROTOCOL_NULL = 0,
PROTOCOL_CPRI = 1, PROTOCOL_CPRI = 1,
PROTOCOL_ECPRI, PROTOCOL_ECPRI,
PROTOCOL_JESD PROTOCOL_JESD
}numProtoID; }numProtoID;
// cpri option模式决定接口速率 // cpri option模式决定接口速率
typedef enum _tagCpriOptionID typedef enum _tagCpriOptionID
{ {
CPRI_OPTION_7 = 7, CPRI_OPTION_7 = 7,
CPRI_OPTION_8 = 8, CPRI_OPTION_8 = 8,
CPRI_OPTION_9 = 9, CPRI_OPTION_9 = 9,
CPRI_OPTION_10 = 10 CPRI_OPTION_10 = 10
}CpriOptID; }CpriOptID;
// cpri map模式 // cpri map模式
typedef enum _tagCpriMapType typedef enum _tagCpriMapType
{ {
OTIC_MAP_FIGURE10 = 0, //option8,双模4T4R NR小区 + 2T2R LTE小区 OTIC_MAP_FIGURE10 = 0, //option8,双模4T4R NR小区 + 2T2R LTE小区
OTIC_MAP_FIGURE12, //option8,NR 4T4R单小区 OTIC_MAP_FIGURE12, //option8,NR 4T4R单小区
OTIC_MAP_FIGURE16 //option10,NR 4T4R的2小区 OTIC_MAP_FIGURE16, //option10,NR 4T4R的2小区
}CpriMapType; OTIC_MAP_8NR_8LTE //RJ Mapping(2*4TR NR + 4*2TR LTE)
}CpriMapType;
// ecpri option模式决定接口速率
// ecpri option模式决定接口速率
typedef enum _tagEcpriOptionID typedef enum _tagEcpriOptionID
{ {
ECPRI_OPTION_10G = 10, ECPRI_OPTION_10G = 10,
ECPRI_OPTION_25G = 25 ECPRI_OPTION_25G = 25
}EcpriOptID; }EcpriOptID;
typedef struct _tagFrontHaulDrvPara typedef struct _tagFrontHaulDrvPara
{ {
uint32_t protocolSel; // numProtoID uint32_t protocolSel; // numProtoID
uint32_t rateOption; // CpriOptID/EcpriOptID uint32_t rateOption; // CpriOptID/EcpriOptID
uint32_t mapOption; // CpriMapType uint32_t mapOption; // CpriMapType
}stFrontHaulDrvPara; }stFrontHaulDrvPara;
typedef enum _tagScsID typedef enum _tagScsID
{ {
LTE_SCS_ID = 0, LTE_SCS_ID = 0,
@ -67,15 +68,15 @@ typedef enum _tagFrameType
TDD_2500US_DOUBLE = 2, TDD_2500US_DOUBLE = 2,
FRAME_NULL = 0xFFFF FRAME_NULL = 0xFFFF
}numFrameType; }numFrameType;
/* /*
fronthaul_drv_cfg fronthaul_drv_cfg
stFrontHaulDrvPara* pFhDrvPara stFrontHaulDrvPara* pFhDrvPara
*/ */
int32_t fronthaul_drv_cfg(stFrontHaulDrvPara* pFhDrvPara); int32_t fronthaul_drv_cfg(stFrontHaulDrvPara* pFhDrvPara);
/* /*
delay_us delay_us
num num
@ -180,12 +181,12 @@ typedef struct _tagPhyDelCell
uint32_t scsId; uint32_t scsId;
uint32_t delCoreId; // 此次需要删除小区的ape core idbitmap方式bit0对应ape0bit1对应ape1。。。 uint32_t delCoreId; // 此次需要删除小区的ape core idbitmap方式bit0对应ape0bit1对应ape1。。。
}stPhyDelCell; }stPhyDelCell;
typedef struct CpriRruMsg typedef struct CpriRruMsg
{ {
uint32_t msg_addr; uint32_t msg_addr;
uint32_t msg_len; uint32_t msg_len;
}CpriRruMsg_t; }CpriRruMsg_t;
/* /*
mtimer_init4phy mtimer_init4phy
@ -207,7 +208,7 @@ int32_t mtimer_del_cell_cfg(stPhyDelCell* delCell);
*delay: cpri的接收延迟量ns *delay: cpri的接收延迟量ns
oam或phy脚本设置的cpri的接收延迟量oam或phy脚本配置的延迟量不足6us oam或phy脚本设置的cpri的接收延迟量oam或phy脚本配置的延迟量不足6us
6us做接收延迟量 6us做接收延迟量
*/ */
void get_cpri_delay(uint32_t* delay); void get_cpri_delay(uint32_t* delay);
@ -216,44 +217,44 @@ void get_cpri_delay(uint32_t* delay);
*advance: cpri的发送提前量ns *advance: cpri的发送提前量ns
oam或phy脚本设置的cpri的发送提前量oam或phy脚本配置的延迟量不足6us oam或phy脚本设置的cpri的发送提前量oam或phy脚本配置的延迟量不足6us
6us做发送提前量 6us做发送提前量
*/ */
void get_cpri_advance(uint32_t* advance); void get_cpri_advance(uint32_t* advance);
/* /*
get_cpri_frame_data_offset get_cpri_frame_data_offset
*offset: cpri的上行帧头与上行数据直接的偏移量ns *offset: cpri的上行帧头与上行数据直接的偏移量ns
oam或phy脚本设置的cpri的上行帧头与上行数据直接的偏移量 oam或phy脚本设置的cpri的上行帧头与上行数据直接的偏移量
*/ */
void get_cpri_frame_data_offset(uint32_t* offset); void get_cpri_frame_data_offset(uint32_t* offset);
/* /*
set_cpri_rru_msg set_cpri_rru_msg
CpriRruMsg_t rru_msg: CpriRruMsg_t rru_msg:
cpri headerram向rru透传消息的接口 cpri headerram向rru透传消息的接口
*/ */
int32_t set_cpri_rru_msg(CpriRruMsg_t rru_msg); int32_t set_cpri_rru_msg(CpriRruMsg_t rru_msg);
/* /*
phy_sniffer_start phy_sniffer_start
uint32_t nOffsetUs:pp1s的us数 uint32_t nOffsetUs:pp1s的us数
0 0
-1 -1
orx数据搬移 orx数据搬移
*/ */
int32_t phy_sniffer_start(uint32_t nOffsetUs); int32_t phy_sniffer_start(uint32_t nOffsetUs);
/* /*
spu_ddr_monitor_start spu_ddr_monitor_start
uint32_t monitorCnt: uint32_t monitorCnt:
ddr监控功能 ddr监控功能
*/ */
void spu_ddr_monitor_start(uint32_t monitorCnt); void spu_ddr_monitor_start(uint32_t monitorCnt);
/**************************************************/ /**************************************************/
/* ape csu相关 */ /* ape csu相关 */