X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Finclude%2Finternal%2Focresource.h;h=091381fdc0217528da0d7cc793cdfdeaf3b548d1;hb=8229635f6d207516ccbbdf23b13be164e0fc1787;hp=2113320bf77819a065262a4c361abff093bd8c24;hpb=45c364268c4f5d575d98f4cd88b571b536c6cb17;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/stack/include/internal/ocresource.h b/resource/csdk/stack/include/internal/ocresource.h index 2113320..091381f 100755 --- a/resource/csdk/stack/include/internal/ocresource.h +++ b/resource/csdk/stack/include/internal/ocresource.h @@ -61,19 +61,6 @@ typedef struct PRESENCERESOURCE{ struct rsrc_t; /** - * Typedefs for stack interface - * IF here stands for Interface - */ - -typedef enum { - STACK_IF_DEFAULT = 0, - STACK_IF_LL, - STACK_IF_BATCH, - STACK_IF_GROUP, - STACK_IF_INVALID -} OCStackIfTypes; - -/** * following structure will be created in occollection. */ @@ -155,10 +142,10 @@ typedef struct attr_t { /** The name of the attribute; used to look up the attribute in list. * for a given attribute SHOULD not be changed once assigned. */ - const char *attrName; + char *attrName; - /** value of the attribute as string.*/ - char *attrValue; + /** value of the attribute as void. To support both string and @OCStringLL value*/ + void *attrValue; } OCAttribute; /** @@ -240,6 +227,17 @@ typedef struct OCResource { /** Pointer of ActionSet which to support group action.*/ OCActionSet *actionsetHead; + + /** The instance identifier for this web link in an array of web links - used in links. */ + union + { + /** An ordinal number that is not repeated - must be unique in the collection context. */ + int64_t ins; + /** Any unique string including a URI. */ + char *uniqueStr; + /** Use UUID for universal uniqueness - used in /oic/res to identify the device. */ + OCIdentity uniqueUUID; + }; } OCResource;