Merge branch 'pr-141'

Author: alranel

src/utility/HCI.cpp

@@ -420,7 +420,7 @@ int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxIn
   return sendCommand(OGF_LE_CTL << 10 | OCF_LE_CONN_UPDATE, sizeof(leConnUpdateData), &leConnUpdateData);
 }
 
-int HCIClass::sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data)
+int HCIClass::sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, const void* data)
 {
   while (_pendingPkt >= _maxPkt) {
     poll();
@@ -434,7 +434,7 @@ int HCIClass::sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data)
     uint16_t cid;
   } aclHdr = { HCI_ACLDATA_PKT, handle, uint8_t(plen + 4), plen, cid };
 
-  uint8_t txBuffer[sizeof(aclHdr) + plen];
+  uint8_t* txBuffer = (uint8_t*)malloc(sizeof(aclHdr) + plen);
   memcpy(txBuffer, &aclHdr, sizeof(aclHdr));
   memcpy(&txBuffer[sizeof(aclHdr)], data, plen);
 
@@ -444,7 +444,8 @@ int HCIClass::sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data)
 
   _pendingPkt++;
   HCITransport.write(txBuffer, sizeof(aclHdr) + plen);
-
+  free(txBuffer);
+  
   return 0;
 }
 
@@ -468,15 +469,15 @@ void HCIClass::noDebug()
   _debug = NULL;
 }
 
-int HCIClass::sendCommand(uint16_t opcode, uint8_t plen, void* parameters)
+int HCIClass::sendCommand(uint16_t opcode, uint8_t plen, const void* parameters)
 {
   struct __attribute__ ((packed)) {
     uint8_t pktType;
     uint16_t opcode;
     uint8_t plen;
   } pktHdr = {HCI_COMMAND_PKT, opcode, plen};
 
-  uint8_t txBuffer[sizeof(pktHdr) + plen];
+  uint8_t* txBuffer = (uint8_t*)malloc(sizeof(pktHdr) + plen);
   memcpy(txBuffer, &pktHdr, sizeof(pktHdr));
   memcpy(&txBuffer[sizeof(pktHdr)], parameters, plen);
 
@@ -493,6 +494,8 @@ int HCIClass::sendCommand(uint16_t opcode, uint8_t plen, void* parameters)
     poll();
   }
 
+  free(txBuffer);
+
   return _cmdCompleteStatus;
 }
 

src/utility/HCI.h

@@ -64,15 +64,15 @@ class HCIClass {
   virtual int leCancelConn();
 
 
-  virtual int sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data);
+  virtual int sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, const void* data);
 
   virtual int disconnect(uint16_t handle);
 
   virtual void debug(Stream& stream);
   virtual void noDebug();
 
 private:
-  virtual int sendCommand(uint16_t opcode, uint8_t plen = 0, void* parameters = NULL);
+  virtual int sendCommand(uint16_t opcode, uint8_t plen = 0, const void* parameters = nullptr);
 
   virtual void handleAclDataPkt(uint8_t plen, uint8_t pdata[]);
   virtual void handleNumCompPkts(uint16_t handle, uint16_t numPkts);