Merge branch 'master' into easysetup

[platform/upstream/iotivity.git] / resource / src / OCPlatform.cpp

diff --git a/resource/src/OCPlatform.cpp b/resource/src/OCPlatform.cpp
index c5f1773..4a7bc49 100644 (file)
--- a/resource/src/OCPlatform.cpp
+++ b/resource/src/OCPlatform.cpp
@@ -70,96 +70,75 @@ namespace OC
                                                     observationIds, pResponse, QoS);
         }
 
-#ifdef CA_INT
         OCResource::Ptr constructResourceObject(const std::string& host,
-                                                const std::string& uri, uint8_t connectivityType,
+                                                const std::string& uri,
+                                                OCConnectivityType connectivityType,
                                                 bool isObservable,
                                                 const std::vector<std::string>& resourceTypes,
                                                 const std::vector<std::string>& interfaces)
         {
-            return OCPlatform_impl::Instance().constructResourceObject(host, uri, connectivityType, 
+            return OCPlatform_impl::Instance().constructResourceObject(host,
+                                                uri, connectivityType,
                                                 isObservable,
                                                 resourceTypes, interfaces);
         }
 
         OCStackResult findResource(const std::string& host,
-                                                const std::string& resourceName,
-                                                uint8_t connectivityType,
-                                                FindCallback resourceHandler)
+                                            const std::string& resourceName,
+                                            OCConnectivityType connectivityType,
+                                            FindCallback resourceHandler)
         {
             return OCPlatform_impl::Instance().findResource(host, resourceName,
-                   connectivityType, resourceHandler);
+                                    connectivityType, resourceHandler);
         }
 
         OCStackResult findResource(const std::string& host,
-                                                const std::string& resourceName,
-                                                uint8_t connectivityType,
-                                                FindCallback resourceHandler, QualityOfService QoS)
+                                            const std::string& resourceName,
+                                            OCConnectivityType connectivityType,
+                                            FindCallback resourceHandler,
+                                            QualityOfService QoS)
         {
-            return OCPlatform_impl::Instance().findResource(host, resourceName, connectivityType,
-                                                resourceHandler, QoS);
+            return OCPlatform_impl::Instance().findResource(host, resourceName,
+                                    connectivityType, resourceHandler, QoS);
         }
 
         OCStackResult getDeviceInfo(const std::string& host,
-                                                const std::string& deviceURI,
-                                                uint8_t connectivityType,
-                                                FindDeviceCallback deviceInfoHandler)
+                                            const std::string& deviceURI,
+                                            OCConnectivityType connectivityType,
+                                            FindDeviceCallback deviceInfoHandler)
         {
             return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI,
                    connectivityType, deviceInfoHandler);
         }
 
         OCStackResult getDeviceInfo(const std::string& host,
-                                                const std::string& deviceURI,
-                                                uint8_t connectivityType,
-                                                FindDeviceCallback deviceInfoHandler,
-                                                QualityOfService QoS)
+                                            const std::string& deviceURI,
+                                            OCConnectivityType connectivityType,
+                                            FindDeviceCallback deviceInfoHandler,
+                                            QualityOfService QoS)
         {
             return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, connectivityType,
                     deviceInfoHandler, QoS);
         }
-#else
-        OCResource::Ptr constructResourceObject(const std::string& host,
-                                                const std::string& uri,
-                                                bool isObservable,
-                                                const std::vector<std::string>& resourceTypes,
-                                                const std::vector<std::string>& interfaces)
-        {
-            return OCPlatform_impl::Instance().constructResourceObject(host, uri, isObservable,
-                                                resourceTypes, interfaces);
-        }
 
