Merge branch 'dev_ck_v2.1_feature_UCP4008SL#1024' into 'dev_ck_v2.1'

feature UCP4008SL #1024

See merge request ucp/driver/ucp4008_platform_spu!39
This commit is contained in:
Xianfeng Du 2023-09-27 12:30:39 +00:00
commit ab5af32804
15 changed files with 32 additions and 31 deletions

View File

@ -31,11 +31,12 @@ typedef enum _tagCpriOptionID
// cpri map模式 // cpri map模式
typedef enum _tagCpriMapType typedef enum _tagCpriMapType
{ {
NR4T4R_7DS2U = 0, OTIC_MAP_FIGURE10 = 0, //option8,双模4T4R NR小区 + 2T2R LTE小区
NR4T4R_LTE2T2R_FDD, OTIC_MAP_FIGURE12, //option8,NR 4T4R单小区
NR2_4T4R_7DS2U OTIC_MAP_FIGURE16 //option10,NR 4T4R的2小区
}CpriMapType; }CpriMapType;
// ecpri option模式决定接口速率 // ecpri option模式决定接口速率
typedef enum _tagEcpriOptionID typedef enum _tagEcpriOptionID
{ {
@ -48,14 +49,14 @@ 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
}stForntHaulDrvPara; }stFrontHaulDrvPara;
/* /*
fronthaul_drv_cfg fronthaul_drv_cfg
stForntHaulDrvPara* pFhDrvPara stFrontHaulDrvPara* pFhDrvPara
*/ */
int32_t fronthaul_drv_cfg(stForntHaulDrvPara* pFhDrvPara); int32_t fronthaul_drv_cfg(stFrontHaulDrvPara* pFhDrvPara);
/* /*
delay_us delay_us

View File

@ -193,7 +193,7 @@ 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
}stForntHaulDrvPara; }stFrontHaulDrvPara;
typedef struct phy_timer_config_ind_t typedef struct phy_timer_config_ind_t
{ {

View File

@ -9,7 +9,7 @@ void check_phy_cell(void);
void check_10ms_offset(void); void check_10ms_offset(void);
int32_t fronthaul_drv_cfg(stForntHaulDrvPara* pFhDrvPara); int32_t fronthaul_drv_cfg(stFrontHaulDrvPara* pFhDrvPara);
#endif #endif

View File

@ -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) if (PROTOCOL_CPRI == pFhDrvPara->protocolSel)
{ {

View File

@ -29,8 +29,8 @@ uint8_t gu8_send_del_task_cnt = 0;
int32_t phy_fh_drv_init() int32_t phy_fh_drv_init()
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
#ifdef DISTRIBUTED_BS #ifdef DISTRIBUTED_BS
fhDrvPara.protocolSel = PROTOCOL_CPRI; fhDrvPara.protocolSel = PROTOCOL_CPRI;

View File

@ -29,8 +29,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init() int32_t fh_drv_init()
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_CPRI; fhDrvPara.protocolSel = PROTOCOL_CPRI;
fhDrvPara.rateOption = CPRI_OPTION_8; fhDrvPara.rateOption = CPRI_OPTION_8;

View File

@ -30,8 +30,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init() int32_t fh_drv_init()
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_CPRI; fhDrvPara.protocolSel = PROTOCOL_CPRI;
fhDrvPara.rateOption = CPRI_OPTION_8; fhDrvPara.rateOption = CPRI_OPTION_8;

View File

@ -29,8 +29,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init() int32_t fh_drv_init()
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
#ifdef DISTRIBUTED_BS #ifdef DISTRIBUTED_BS
fhDrvPara.protocolSel = PROTOCOL_CPRI; fhDrvPara.protocolSel = PROTOCOL_CPRI;

View File

@ -63,8 +63,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init(void) int32_t fh_drv_init(void)
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_CPRI; fhDrvPara.protocolSel = PROTOCOL_CPRI;
fhDrvPara.rateOption = CPRI_OPTION_8; fhDrvPara.rateOption = CPRI_OPTION_8;

View File

@ -44,8 +44,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init(void) int32_t fh_drv_init(void)
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_JESD; fhDrvPara.protocolSel = PROTOCOL_JESD;

View File

@ -152,8 +152,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init(void) int32_t fh_drv_init(void)
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_JESD; fhDrvPara.protocolSel = PROTOCOL_JESD;

View File

@ -44,8 +44,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init(void) int32_t fh_drv_init(void)
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_JESD; fhDrvPara.protocolSel = PROTOCOL_JESD;

View File

@ -43,8 +43,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init(void) int32_t fh_drv_init(void)
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_JESD; fhDrvPara.protocolSel = PROTOCOL_JESD;

View File

@ -44,8 +44,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init(void) int32_t fh_drv_init(void)
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_JESD; fhDrvPara.protocolSel = PROTOCOL_JESD;

View File

@ -44,8 +44,8 @@ int32_t fh_data_init(void)
int32_t fh_drv_init(void) int32_t fh_drv_init(void)
{ {
stForntHaulDrvPara fhDrvPara; stFrontHaulDrvPara fhDrvPara;
memset_ucp(&fhDrvPara, 0, sizeof(stForntHaulDrvPara)); memset_ucp(&fhDrvPara, 0, sizeof(stFrontHaulDrvPara));
fhDrvPara.protocolSel = PROTOCOL_JESD; fhDrvPara.protocolSel = PROTOCOL_JESD;