Revision 18:198e9b0acf11, committed 2016-11-17

Comitter:

JMF

Date:

Thu Nov 17 16:13:29 2016 +0000

Parent:

17:5a414a5724db

Child:

19:6bc40ac8b054

Commit message:

Updates to mbed os resulted in mutex.h going away and rtos.h needed to be used; This fixes the Mutex typedef failure. Also cast data buffers from 'char *' to (const std::uint8_t*) to conform with Fred's changes in WncController

Changed in this revision

diff -r 5a414a5724db -r 198e9b0acf11 Socket/TCPSocketConnection.cpp
--- a/Socket/TCPSocketConnection.cpp	Thu Nov 17 15:49:40 2016 +0000
+++ b/Socket/TCPSocketConnection.cpp	Thu Nov 17 16:13:29 2016 +0000
@@ -65,7 +65,7 @@
  
     if( s == WncController_fk::WncController::WNC_ON ) {
       M_LOCK;
-      if( WNCInterface::_pwnc->write(0, data, length) )
+      if( WNCInterface::_pwnc->write(0, (const std::uint8_t*)data, length) )
         ret = length;
       M_ULOCK;
       }

diff -r 5a414a5724db -r 198e9b0acf11 Socket/UDPSocket.cpp
--- a/Socket/UDPSocket.cpp	Thu Nov 17 15:49:40 2016 +0000
+++ b/Socket/UDPSocket.cpp	Thu Nov 17 16:13:29 2016 +0000
@@ -53,7 +53,7 @@
     CHK_WNCFE(( WNCInterface::_pwnc->getWncStatus() == FATAL_FLAG ), fail);
     if( remote._epAddr.port ) {  //make sure the Endpoint has an port assoicated with it
         if( Socket::connect(remote._epAddr.IP,SOCK_DGRAM,remote._epAddr.port) ) {
-            if( WNCInterface::_pwnc->write(0,packet,length) )
+            if( WNCInterface::_pwnc->write(0,(const std::uint8_t*)packet,length) )
                 ret = length;
             close();
         }

diff -r 5a414a5724db -r 198e9b0acf11 WNCInterface.h
--- a/WNCInterface.h	Thu Nov 17 15:49:40 2016 +0000
+++ b/WNCInterface.h	Thu Nov 17 16:13:29 2016 +0000
@@ -26,7 +26,7 @@
 #include <stddef.h>
 #include "WncControllerK64F/WncControllerK64F.h"
 #include "WncControllerK64F/WncController/WncController.h"
-#include <Mutex.h>
+#include <rtos.h>
 
 #ifndef _WNCINTERFACE_H_
 #define _WNCINTERFACE_H_