-        OCStackResult findResource(const std::string& host,
-                                                const std::string& resourceName,
-                                                FindCallback resourceHandler)
-        {
-            return OCPlatform_impl::Instance().findResource(host, resourceName, resourceHandler);
-        }
-
-        OCStackResult findResource(const std::string& host,
-                                                const std::string& resourceName,
-                                                FindCallback resourceHandler, QualityOfService QoS)
-        {
-            return OCPlatform_impl::Instance().findResource(host, resourceName,
-                                                resourceHandler, QoS);
-        }
-
-        OCStackResult getDeviceInfo(const std::string& host,
-                                                const std::string& deviceURI,
-                                                FindDeviceCallback deviceInfoHandler)
+        OCStackResult getPlatformInfo(const std::string& host,
+                                                const std::string& platformURI,
+                                                OCConnectivityType connectivityType,
+                                                FindPlatformCallback platformInfoHandler)
         {
-            return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI, deviceInfoHandler);
+            return OCPlatform_impl::Instance().getPlatformInfo(host, platformURI,
+                   connectivityType, platformInfoHandler);
         }
 
-        OCStackResult getDeviceInfo(const std::string& host,
-                                                const std::string& deviceURI,
-                                                FindDeviceCallback deviceInfoHandler,
+        OCStackResult getPlatformInfo(const std::string& host,
+                                                const std::string& platformURI,
+                                                OCConnectivityType connectivityType,
+                                                FindPlatformCallback platformInfoHandler,
                                                 QualityOfService QoS)
         {
-            return OCPlatform_impl::Instance().getDeviceInfo(host, deviceURI,
-                    deviceInfoHandler, QoS);
+            return OCPlatform_impl::Instance().getPlatformInfo(host, platformURI, connectivityType,
+                    platformInfoHandler, QoS);
         }
-#endif
 
         OCStackResult registerResource(OCResourceHandle& resourceHandle,
                                                 std::string& resourceURI,
@@ -184,6 +163,11 @@ namespace OC
             return OCPlatform_impl::Instance().registerDeviceInfo(deviceInfo);
         }
 
+        OCStackResult registerPlatformInfo(const OCPlatformInfo platformInfo)
+        {
+            return OCPlatform_impl::Instance().registerPlatformInfo(platformInfo);
+        }
+
         OCStackResult unregisterResource(const OCResourceHandle& resourceHandle)
         {
             return OCPlatform_impl::Instance().unregisterResource(resourceHandle);
@@ -238,10 +222,9 @@ namespace OC
             return OCPlatform_impl::Instance().stopPresence();
         }
 
-#ifdef CA_INT
         OCStackResult subscribePresence(OCPresenceHandle& presenceHandle,
                                                 const std::string& host,
-                                                uint8_t connectivityType,
+                                                OCConnectivityType connectivityType,
                                                 SubscribeCallback presenceHandler)
         {
             return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host,
@@ -251,30 +234,13 @@ namespace OC
         OCStackResult subscribePresence(OCPresenceHandle& presenceHandle,
                                                 const std::string& host,
                                                 const std::string& resourceType,
-                                                uint8_t connectivityType,
+                                                OCConnectivityType connectivityType,
                                                 SubscribeCallback presenceHandler)
         {
             return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host,
                                                 resourceType, connectivityType, presenceHandler);
         }
-#else
-        OCStackResult subscribePresence(OCPresenceHandle& presenceHandle,
-                                                const std::string& host,
-                                                SubscribeCallback presenceHandler)
-        {
-            return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host,
-                                                presenceHandler);
-        }
 
-        OCStackResult subscribePresence(OCPresenceHandle& presenceHandle,
-                                                const std::string& host,
-                                                const std::string& resourceType,
-                                                SubscribeCallback presenceHandler)
-        {
-            return OCPlatform_impl::Instance().subscribePresence(presenceHandle, host,
-                                                resourceType, presenceHandler);
-        }
-#endif
         OCStackResult unsubscribePresence(OCPresenceHandle presenceHandle)
         {
             return OCPlatform_impl::Instance().unsubscribePresence(presenceHandle);
@@ -286,3 +252,4 @@ namespace OC
         }
     } // namespace OCPlatform
 } //namespace OC
+