Change Resource type (x.samsung.firmware -> oic.r.firmware)

Change-Id: I51060f8b750511b123b1a899b144fb59c425cf7e

diff --git a/inc/fmwup_resource_internal.h b/inc/fmwup_resource_internal.h
index 3d34f2e2670721f3a35002f78022623d622c4f2f..df0b21419696e3a515286a6f5771835cda8a0557 100644 (file)
--- a/inc/fmwup_resource_internal.h
+++ b/inc/fmwup_resource_internal.h
@@ -19,7 +19,11 @@
 #include "fmwup_resource.h"
 
 #define OC_RSRVD_FIRMWARE_URI          "/firmware"
+#ifdef _USE_WWST_
+#define OC_RSRVD_FIRMWARE_RES_TYPE                     "oic.r.firmware"
+#else
 #define OC_RSRVD_FIRMWARE_RES_TYPE                     "x.samsung.firmware"
+#endif
 
 #define OC_RSRVD_FIRMWARE_STATE                                "state"
 #define OC_RSRVD_FIRMWARE_RESULT                       "result"

diff --git a/src/fmwup_resource.c b/src/fmwup_resource.c
index eb02617582b698b93d315f44a6c59efd5804eb45..496de1749b77f7deba02c684c918c0aeb4d8ef26 100644 (file)
--- a/src/fmwup_resource.c
+++ b/src/fmwup_resource.c
@@ -17,7 +17,7 @@ int fmwup_create_firmware_resource(OCResourceHandle *firmware_res_h)
        fmwup_s *tmp_firmware_res = NULL;
        OCResourceHandle oc_handle = NULL;
 
-       if (OCCreateResource(&oc_handle, "x.samsung.firmware",
+       if (OCCreateResource(&oc_handle, OC_RSRVD_FIRMWARE_RES_TYPE,
                                                OC_RSRVD_INTERFACE_DEFAULT, "/firmware",  /* OC_RSRVD_INTERFACE_DEFAULT : "oic.if.baseline" */
                                                fmwup_handle_firmware_entity, NULL,
                                                OC_DISCOVERABLE | OC_OBSERVABLE) != OC_STACK_OK) {

diff --git a/src/fmwup_resource_internal.c b/src/fmwup_resource_internal.c
index f5234a8f65b9ffa8d008311de29913d29901d7f5..e8895181a6af2751eaa800054d0e312c782de1ae 100644 (file)
--- a/src/fmwup_resource_internal.c
+++ b/src/fmwup_resource_internal.c
@@ -562,6 +562,7 @@ void fmwup_get_firmware_info(fmwup_s *firmware_info)
        firmware_info->manufacturer = g_strdup(manufacturer);
        firmware_info->model_name = g_strdup(model_name);
 
+       firmware_info->active_check = false;
 
        g_free(manufacturer);
        g_free(model_name);