Feature/l2configure - Test purpose

configure.ac

@@ -39,6 +39,30 @@ AC_ARG_ENABLE([gtestapp],
              [echo "Gtestapp is disabled"])
 AM_CONDITIONAL([WITH_GTEST_SUPPORT], [test x$GTEST_SUPPORT_ENABLED = xtrue])
 
+L2_SUPPORT_FLAG =""
+
+AC_ARG_ENABLE([l2support],
+  AS_HELP_STRING([--enable-l2support], [enable L2 support (default is no)]),
+  [
+    case "${enableval}" in
+      yes)
+        L2_SUPPORT_ENABLED=true
+        L2_ENABLE_FLAG="-DL2_SUPPORT"
+        AC_CONFIG_FILES([./Makefile])
+        ;;
+      no)
+        L2_SUPPORT_ENABLED=false
+        ;;
+      *)
+        AC_MSG_ERROR([bad value ${enableval} for --enable-l2support])
+        ;;
+    esac
+  ],
+  [echo "L2 support is disabled"])
+AC_SUBST(L2_ENABLE_FLAG)
+AM_CONDITIONAL([WITH_L2_SUPPORT], [test x$L2_SUPPORT_ENABLED = xtrue])
+
+
 # Config Source files.
 AC_CONFIG_SRCDIR([src/rrdMain.c])
 AC_CONFIG_HEADERS([config.h])
@@ -72,5 +96,16 @@ AC_ARG_ENABLE([iarmbusSupport],
 esac],[iarmbusSupport=false])
 AM_CONDITIONAL([IARMBUS_ENABLE], [test x$iarmbusSupport = xtrue])
 
+# L2 Support
+#AC_ARG_ENABLE([L2Support],
+#[  --enable-L2Support    Turn on L2 support],
+#[case "${enableval}" in
+#  yes) L2Support=true ;;
+#  no)  L2Support=false ;;
+#  *) AC_MSG_ERROR([bad value ${enableval} for --enable-L2Support]) ;;
+#esac],[L2Support=false])
+#AM_CONDITIONAL([L2_ENABLE], [test x$L2Support = xtrue])
+
+AC_SUBST(L2_SUPPORT_ENABLED)
 AC_SUBST(GTEST_ENABLE_FLAG)
 AC_OUTPUT

cov_build.sh

@@ -78,6 +78,6 @@ cp libIARM.h /usr/local/include
 cd $WORKDIR
 autoreconf -i
 autoupdate
-./configure --prefix=${INSTALL_DIR} --enable-iarmbusSupport=yes
-make remotedebugger_CFLAGS="-I/usr/include/cjson -I/usr/local/include/wdmp-c -I/usr/local/include/rbus -I/usr/local/include -I/usr/local/include/trower-base64 -DIARMBUS_SUPPORT" remotedebugger_LDFLAGS="-L/usr/local/lib -lrdkloggers -lcjson -lrfcapi -lrbus -lmsgpackc -lsecure_wrapper -lwebconfig_framework -lIARMBus -ltr181api  -L/usr/local/lib/x86_64-linux-gnu -ltrower-base64 -L/usr/lib/x86_64-linux-gnu"
+./configure --prefix=${INSTALL_DIR} --enable-iarmbusSupport=yes --enable-l2support=yes
+make remotedebugger_CFLAGS="-I/usr/include/cjson -I/usr/local/include/wdmp-c -I/usr/local/include/rbus -I/usr/local/include -I/usr/local/include/trower-base64 -DIARMBUS_SUPPORT -DL2_SUPPORT" remotedebugger_LDFLAGS="-L/usr/local/lib -lrdkloggers -lcjson -lrfcapi -lrbus -lmsgpackc -lsecure_wrapper -lwebconfig_framework -lIARMBus -ltr181api  -L/usr/local/lib/x86_64-linux-gnu -ltrower-base64 -L/usr/lib/x86_64-linux-gnu"
 make install

src/rrdInterface.c

@@ -74,17 +74,23 @@ int RRD_subscribe()
     subscriptions[1].handler  = _remoteDebuggerWebCfgDataEventHandler;
     subscriptions[1].userData = NULL;
 
-#ifndef IARMBUS_SUPPORT
-    subscriptions[2].eventName = RDM_DOWNLOAD_EVENT;
-    subscriptions[2].filter = NULL;
-    subscriptions[2].duration = 0;
-    subscriptions[2].handler  = _rdmDownloadEventHandler;
-    subscriptions[2].userData = NULL;
+// #if !defined(IARMBUS_SUPPORT) || defined(L2_SUPPORT)
+//    subscriptions[2].eventName = RDM_DOWNLOAD_EVENT;
+//    subscriptions[2].filter = NULL;
+//    subscriptions[2].duration = 0;
+//   subscriptions[2].handler  = _rdmDownloadEventHandler;
+//    subscriptions[2].userData = NULL;
+
+    subscriptions[3].eventName = RDM_DOWNLOAD_EVENT1;
+    subscriptions[3].filter = NULL;
+    subscriptions[3].duration = 0;
+    subscriptions[3].handler  = _rdmDownloadEventHandler;
+    subscriptions[3].userData = NULL;
 
     ret = rbusEvent_SubscribeEx(rrdRbusHandle, subscriptions, 3, 60);
-#else
-    ret = rbusEvent_SubscribeEx(rrdRbusHandle, subscriptions, 2, 60);
-#endif
+//#else
+   // ret = rbusEvent_SubscribeEx(rrdRbusHandle, subscriptions, 2, 60);
+//#endif
 #endif
     if(ret != 0)
     {

src/rrdInterface.h

@@ -41,7 +41,12 @@ extern "C"
 #define RRD_WEBCFG_FORCE_SYNC "Device.X_RDK_WebConfig.ForceSync"
 #define RRD_SET_ISSUE_EVENT "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.RDKRemoteDebugger.IssueType"
 #define RRD_WEBCFG_ISSUE_EVENT "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.RDKRemoteDebugger.WebCfgData"
-#define RDM_DOWNLOAD_EVENT "Device.DeviceInfo.X_RDKCENTRAL-COM_RDKDownloadManager.DownloadStatus"
+//#if !defined(L2_SUPPORT)
+//#define RDM_DOWNLOAD_EVENT "Device.DeviceInfo.X_RDKCENTRAL-COM_RDKDownloadManager.DownloadStatus"
+//#else
+#define RDM_DOWNLOAD_EVENT "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.RDKRemoteDebugger.DownloadStatus"
+#define RDM_DOWNLOAD_EVENT1 "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.RDKRemoteDebugger.DownloadStatus"
+//#endif
 #define RRD_PROCESS_NAME "remotedebugger"
 #define RRD_RBUS_TIMEOUT 60