Merge remote-tracking branch 'upstream/master' into syncretry

CMakeLists.txt

@@ -35,6 +35,7 @@ set(COMMON_LIBRARY_DIR ${INSTALL_DIR}/lib/${CMAKE_LIBRARY_ARCHITECTURE})
 
 option(BUILD_RASPBERRYPI "BUILD_RASPBERRYPI" OFF)
 option(BUILD_EMULATOR "BUILD_EMULATOR" OFF)
+option(BUILD_BANANAPI_R4 "BUILD_BANANAPI_R4" OFF)
 
 include_directories(${INCLUDE_DIR}
                     ${INCLUDE_DIR}/cjson
@@ -88,6 +89,10 @@ if (BUILD_EMULATOR)
 add_definitions(-DRDKB_EMU)
 endif (BUILD_EMULATOR)
 
+if (BUILD_BANANAPI_R4)
+add_definitions(-DPLATFORM_BANANAPI_R4)
+endif (BUILD_BANANAPI_R4)
+
 if (FEATURE_SUPPORT_WEBCONFIG)
 add_definitions(-DFEATURE_SUPPORT_WEBCONFIG)
 endif (FEATURE_SUPPORT_WEBCONFIG)

source/broadband/include/webpa_internal.h

@@ -81,7 +81,7 @@
 #define DEVICE_MAC                   "Device.DPoE.Mac_address"
 #elif defined(PLATFORM_RASPBERRYPI)
 #define DEVICE_MAC                   "Device.Ethernet.Interface.5.MACAddress"
-#elif defined(RDKB_EMU)
+#elif defined(RDKB_EMU) || defined(PLATFORM_BANANAPI_R4)
 #define DEVICE_MAC                   "Device.DeviceInfo.X_COMCAST-COM_WAN_MAC"
 #elif defined(_HUB4_PRODUCT_REQ_) || defined(_WNXL11BWL_PRODUCT_REQ_)
 #define DEVICE_MAC                   "Device.DeviceInfo.X_COMCAST-COM_WAN_MAC"

source/broadband/webpa_internal.c

@@ -38,7 +38,7 @@ char *objectList[] ={
 "Device.UserInterface.",
 "Device.InterfaceStack.",
 "Device.Ethernet.",
-#if ! defined(_HUB4_PRODUCT_REQ_) && ! defined(_CBR_PRODUCT_REQ_)
+#if ! defined(_HUB4_PRODUCT_REQ_) && ! defined(_CBR_PRODUCT_REQ_) && ! defined(_SCER11BEL_PRODUCT_REQ_) && ! defined(_XER5_PRODUCT_REQ_)
 "Device.MoCA.",
 #endif
 "Device.PPP.",
@@ -74,7 +74,7 @@ char *objectList[] ={
 "Device.Hosts.",
 "Device.ManagementServer.",
 "Device.XHosts.",
-#ifndef _HUB4_PRODUCT_REQ_
+#if ! defined(_HUB4_PRODUCT_REQ_) && ! defined(_XER5_PRODUCT_REQ_)
 "Device.X_CISCO_COM_MTA.",
 #endif
 "Device.X_RDKCENTRAL-COM_XDNS.",
@@ -92,7 +92,7 @@ char *objectList[] ={
 char *subObjectList[] = 
 {
 "Device.DeviceInfo.NetworkProperties.",
-#if ! defined(_HUB4_PRODUCT_REQ_) && ! defined(_CBR_PRODUCT_REQ_)
+#if ! defined(_HUB4_PRODUCT_REQ_) && ! defined(_CBR_PRODUCT_REQ_) && ! defined(_SCER11BEL_PRODUCT_REQ_) && ! defined(_XER5_PRODUCT_REQ_)
 "Device.MoCA.Interface.",
 #endif
 "Device.IP.Diagnostics.",
@@ -199,7 +199,7 @@ int waitForOperationalReadyCondition()
 	{
 		return EPON_FAILED;
 	}
-#elif !defined(PLATFORM_RASPBERRYPI) && !defined(RDKB_EMU)
+#elif !defined(PLATFORM_RASPBERRYPI) && !defined(RDKB_EMU) && !defined(PLATFORM_BANANAPI_R4)
     if(check_ethernet_wan_status() != WDMP_SUCCESS)
 	{
 #if !defined(_SKY_HUB_COMMON_PRODUCT_REQ_)

source/broadband/webpa_notification.c

@@ -137,7 +137,7 @@ const char * notifyparameters[]={
 #ifndef _CBR_PRODUCT_REQ_
 "Device.DeviceInfo.X_RDKCENTRAL-COM_AkerEnable",
 #endif
-#if ! defined(_HUB4_PRODUCT_REQ_) && ! defined(_CBR_PRODUCT_REQ_)
+#if ! defined(_HUB4_PRODUCT_REQ_) && ! defined(_CBR_PRODUCT_REQ_) && ! defined(_SCER11BEL_PRODUCT_REQ_) && ! defined(_XER5_PRODUCT_REQ_)
 "Device.MoCA.Interface.1.Enable",
 #endif
 "Device.NotifyComponent.X_RDKCENTRAL-COM_PresenceNotification",