Merge pull request #3500 from kuggenhoffen/update-mbed-client-c-3.0.4

Update mbed-client-c version 3.0.4

Author: 0xc0170

features/FEATURE_COMMON_PAL/mbed-client-c/CHANGELOG.md

@@ -0,0 +1,45 @@
+#
+# Makefile for combined NSDL+COAP library
+#
+
+# Define compiler toolchain with CC or PLATFORM variables
+# Example (GCC toolchains, default $CC and $AR are used)
+# make
+#
+# OR (Cross-compile GCC toolchain)
+# make PLATFORM=arm-linux-gnueabi-
+#
+# OR (armcc/Keil)
+# make CC=armcc AR=ArmAR
+#
+# OR (IAR-ARM)
+# make CC=iccarm
+
+LIB = libnsdl.a
+SRCS := \
+	source/libNsdl/src/sn_grs.c \
+	source/libNsdl/src/sn_nsdl.c \
+	source/libCoap/src/sn_coap_protocol.c \
+	source/libCoap/src/sn_coap_parser.c \
+	source/libCoap/src/sn_coap_header_check.c \
+	source/libCoap/src/sn_coap_builder.c \
+
+override CFLAGS += -DVERSION='"$(VERSION)"'
+
+override CFLAGS += -Isource/libNsdl/src/include/
+override CFLAGS += -Isource/libCoap/src/include/
+SERVLIB_DIR := ../libService
+override CFLAGS += -I$(SERVLIB_DIR)/libService
+override CFLAGS += -Insdl-c/
+
+include ../libService/toolchain_rules.mk
+
+$(eval $(call generate_rules,$(LIB),$(SRCS)))
+
+.PHONY: release
+release:
+	7z a nsdl-c_$(VERSION).zip *.a *.lib include
+
+.PHONY: deploy_to
+deploy_to: all
+	tar --transform 's,^,nsdl-c/,' --append -f $(TO) *.a nsdl-c

features/FEATURE_COMMON_PAL/mbed-client-c/Makefile

@@ -1,6 +1,6 @@
 {
   "name": "mbed-client-c",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Nanostack NSDL and COAP library",
   "keywords": [
     "coap",
@@ -14,7 +14,8 @@
   ],
   "dependencies": {
     "nanostack-libservice": "^3.0.0",
-    "mbed-trace": ">=0.2.0,<2.0.0"
+    "mbed-trace": ">=0.2.0,<2.0.0",
+    "nanostack-randlib": "^1.2.0"
   },
   "targetDependencies": {}
 }

features/FEATURE_COMMON_PAL/mbed-client-c/module.json

@@ -25,6 +25,12 @@
 #ifndef SN_NSDL_LIB_H_
 #define SN_NSDL_LIB_H_
 
+#ifdef MBED_CLIENT_C_NEW_API
+
+#include "nsdl-c/sn_nsdl_lib2.h"
+
+#else
+
 #include "ns_list.h"
 
 #ifdef __cplusplus
@@ -723,8 +729,40 @@ extern int8_t sn_nsdl_set_block_size(struct nsdl_s *handle, uint16_t block_size)
  */
 extern int8_t sn_nsdl_set_duplicate_buffer_size(struct nsdl_s *handle, uint8_t message_count);
 
+/**
+ * \fn void *sn_nsdl_set_context(const struct nsdl_s *handle, void *context)
+ *
+ * \brief Set the application defined context parameter for given handle.
+ *        This is useful for example when interfacing with c++ objects where a
+ *        pointer to object is set as the context, and in the callback functions
+ *        the context pointer can be used to call methods for the correct instance
+ *        of the c++ object.
+ *
+ * \param *handle Pointer to library handle
+ * \param *context Pointer to the application defined context
+ * \return 0 = success, -1 = failure
+ */
+extern int8_t sn_nsdl_set_context(struct nsdl_s * const handle, void * const context);
+
+/**
+ * \fn void *sn_nsdl_get_context(const struct nsdl_s *handle)
+ *
+ * \brief Get the application defined context parameter for given handle.
+ *        This is useful for example when interfacing with c++ objects where a
+ *        pointer to object is set as the context, and in the callback functions
+ *        the context pointer can be used to call methods for the correct instance
+ *        of the c++ object.
+ *
+ * \param *handle Pointer to library handle
+ * \return Pointer to the application defined context
+ */
+extern void *sn_nsdl_get_context(const struct nsdl_s * const handle);
+
 #ifdef __cplusplus
 }
 #endif
 
+#endif /* MBED_CLIENT_C_NEW_API */
+
+
 #endif /* SN_NSDL_LIB_H_ */