/** coap + rfcomm */
OC_COAP_RFCOMM = (1 << 6),
#endif
+#ifdef LE_ADAPTER
+ /** coap + gatt */
+ OC_COAP_GATT = (1 << 7),
+#endif
+#ifdef NFC_ADAPTER
+ /** coap + nfc */
+ OC_COAP_NFC = (1 << 8),
+#endif
+#ifdef RA_ADAPTER
+ /** coap + remote_access */
+ OC_COAP_RA = (1 << 9),
+#endif
/** Allow all endpoint.*/
OC_ALL = 0xffff
} OCTpsSchemeFlags;
*out = (OCTpsSchemeFlags)(*out | OC_COAP_RFCOMM);
}
#endif
+#ifdef LE_ADAPTER
+ if ((givenFlags & OC_COAP_GATT) && (SelectedNetwork & CA_ADAPTER_GATT_BTLE))
+ {
+ *out = (OCTpsSchemeFlags)(*out | OC_COAP_GATT);
+ }
+#endif
+#ifdef NFC_ADAPTER
+ if ((givenFlags & OC_COAP_NFC) && (SelectedNetwork & CA_ADAPTER_NFC))
+ {
+ *out = (OCTpsSchemeFlags)(*out | OC_COAP_NFC);
+ }
+#endif
+#ifdef RA_ADAPTER
+ if ((givenFlags & OC_COAP_RA) && (SelectedNetwork & CA_ADAPTER_REMOTE_ACCESS))
+ {
+ *out = (OCTpsSchemeFlags)(*out | OC_COAP_RA);
+ }
+#endif
return OC_STACK_OK;
}
#endif
#ifdef EDR_ADAPTER
// OC_COAP_RFCOMM
- if ((adapter & OC_ADAPTER_RFCOMM_BTEDR) && (flags == OC_DEFAULT_FLAGS))
+ if (adapter & OC_ADAPTER_RFCOMM_BTEDR)
{
// typecasting to support C90(arduino)
*out = (OCTpsSchemeFlags)(*out | OC_COAP_RFCOMM);
}
#endif
-
+#ifdef LE_ADAPTER
+ // OC_COAP_GATT
+ if (adapter & CA_ADAPTER_GATT_BTLE)
+ {
+ // typecasting to support C90(arduino)
+ *out = (OCTpsSchemeFlags)(*out | OC_COAP_GATT);
+ }
+#endif
+#ifdef NFC_ADAPTER
+ // OC_COAP_NFC
+ if (adapter & CA_ADAPTER_NFC)
+ {
+ // typecasting to support C90(arduino)
+ *out = (OCTpsSchemeFlags)(*out | OC_COAP_NFC);
+ }
+#endif
+#ifdef RA_ADAPTER
+ // OC_COAP_RA
+ if (adapter & CA_ADAPTER_REMOTE_ACCESS)
+ {
+ // typecasting to support C90(arduino)
+ *out = (OCTpsSchemeFlags)(*out | OC_COAP_RA);
+ }
+#endif
return OC_STACK_OK;
}
ret = (OCTpsSchemeFlags)(ret | OC_COAP_RFCOMM);
}
#endif
-
+#ifdef LE_ADAPTER
+ if (SelectedNetwork & CA_ADAPTER_GATT_BTLE)
+ {
+ ret = (OCTpsSchemeFlags)(ret | OC_COAP_GATT);
+ }
+#endif
+#ifdef NFC_ADAPTER
+ if (SelectedNetwork & CA_ADAPTER_NFC)
+ {
+ ret = (OCTpsSchemeFlags)(ret | OC_COAP_NFC);
+ }
+#endif
+#ifdef RA_ADAPTER
+ if (SelectedNetwork & CA_ADAPTER_REMOTE_ACCESS)
+ {
+ ret = (OCTpsSchemeFlags)(ret | OC_COAP_RA);
+ }
+#endif
return ret;
}
\ No newline at end of file
}
fp = ps->open(OC_INTROSPECTION_FILE_NAME, "rb");
- if (fp)\r
- {\r
- size_t bytesRead = 0;\r
- do\r
- {\r
- bytesRead = ps->read(buffer, 1, INTROSPECTION_FILE_SIZE_BLOCK, fp);\r
- size += bytesRead;\r
- } while (bytesRead);\r
- ps->close(fp);\r
+ if (fp)
+ {
+ size_t bytesRead = 0;
+ do
+ {
+ bytesRead = ps->read(buffer, 1, INTROSPECTION_FILE_SIZE_BLOCK, fp);
+ size += bytesRead;
+ } while (bytesRead);
+ ps->close(fp);
}
return size;
}
CAEndpoint_t *networkInfo,
uint32_t infoSize)
{
- if (!resourcePtr || !payload || !networkInfo)
+ if (!resourcePtr || !payload)
{
return OC_STACK_INVALID_PARAM;
}
uint32_t infoSize = 0;
CAResult_t caResult = CAGetNetworkInformation(&networkInfo, &infoSize);
- if (CA_STATUS_OK != caResult || !networkInfo || infoSize == 0)
+ if (CA_STATUS_FAILED == caResult)
{
OIC_LOG(ERROR, TAG, "CAGetNetworkInformation has error on parsing network infomation");
return OC_STACK_ERROR;
#ifdef EDR_ADAPTER
validTps = (OCTpsSchemeFlags)(validTps | OC_COAP_RFCOMM);
#endif
+#ifdef LE_ADAPTER
+ validTps = (OCTpsSchemeFlags)(validTps | OC_COAP_GATT);
+#endif
+#ifdef NFC_ADAPTER
+ validTps = (OCTpsSchemeFlags)(validTps | OC_COAP_NFC);
+#endif
+#ifdef RA_ADAPTER
+ validTps = (OCTpsSchemeFlags)(validTps | OC_COAP_RA);
+#endif
if ((resourceTpsTypes < OC_COAP) || ((resourceTpsTypes != OC_ALL) &&
(resourceTpsTypes > validTps)))