[easy-setup]Fixed doxygen warnings and renamed a file

- Fixed doxygen warnings and included a file in Doxyfile
- Renamed common.h to escommon.h

Reviewed-on: https://gerrit.iotivity.org/gerrit/3481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Conflicts:
	resource/docs/Doxyfile

Change-Id: Ia499ee77059fa9034ee71ecbd61d972060103800
Signed-off-by: lankamadan<lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>

diff --git a/resource/docs/Doxyfile b/resource/docs/Doxyfile
index 08ad486..d698710 100644 (file)
--- a/resource/docs/Doxyfile
+++ b/resource/docs/Doxyfile
@@ -673,6 +673,8 @@ INPUT                  = . \
                          ../../service/resource-hosting/include/hosting.h \
                          ../../service/resource-encapsulation/include \
                          ../../service/resource-directory/include \
+                         ../../service/easy-setup/sdk/common \
+                         ../../service/easy-setup/sdk/enrollee/api \
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --git a/service/easy-setup/sdk/common/common.h b/service/easy-setup/sdk/common/escommon.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from service/easy-setup/sdk/common/common.h
rename to service/easy-setup/sdk/common/escommon.h
index 6a22ac2..b1b712f
--- a/service/easy-setup/sdk/common/common.h
+++ b/service/easy-setup/sdk/common/escommon.h
@@ -91,7 +91,7 @@ typedef enum {
 } ProvStatus;
 
 /**
- * Response from queries to remote servers. Queries are made by calling the @ref OCDoResource API.
+ * Response from queries to remote servers.
  */
 typedef struct {
     // Provisioning Status

diff --git a/service/easy-setup/sdk/enrollee/api/easysetup.h b/service/easy-setup/sdk/enrollee/api/easysetup.h
index 9887a2c..70b38ad 100644 (file)
--- a/service/easy-setup/sdk/enrollee/api/easysetup.h
+++ b/service/easy-setup/sdk/enrollee/api/easysetup.h
@@ -29,7 +29,8 @@
 
 // Do not remove the include below
 #include "Arduino.h"
-#include "networkHandler.h"
+#include "escommon.h"
+
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.h b/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.h
index 8758674..df67b8f 100755 (executable)
--- a/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.h
+++ b/service/easy-setup/sdk/enrollee/arduino/wifi/networkHandler.h
@@ -37,7 +37,7 @@
 
 #include <string.h>
 #include "logger.h"
-#include "common.h"
+#include "escommon.h"
 
 #define MAXSSIDLEN 33
 #define MAXNETCREDLEN 20

diff --git a/service/easy-setup/sdk/enrollee/inc/resourceHandler.h b/service/easy-setup/sdk/enrollee/inc/resourceHandler.h
index 765f916..6d24877 100644 (file)
--- a/service/easy-setup/sdk/enrollee/inc/resourceHandler.h
+++ b/service/easy-setup/sdk/enrollee/inc/resourceHandler.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include "logger.h"
 #include "ocstack.h"
-#include "common.h"
+#include "escommon.h"
 #include "networkHandler.h"
 #include "octypes.h"
 

diff --git a/service/easy-setup/sdk/mediator/inc/prov_adapter.h b/service/easy-setup/sdk/mediator/inc/prov_adapter.h
index 3ceb901..fdd611f 100644 (file)
--- a/service/easy-setup/sdk/mediator/inc/prov_adapter.h
+++ b/service/easy-setup/sdk/mediator/inc/prov_adapter.h
@@ -25,7 +25,7 @@
 #include "logger.h"
 #include "ocstack.h"
 #include "octypes.h"
-#include "common.h"
+#include "escommon.h"
 
 #include "provisioning.h"
 

diff --git a/service/easy-setup/sdk/mediator/inc/provisioning.h b/service/easy-setup/sdk/mediator/inc/provisioning.h
index 5f63242..72d2d56 100644 (file)
--- a/service/easy-setup/sdk/mediator/inc/provisioning.h
+++ b/service/easy-setup/sdk/mediator/inc/provisioning.h
@@ -26,7 +26,7 @@
 
 #include "logger.h"
 #include "ocstack.h"
-#include "common.h"
+#include "escommon.h"
 
 //-----------------------------------------------------------------------------
 // Defines

diff --git a/service/easy-setup/sdk/mediator/src/provisioning.cpp b/service/easy-setup/sdk/mediator/src/provisioning.cpp
index f3ef773..22e3efe 100644 (file)
--- a/service/easy-setup/sdk/mediator/src/provisioning.cpp
+++ b/service/easy-setup/sdk/mediator/src/provisioning.cpp
@@ -30,7 +30,7 @@
 
 //EasySetup include files
 #include "ocpayload.h"
-#include "common.h"
+#include "escommon.h"
 
 
 // External includes

diff --git a/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp b/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp
index b7afd28..57e44b8 100755 (executable)
--- a/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp
+++ b/service/easy-setup/sdk/mediator/src/wifi_provisioning.cpp
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-// NOTE : Keeping Wifi provisioning in this file to have adaptability while doing OOPs refactoring 
+// NOTE : Keeping Wifi provisioning in this file to have adaptability while doing OOPs refactoring
 
 #include "provisioning.h"
 
@@ -32,7 +32,7 @@
 
 //EasySetup include files
 #include "ocpayload.h"
-#include "common.h"
+#include "escommon.h"
 
 // External includes
 #include "logger.h"