Merge pull request ARMmbed#62 from ARMmbed/coap_separation

Modifying Makefile and source file based on new coap library
artokin · Feb 15, 2017 · 5a5c0f9 · 5a5c0f9
2 parents e125164 + 0d26c00
commit 5a5c0f9
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -24,8 +24,9 @@ override CFLAGS += -I$(SERVLIB_DIR)/libService/
 NANOSTACK_DIR := ../nanostack
 override CFLAGS += -I$(NANOSTACK_DIR)/nanostack/
 
-NSDLC_DIR := ../nsdl-c
-override CFLAGS += -I$(NSDLC_DIR)/nsdl-c
+COAP_DIR := ../mbed-coap
+override CFLAGS += -I$(COAP_DIR)/
+
 
 EVENTLOOP_DIR := ../event-loop
 override CFLAGS += -I$(EVENTLOOP_DIR)/nanostack-event-loop/

diff --git a/coap-service/coap_service_api.h b/coap-service/coap_service_api.h
@@ -26,7 +26,7 @@ extern "C" {
 #include <string.h>
 
 #include "ns_types.h"
-#include "sn_coap_header.h"
+#include "mbed-coap/sn_coap_header.h"
 #include "ns_address.h"
 
 /**

diff --git a/source/coap_message_handler.c b/source/coap_message_handler.c
@@ -6,7 +6,7 @@
 #include "nsdynmemLIB.h"
 #include "coap_service_api_internal.h"
 #include "coap_message_handler.h"
-#include "sn_coap_protocol.h"
+#include "mbed-coap/sn_coap_protocol.h"
 #include "socket_api.h"
 #include "ns_types.h"
 #include "ns_list.h"

diff --git a/source/coap_service_api.c b/source/coap_service_api.c
@@ -10,8 +10,7 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "sn_nsdl.h"
-#include "sn_coap_header.h"
+#include "mbed-coap/sn_coap_header.h"
 #include "coap_service_api.h"
 #include "coap_message_handler.h"
 #include "eventOS_event.h"

diff --git a/source/include/coap_message_handler.h b/source/include/coap_message_handler.h
@@ -20,8 +20,7 @@
 #define __COAP_MESSAGE_HANDLER_H__
 
 #include <inttypes.h>
-#include "sn_coap_header.h"
-#include "sn_nsdl.h"
+#include "mbed-coap/sn_coap_header.h"
 #include "ns_list.h"
 
 #define TRANSACTION_LIFETIME 180

diff --git a/test/coap-service/unittest/makefile_defines.txt b/test/coap-service/unittest/makefile_defines.txt
@@ -15,15 +15,16 @@ INCLUDE_DIRS =\
   ../../../../yotta_modules/nanostack-randlib/mbed-client-randlib/ \
   ../../../../yotta_modules/nanostack-libservice/ \
   ../../../../yotta_modules/nanostack-libservice/mbed-client-libservice/ \
-  ../../../../yotta_modules/mbed-client-c/nsdl-c/ \
-  ../../../../yotta_modules/mbed-client-c/source/libCoap/src/include/ \
+  ../../../../yotta_modules/mbed-coap/ \
+  ../../../../yotta_modules/mbed-coap/source/include/ \
   ../../../../yotta_modules/sal-stack-nanostack-eventloop/nanostack-event-loop/ \
   ../../../../yotta_modules/sal-stack-nanostack-eventloop/source/ \
   ../../../../yotta_modules/mbed-trace/ \
   ../../../../../nanostack/nanostack/\
   ../../../../../libService/libService/\
-  ../../../../../nsdl-c/nsdl-c/\
-  ../../../../../nsdl-c/source/libCoap/src/include/\
+  ../../../../../mbed-coap/\
+  ../../../../../mbed-coap/mbed-coap\
+  ../../../../../mbed-coap/source/include/\
   ../../../../../event-loop/nanostack-event-loop/\
   ../../../../../event-loop/source/ \
   ../../../../../mbedtls/include/ \

diff --git a/test/coap-service/unittest/stub/coap_service_api_stub.c b/test/coap-service/unittest/stub/coap_service_api_stub.c
@@ -8,7 +8,6 @@
 #include "ns_list.h"
 #include "ns_trace.h"
 #include "nsdynmemLIB.h"
-#include "sn_nsdl.h"
 #include "sn_coap_header.h"
 #include "coap_service_api.h"
 #include "coap_message_handler.h"

diff --git a/test/coap-service/unittest/stub/sn_coap_parser_stub.c b/test/coap-service/unittest/stub/sn_coap_parser_stub.c
@@ -12,7 +12,6 @@
  */
 
 #include "ns_types.h"
-#include "sn_nsdl.h"
 #include "sn_coap_protocol.h"
 #include "sn_coap_parser_stub.h"
 

diff --git a/test/coap-service/unittest/stub/sn_coap_protocol_stub.c b/test/coap-service/unittest/stub/sn_coap_protocol_stub.c
@@ -11,7 +11,6 @@
 #endif
 
 #include "ns_types.h"
-#include "sn_nsdl.h"
 #include "sn_coap_protocol.h"
 #include "sn_coap_header_internal.h"
 #include "sn_coap_protocol_internal.h"