modifications to make yotta work

Change-Id: Iff0f837140af1a4c0f8eaa212e7761e52617bf42

Author: ernotormikoski

LICENSE.txt

@@ -0,0 +1,10 @@
+Copyright 2014. ARM Ltd. All rights reserved.
+
+Use of this software is restricted by the terms of ARM's limited use license or permitted 
+sublicense (the "License").  You may not use this software unless you have been expressly granted 
+the right to use it under the License, and in such case you must use this file in compliance with 
+the License.
+
+Unless otherwise expressly provided in the License, this software is provided on an "AS IS" 
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, and may be 
+revoked at any time.

coap-service-nanomesh/coap_server_impl.c

@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include "ns_types.h"
-#include "eventOS_event.h"
-#include "eventOS_scheduler.h"
-#include "eventOS_event_timer.h"
+//#include "eventOS_event.h"
+//#include "eventOS_scheduler.h"
+//#include "eventOS_event_timer.h"
 #include "nsdynmemLIB.h"
 #include "ns_list.h"
 #include "coap_server_impl.h"
@@ -28,12 +28,18 @@ int8_t coap_server_start(void)
 
 static int8_t coap_server_service_tasklet_generated(void)
 {
+	int8_t ret_val;
+
 	if(coap_service_tasklet == -1)
 	{
 		//coap_service_tasklet = eventOS_event_handler_create(&coap_server_service_tasklet,COAP_SERVER_SERVICE_TASKLET_INIT);
+		ret_val = coap_service_tasklet;
 	}
 
-	return coap_service_tasklet;
+	// for unit testing now setted to 1;
+	ret_val = 1;
+
+	return ret_val;
 }
 
 void coap_server_service_tasklet(arm_event_s * event)

module.json

@@ -0,0 +1,29 @@
+{
+  "name": "coap-service",
+  "version": "0.0.1",
+  "description": "CoAP Service library",
+  "keywords": [
+    "coap",
+    "service"
+  ],
+  "author": "Erno Tormikoski <[email protected]>",
+  "repository": {
+    "url": "ssh://git.oulu.arm.com/home/git/repositories/nanomesh/coap-service.git",
+    "type": "git"
+  },
+  "homepage": "http://git.oulu.arm.com/gitweb/?p=nanomesh/coap-service.git;a=summary",
+  "license": "Proprietary, all rights reserved.",
+  "extraIncludes": [
+      "coap-service",
+      "nanostack-event-loop",
+      "source/include"
+  ],
+  "dependencies": {
+    "mbed": "~3.0.1",
+    "mbed-client-libservice": "~2.0.9",
+    "mbed-client": "~0.1.3",
+    "mbed-6lowpan-eventloop": "~0.0.8",
+    "mbed-6lowpan": "~0.0.9"
+  },
+  "targetDependencies": {}
+}

source/coap_server.c

@@ -5,12 +5,11 @@
 //#include "include/coap_service_api.h"
 #include "ns_types.h"
 #include "ns_list.h"
-#include "coap_server.h"
 #include "coap_server_impl.h"
+#include "./include/coap_server.h"
 
-
-typedef NS_LIST_HEAD(coap_service_session_t, link) instance_list_t;
-instance_list_t NS_LIST_NAME_INIT(instance_list);
+//typedef NS_LIST_HEAD(coap_service_session_t, link) instance_list_t;
+//instance_list_t NS_LIST_NAME_INIT(instance_list);
 
 //typedef struct sn_coap_hdr_s sn_coap_hdr_s;
 
@@ -35,7 +34,7 @@ static coap_service_session_t *coap_service_search_from_list(int8_t interface_id
 {
 	coap_service_session_t *this = NULL;
 
-    /*
+	/*
 	ns_list_foreach(coap_service_session_t,cur_ptr, &instance_list)
     {
         if(cur_ptr->interface_id == interface_id)
@@ -53,7 +52,8 @@ static coap_service_session_t *coap_service_search_from_list(int8_t interface_id
 static coap_service_session_t *coap_service_find_by_service(int8_t service_id)
 {
 	coap_service_session_t *this = NULL;
-    /*
+
+	/*
 	ns_list_foreach(coap_service_session_t,cur_ptr, &instance_list)
     {
         if(cur_ptr->coap_service_id == service_id)
@@ -62,7 +62,8 @@ static coap_service_session_t *coap_service_find_by_service(int8_t service_id)
             break;
         }
     }
-    */
+	*/
+
     return this;
 }
 
@@ -79,6 +80,9 @@ int8_t coap_server_service_init(int8_t interface_id, uint16_t listen_port, uint8
 	int retVal = -1;
 	int8_t socketInstance;
 
+	// Initialize linked list
+	//ns_list_init_(instance_list);
+
 	//allocate Socket Service
 	socketInstance  = coap_server_start();
 
@@ -92,7 +96,7 @@ int8_t coap_server_service_init(int8_t interface_id, uint16_t listen_port, uint8
 	    {
 	        this->interface_id = interface_id;
 //	        this->set_response_cb_ptr = NULL;
-//	        ns_list_add_to_start(&instance_list, this);
+	        //ns_list_add_to_start(&instance_list, this);
 	        retVal = 1;
 	    }
 	    return retVal;
@@ -102,7 +106,7 @@ int8_t coap_server_service_init(int8_t interface_id, uint16_t listen_port, uint8
 	}
 	if(socketInstance > 0)
 	{
-		//coap_service_delete(socketInstance);
+		coap_service_delete(socketInstance);
 	}
 	return retVal;
 }