Skip to content

RDKB-65709: Integrate baseline changes for XER2 in EthAgent component #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vysakhav wants to merge 2 commits into
base: develop
Choose a base branch
from
+5 −5
Open

RDKB-65709: Integrate baseline changes for XER2 in EthAgent component #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6e20b6
RDKB-65709: Integrate baseline changes for XER2 in EthAgent component
Jun 25, 2026
d2fa51e
Merge branch 'develop' into feature/xer2_bringup
vysakhav Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions source/TR-181/board_sbapi/cosa_ethernet_apis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,14 +968,14 @@ int ethGetPHYRate
CCSP_HAL_ETHSW_LINK_RATE LinkRate = CCSP_HAL_ETHSW_LINK_NULL;
CCSP_HAL_ETHSW_DUPLEX_MODE DuplexMode = CCSP_HAL_ETHSW_DUPLEX_Auto;
INT PHYRate = 0;
#if defined(_CBR_PRODUCT_REQ_) || defined(_COSA_BCM_MIPS_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) || ( defined (_XB6_PRODUCT_REQ_) && defined (_COSA_BCM_ARM_))
#if defined(_CBR_PRODUCT_REQ_) || defined(_COSA_BCM_MIPS_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_) || ( defined (_XB6_PRODUCT_REQ_) && defined (_COSA_BCM_ARM_)) || defined(_XER2_PRODUCT_REQ_)
CCSP_HAL_ETHSW_LINK_STATUS LinkStatus = CCSP_HAL_ETHSW_LINK_Down;
#endif
/* For Broadcom platform device, CcspHalEthSwGetPortStatus returns the Linkrate based
* on the CurrentBitRate and CcspHalEthSwGetPortCfg returns the Linkrate based on the
* MaximumBitRate. Hence CcspHalEthSwGetPortStatus called for Broadcom platform devices.
*/
#if defined(_CBR_PRODUCT_REQ_) || defined(_COSA_BCM_MIPS_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_)|| ( defined (_XB6_PRODUCT_REQ_) && defined (_COSA_BCM_ARM_))
#if defined(_CBR_PRODUCT_REQ_) || defined(_COSA_BCM_MIPS_) || defined(_SCER11BEL_PRODUCT_REQ_) || defined(_SCXF11BFL_PRODUCT_REQ_)|| ( defined (_XB6_PRODUCT_REQ_) && defined (_COSA_BCM_ARM_)) || defined (_XER2_PRODUCT_REQ_)
status = CcspHalEthSwGetPortStatus(PortId, &LinkRate, &DuplexMode, &LinkStatus);
CcspTraceWarning(("CcspHalEthSwGetPortStatus link rate %d\n", LinkRate));
#else
Expand Down Expand Up @@ -3197,7 +3197,7 @@ ANSC_STATUS EthWanBridgeInit(PCOSA_DATAMODEL_ETHERNET pEthernet)
#else
v_secure_system("ifconfig %s down; ip link set %s name %s", wanPhyName,wanPhyName,ETHWAN_DOCSIS_INF_NAME);
#endif
#elif !defined(_SCER11BEL_PRODUCT_REQ_) && !defined(_XER5_PRODUCT_REQ_) && !defined(_SCXF11BFL_PRODUCT_REQ_)
#elif !defined(_SCER11BEL_PRODUCT_REQ_) && !defined(_XER5_PRODUCT_REQ_) && !defined(_SCXF11BFL_PRODUCT_REQ_) && !defined(_XER2_PRODUCT_REQ_)
#ifdef CORE_NET_LIB
status=interface_down(wanPhyName);
if (status != CNL_STATUS_SUCCESS)
Expand Down Expand Up @@ -3323,7 +3323,7 @@ ANSC_STATUS EthWanBridgeInit(PCOSA_DATAMODEL_ETHERNET pEthernet)
v_secure_system("ifconfig %s up",ethwan_ifname);
#endif
#endif
#if defined (_CBR2_PRODUCT_REQ_) || defined (_SCER11BEL_PRODUCT_REQ_) || defined (_SCXF11BFL_PRODUCT_REQ_)
#if defined (_CBR2_PRODUCT_REQ_) || defined (_SCER11BEL_PRODUCT_REQ_) || defined (_SCXF11BFL_PRODUCT_REQ_) || defined(_XER2_PRODUCT_REQ_)
#ifdef CORE_NET_LIB
status=interface_up(ethwan_ifname);
if(status != CNL_STATUS_SUCCESS)
Expand Down
2 changes: 1 addition & 1 deletion source/TR-181/middle_layer_src/cosa_ethernet_dml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ EthernetWAN_SetParamStringValue
ERR_CHK(rc);
if ((!ind) && (rc == EOK))
{
#if !defined (_XER5_PRODUCT_REQ_) && !defined(_SCER11BEL_PRODUCT_REQ_) && !defined(_SCXF11BFL_PRODUCT_REQ_)
#if !defined (_XER5_PRODUCT_REQ_) && !defined(_SCER11BEL_PRODUCT_REQ_) && !defined(_SCXF11BFL_PRODUCT_REQ_) && !defined(_XER2_PRODUCT_REQ_)
bValue = FALSE;
wan_mode = WAN_MODE_DOCSIS;
#else
Expand Down
Loading