Update the code based on review

sgbihu · sgbihu · commit bf78754e0773 · 2016-11-07T17:03:51.000+08:00
1. Support valueupdated event
2. Change the balloc/bfree to malloc/free
3. Change return type from BLE_STATUS_T to int
diff --git a/libraries/BLE/src/BLECharacteristic.cpp b/libraries/BLE/src/BLECharacteristic.cpp
@@ -50,13 +50,13 @@ BLECharacteristic::~BLECharacteristic()
 {
     if (_value) 
     {
-        bfree(_value);
+        free(_value);
         _value = NULL;
     }
     
     if (_event_handlers != NULL)
     {
-        bfree(_event_handlers);
+        free(_event_handlers);
         _event_handlers = NULL;
     }
 }
@@ -435,7 +435,7 @@ void BLECharacteristic::setEventHandler(BLECharacteristicEvent event,
     {
         if (_event_handlers == NULL)
         {
-            _event_handlers = (BLECharacteristicEventHandler*)balloc(sizeof(BLECharacteristicEventHandler) * BLECharacteristicEventLast, NULL);
+            _event_handlers = (BLECharacteristicEventHandler*)malloc(sizeof(BLECharacteristicEventHandler) * BLECharacteristicEventLast);
         }
         
         if (_event_handlers != NULL)
@@ -456,7 +456,7 @@ BLECharacteristic::_setValue(const uint8_t value[], uint16_t length)
     if (NULL == _value)
     {
         // Allocate the buffer for characteristic
-        _value = (unsigned char*)balloc(_value_size, NULL);//malloc(_value_size)
+        _value = (unsigned char*)malloc(_value_size);
     }
     if (NULL == _value)
     {
diff --git a/libraries/BLE/src/BLECharacteristicImp.cpp b/libraries/BLE/src/BLECharacteristicImp.cpp
@@ -43,10 +43,10 @@ BLECharacteristicImp::BLECharacteristicImp(const bt_uuid_t* uuid,
     _ble_device()
 {
     _value_size = BLE_MAX_ATTR_DATA_LEN;// Set as MAX value. TODO: long read/write need to twist
-    _value = (unsigned char*)balloc(_value_size, NULL);
+    _value = (unsigned char*)malloc(_value_size);
     if (_value_size > BLE_MAX_ATTR_DATA_LEN)
     {
-        _value_buffer = (unsigned char*)balloc(_value_size, NULL);
+        _value_buffer = (unsigned char*)malloc(_value_size);
     }
     
     memset(_value, 0, _value_size);
@@ -107,10 +107,10 @@ BLECharacteristicImp::BLECharacteristicImp(BLECharacteristic& characteristic,
 {
     unsigned char properties = characteristic._properties;
     _value_size = characteristic._value_size;
-    _value = (unsigned char*)balloc(_value_size, NULL);
+    _value = (unsigned char*)malloc(_value_size);
     if (_value_size > BLE_MAX_ATTR_DATA_LEN)
     {
-        _value_buffer = (unsigned char*)balloc(_value_size, NULL);
+        _value_buffer = (unsigned char*)malloc(_value_size);
     }
     
     memset(&_ccc_cfg, 0, sizeof(_ccc_cfg));
@@ -173,12 +173,12 @@ BLECharacteristicImp::~BLECharacteristicImp()
 {
     releaseDescriptors();
     if (_value) {
-        bfree(_value);
+        free(_value);
         _value = NULL;
     }
     if (_value_buffer)
     {
-        bfree(_value_buffer);
+        free(_value_buffer);
         _value_buffer = NULL;
     }
 }
@@ -245,12 +245,26 @@ bool
 BLECharacteristicImp::setValue(const unsigned char value[], uint16_t length)
 {
     _setValue(value, length, 0);
-    // Read response/Notification/Indication for GATT client
-    // Write request for GATT server
-    if (_event_handlers[BLEWritten]) 
+    if (BLEUtils::isLocalBLE(_ble_device) == true)
     {
-        BLECharacteristic chrcTmp(this, &_ble_device);
-        _event_handlers[BLEWritten](_ble_device, chrcTmp);
+        // GATT server
+        // Write request for GATT server
+        if (_event_handlers[BLEWritten]) 
+        {
+            BLECharacteristic chrcTmp(this, &_ble_device);
+            _event_handlers[BLEWritten](_ble_device, chrcTmp);
+        }
+    }
+    else
+    {
+        // GATT client
+        // Discovered attribute
+        // Read response/Notification/Indication for GATT client
+        if (_event_handlers[BLEValueUpdated]) 
+        {
+            BLECharacteristic chrcTmp(this, &_ble_device);
+            _event_handlers[BLEValueUpdated](_ble_device, chrcTmp);
+        }
     }
     
     return true;
diff --git a/libraries/BLE/src/BLEDescriptor.cpp b/libraries/BLE/src/BLEDescriptor.cpp
@@ -40,7 +40,7 @@ BLEDescriptor::BLEDescriptor(BLEDescriptorImp* descriptorImp,
     BLEUtils::uuidBT2String(descriptorImp->bt_uuid(), _uuid_cstr);
     
     _value_size = descriptorImp->valueSize();
-    _value = (unsigned char*)balloc(_value_size, NULL);
+    _value = (unsigned char*)malloc(_value_size);
     memcpy(_value, descriptorImp->value(), _value_size);
 }
 
@@ -57,7 +57,7 @@ BLEDescriptor::BLEDescriptor(const char* uuid,
     _bledev.setAddress(*BLEUtils::bleGetLoalAddress());
     
     _value_size = valueLength > BLE_MAX_ATTR_LONGDATA_LEN ? BLE_MAX_ATTR_LONGDATA_LEN : valueLength;
-    _value = (unsigned char*)balloc(_value_size, NULL);
+    _value = (unsigned char*)malloc(_value_size);
     memcpy(_value, value, _value_size);
 }
 
@@ -70,7 +70,7 @@ BLEDescriptor::~BLEDescriptor()
 {
     if (_value)
     {
-        bfree(_value);
+        free(_value);
         _value = NULL;
     }
 }
diff --git a/libraries/BLE/src/BLEDescriptorImp.cpp b/libraries/BLE/src/BLEDescriptorImp.cpp
@@ -32,7 +32,7 @@ BLEDescriptorImp::BLEDescriptorImp(BLEDevice& bledevice,
     
     _properties = descriptor.properties();
     _value_length = descriptor.valueLength();
-    _value = (unsigned char*)balloc(_value_length, NULL);
+    _value = (unsigned char*)malloc(_value_length);
 
     memcpy(_value, descriptor.value(), _value_length);
 }
@@ -46,14 +46,14 @@ BLEDescriptorImp::BLEDescriptorImp(const bt_uuid_t* uuid,
     _properties(properties)
 {
     _value_length = BLE_MAX_ATTR_DATA_LEN;
-    _value = (unsigned char*)balloc(_value_length, NULL);
+    _value = (unsigned char*)malloc(_value_length);
 
     memset(_value, 0, _value_length);
 }
 
 BLEDescriptorImp::~BLEDescriptorImp() {
     if (_value) {
-        bfree(_value);
+        free(_value);
         _value = NULL;
     }
 }
diff --git a/libraries/BLE/src/BLEProfileManager.cpp b/libraries/BLE/src/BLEProfileManager.cpp
@@ -69,7 +69,7 @@ BLEProfileManager::~BLEProfileManager (void)
 {
     if (this->_attr_base)
     {
-        bfree(this->_attr_base);
+        free(this->_attr_base);
     }
     ServiceReadLinkNodePtr node = link_node_get_first(&_read_service_header);
     while (NULL != node)
@@ -246,7 +246,7 @@ int BLEProfileManager::registerProfile(BLEDevice &bledevice)
     
     if (NULL == _attr_base)
     {
-        _attr_base = (bt_gatt_attr_t *)balloc(attr_counter * sizeof(bt_gatt_attr_t), NULL);
+        _attr_base = (bt_gatt_attr_t *)malloc(attr_counter * sizeof(bt_gatt_attr_t));
         memset(_attr_base, 0x00, (attr_counter * sizeof(bt_gatt_attr_t)));
         pr_info(LOG_MODULE_BLE, "_attr_base_-%p, size-%d, attr_counter-%d", _attr_base, sizeof(_attr_base), attr_counter);
         if (NULL == _attr_base)
@@ -259,7 +259,7 @@ int BLEProfileManager::registerProfile(BLEDevice &bledevice)
     {
         if (NULL != _attr_base)
         {
-            bfree(_attr_base);
+            free(_attr_base);
         }
         return err_code;
     }

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ BLECharacteristic::~BLECharacteristic()`
`50`	`50`	`{`
`51`	`51`	`if (_value)`
`52`	`52`	`{`
`53`		`- bfree(_value);`
	`53`	`+ free(_value);`
`54`	`54`	`_value = NULL;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if (_event_handlers != NULL)`
`58`	`58`	`{`
`59`		`- bfree(_event_handlers);`
	`59`	`+ free(_event_handlers);`
`60`	`60`	`_event_handlers = NULL;`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -435,7 +435,7 @@ void BLECharacteristic::setEventHandler(BLECharacteristicEvent event,`
`435`	`435`	`{`
`436`	`436`	`if (_event_handlers == NULL)`
`437`	`437`	`{`
`438`		`- _event_handlers = (BLECharacteristicEventHandler)balloc(sizeof(BLECharacteristicEventHandler) BLECharacteristicEventLast, NULL);`
	`438`	`+ _event_handlers = (BLECharacteristicEventHandler)malloc(sizeof(BLECharacteristicEventHandler) BLECharacteristicEventLast);`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`if (_event_handlers != NULL)`
`@@ -456,7 +456,7 @@ BLECharacteristic::_setValue(const uint8_t value[], uint16_t length)`
`456`	`456`	`if (NULL == _value)`
`457`	`457`	`{`
`458`	`458`	`// Allocate the buffer for characteristic`
`459`		`- _value = (unsigned char*)balloc(_value_size, NULL);//malloc(_value_size)`
	`459`	`+ _value = (unsigned char*)malloc(_value_size);`
`460`	`460`	`}`
`461`	`461`	`if (NULL == _value)`
`462`	`462`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,10 @@ BLECharacteristicImp::BLECharacteristicImp(const bt_uuid_t* uuid,`
`43`	`43`	`_ble_device()`
`44`	`44`	`{`
`45`	`45`	`_value_size = BLE_MAX_ATTR_DATA_LEN;// Set as MAX value. TODO: long read/write need to twist`
`46`		`- _value = (unsigned char*)balloc(_value_size, NULL);`
	`46`	`+ _value = (unsigned char*)malloc(_value_size);`
`47`	`47`	`if (_value_size > BLE_MAX_ATTR_DATA_LEN)`
`48`	`48`	`{`
`49`		`- _value_buffer = (unsigned char*)balloc(_value_size, NULL);`
	`49`	`+ _value_buffer = (unsigned char*)malloc(_value_size);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`memset(_value, 0, _value_size);`
`@@ -107,10 +107,10 @@ BLECharacteristicImp::BLECharacteristicImp(BLECharacteristic& characteristic,`
`107`	`107`	`{`
`108`	`108`	`unsigned char properties = characteristic._properties;`
`109`	`109`	`_value_size = characteristic._value_size;`
`110`		`- _value = (unsigned char*)balloc(_value_size, NULL);`
	`110`	`+ _value = (unsigned char*)malloc(_value_size);`
`111`	`111`	`if (_value_size > BLE_MAX_ATTR_DATA_LEN)`
`112`	`112`	`{`
`113`		`- _value_buffer = (unsigned char*)balloc(_value_size, NULL);`
	`113`	`+ _value_buffer = (unsigned char*)malloc(_value_size);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`memset(&_ccc_cfg, 0, sizeof(_ccc_cfg));`
`@@ -173,12 +173,12 @@ BLECharacteristicImp::~BLECharacteristicImp()`
`173`	`173`	`{`
`174`	`174`	`releaseDescriptors();`
`175`	`175`	`if (_value) {`
`176`		`- bfree(_value);`
	`176`	`+ free(_value);`
`177`	`177`	`_value = NULL;`
`178`	`178`	`}`
`179`	`179`	`if (_value_buffer)`
`180`	`180`	`{`
`181`		`- bfree(_value_buffer);`
	`181`	`+ free(_value_buffer);`
`182`	`182`	`_value_buffer = NULL;`
`183`	`183`	`}`
`184`	`184`	`}`
`@@ -245,12 +245,26 @@ bool`
`245`	`245`	`BLECharacteristicImp::setValue(const unsigned char value[], uint16_t length)`
`246`	`246`	`{`
`247`	`247`	`_setValue(value, length, 0);`
`248`		`- // Read response/Notification/Indication for GATT client`
`249`		`- // Write request for GATT server`
`250`		`- if (_event_handlers[BLEWritten])`
	`248`	`+ if (BLEUtils::isLocalBLE(_ble_device) == true)`
`251`	`249`	`{`
`252`		`- BLECharacteristic chrcTmp(this, &_ble_device);`
`253`		`- _event_handlers[BLEWritten](_ble_device, chrcTmp);`
	`250`	`+ // GATT server`
	`251`	`+ // Write request for GATT server`
	`252`	`+ if (_event_handlers[BLEWritten])`
	`253`	`+ {`
	`254`	`+ BLECharacteristic chrcTmp(this, &_ble_device);`
	`255`	`+ _event_handlers[BLEWritten](_ble_device, chrcTmp);`
	`256`	`+ }`
	`257`	`+ }`
	`258`	`+ else`
	`259`	`+ {`
	`260`	`+ // GATT client`
	`261`	`+ // Discovered attribute`
	`262`	`+ // Read response/Notification/Indication for GATT client`
	`263`	`+ if (_event_handlers[BLEValueUpdated])`
	`264`	`+ {`
	`265`	`+ BLECharacteristic chrcTmp(this, &_ble_device);`
	`266`	`+ _event_handlers[BLEValueUpdated](_ble_device, chrcTmp);`
	`267`	`+ }`
`254`	`268`	`}`
`255`	`269`
`256`	`270`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ BLEDescriptor::BLEDescriptor(BLEDescriptorImp* descriptorImp,`
`40`	`40`	`BLEUtils::uuidBT2String(descriptorImp->bt_uuid(), _uuid_cstr);`
`41`	`41`
`42`	`42`	`_value_size = descriptorImp->valueSize();`
`43`		`- _value = (unsigned char*)balloc(_value_size, NULL);`
	`43`	`+ _value = (unsigned char*)malloc(_value_size);`
`44`	`44`	`memcpy(_value, descriptorImp->value(), _value_size);`
`45`	`45`	`}`
`46`	`46`
`@@ -57,7 +57,7 @@ BLEDescriptor::BLEDescriptor(const char* uuid,`
`57`	`57`	`_bledev.setAddress(*BLEUtils::bleGetLoalAddress());`
`58`	`58`
`59`	`59`	`_value_size = valueLength > BLE_MAX_ATTR_LONGDATA_LEN ? BLE_MAX_ATTR_LONGDATA_LEN : valueLength;`
`60`		`- _value = (unsigned char*)balloc(_value_size, NULL);`
	`60`	`+ _value = (unsigned char*)malloc(_value_size);`
`61`	`61`	`memcpy(_value, value, _value_size);`
`62`	`62`	`}`
`63`	`63`
`@@ -70,7 +70,7 @@ BLEDescriptor::~BLEDescriptor()`
`70`	`70`	`{`
`71`	`71`	`if (_value)`
`72`	`72`	`{`
`73`		`- bfree(_value);`
	`73`	`+ free(_value);`
`74`	`74`	`_value = NULL;`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ BLEDescriptorImp::BLEDescriptorImp(BLEDevice& bledevice,`
`32`	`32`
`33`	`33`	`_properties = descriptor.properties();`
`34`	`34`	`_value_length = descriptor.valueLength();`
`35`		`- _value = (unsigned char*)balloc(_value_length, NULL);`
	`35`	`+ _value = (unsigned char*)malloc(_value_length);`
`36`	`36`
`37`	`37`	`memcpy(_value, descriptor.value(), _value_length);`
`38`	`38`	`}`
`@@ -46,14 +46,14 @@ BLEDescriptorImp::BLEDescriptorImp(const bt_uuid_t* uuid,`
`46`	`46`	`_properties(properties)`
`47`	`47`	`{`
`48`	`48`	`_value_length = BLE_MAX_ATTR_DATA_LEN;`
`49`		`- _value = (unsigned char*)balloc(_value_length, NULL);`
	`49`	`+ _value = (unsigned char*)malloc(_value_length);`
`50`	`50`
`51`	`51`	`memset(_value, 0, _value_length);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`BLEDescriptorImp::~BLEDescriptorImp() {`
`55`	`55`	`if (_value) {`
`56`		`- bfree(_value);`
	`56`	`+ free(_value);`
`57`	`57`	`_value = NULL;`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ BLEProfileManager::~BLEProfileManager (void)`
`69`	`69`	`{`
`70`	`70`	`if (this->_attr_base)`
`71`	`71`	`{`
`72`		`- bfree(this->_attr_base);`
	`72`	`+ free(this->_attr_base);`
`73`	`73`	`}`
`74`	`74`	`ServiceReadLinkNodePtr node = link_node_get_first(&_read_service_header);`
`75`	`75`	`while (NULL != node)`
`@@ -246,7 +246,7 @@ int BLEProfileManager::registerProfile(BLEDevice &bledevice)`
`246`	`246`
`247`	`247`	`if (NULL == _attr_base)`
`248`	`248`	`{`
`249`		`- _attr_base = (bt_gatt_attr_t )balloc(attr_counter sizeof(bt_gatt_attr_t), NULL);`
	`249`	`+ _attr_base = (bt_gatt_attr_t )malloc(attr_counter sizeof(bt_gatt_attr_t));`
`250`	`250`	`memset(_attr_base, 0x00, (attr_counter * sizeof(bt_gatt_attr_t)));`
`251`	`251`	`pr_info(LOG_MODULE_BLE, "_attr_base_-%p, size-%d, attr_counter-%d", _attr_base, sizeof(_attr_base), attr_counter);`
`252`	`252`	`if (NULL == _attr_base)`
`@@ -259,7 +259,7 @@ int BLEProfileManager::registerProfile(BLEDevice &bledevice)`
`259`	`259`	`{`
`260`	`260`	`if (NULL != _attr_base)`
`261`	`261`	`{`
`262`		`- bfree(_attr_base);`
	`262`	`+ free(_attr_base);`
`263`	`263`	`}`
`264`	`264`	`return err_code;`
`265`	`265`	`}`