replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / easy-setup / enrollee / inc / easysetup.h

diff --git a/service/easy-setup/enrollee/inc/easysetup.h b/service/easy-setup/enrollee/inc/easysetup.h
index c85ba32..99b926f 100755 (executable)
--- a/service/easy-setup/enrollee/inc/easysetup.h
+++ b/service/easy-setup/enrollee/inc/easysetup.h
@@ -25,8 +25,6 @@
 #include "escommon.h"
 #include "ESEnrolleeCommon.h"
 
-#include "ocpayload.h"
-
 /**
  * @file
  *
@@ -56,17 +54,17 @@ typedef void (*ESWriteUserdataCb)(OCRepPayload* payload, char* resourceType);
  * @param userdata User-specific data you want to deliver to desired users, i.e. application.
  * The user should know a data structure of passed userdata.
  */
-typedef void (*ESReadUserdataCb)(OCRepPayload* payload, char* resourceType, void* userdata);
+typedef void (*ESReadUserdataCb)(OCRepPayload* payload, char* resourceType, void** userdata);
 
 /**
  * This function Initializes the EasySetup. This API must be called prior to invoking any other API
  *
  * @param isSecured         True if the Enrollee is operating in secured mode.
  * @param resourceMask      Provisining Resource Type which application wants to make.
- *                          ES_WIFI_RESOURCE = 0x01,
- *                          ES_CLOUD_RESOURCE = 0x02,
+ *                          ES_WIFICONF_RESOURCE = 0x01,
+ *                          ES_COAPCLOUDCONF_RESOURCE = 0x02,
  *                          ES_DEVCONF_RESOURCE = 0x04
- * @param callbacks         ESProvisioningCallbacks for updating Provisioning Resources' data to the application
+ * @param callbacks         ESProvisioningCallbacks for updating Easy setup Resources' data to the application
  * @return ::ES_OK on success, some other value upon failure.
  */
 ESResult ESInitEnrollee(bool isSecured, ESResourceMask resourceMask, ESProvisioningCallbacks callbacks);
@@ -75,7 +73,7 @@ ESResult ESInitEnrollee(bool isSecured, ESResourceMask resourceMask, ESProvision
 /**
  * This function Sets Device Information.
  *
- * @param deviceProperty   Contains device information composed of WiFi Structure & DevConf Structure
+ * @param deviceProperty   Contains device information composed of WiFiConf Structure & DevConf Structure
  * @return ::ES_OK on success, some other value upon failure.
  *
  * @see ESDeviceProperty
@@ -105,8 +103,7 @@ ESResult ESSetState(ESEnrolleeState esState);
 ESResult ESSetErrorCode(ESErrorCode esErrCode);
 
 /**
- * This function performs termination of Provisioning and Network resources.
- * Also terminates the IoTivity core stack.
+ * This function performs termination of all Easy setup resources.
  *
  * @return ::ES_OK on success, some other value upon failure.
  */