Diff: UUID.cpp

Revision:

34:da2ea8cd6216

Parent:

27:4a83843f04b0

Child:

43:ac154ac74a30

--- a/UUID.cpp	Thu Apr 03 01:45:33 2014 +0100
+++ b/UUID.cpp	Wed May 21 15:01:14 2014 +0100
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-  
+
 
 #include <stdio.h>
 #include <string.h>
@@ -23,7 +23,7 @@
 /**************************************************************************/
 /*!
     @brief  Creates an empty 128-bit UUID
-            
+
     @note   This UUID must be assigned a valid value via the 'update'
             function before it can be safely used!
 */
@@ -38,17 +38,17 @@
 /**************************************************************************/
 /*!
     @brief  Creates a new 128-bit UUID
-            
+
     @note   The UUID is a unique 128-bit (16 byte) ID used to identify
             different service or characteristics on the BLE device.
-            
+
     @note   When creating a UUID, the constructor will check if all bytes
             except bytes 2/3 are equal to 0.  If only bytes 2/3 have a
             value, the UUID will be treated as a short/BLE UUID, and the
             .type field will be set to UUID::UUID_TYPE_SHORT.  If any
             of the bytes outside byte 2/3 have a non-zero value, the UUID
-            will be considered a 128-bit ID, and .type will be assigned 
-            as UUID::UUID_TYPE_LONG. 
+            will be considered a 128-bit ID, and .type will be assigned
+            as UUID::UUID_TYPE_LONG.
 
     @param[in]  uuid_base
                 The 128-bit (16-byte) UUID value.  For 128-bit values,
@@ -65,17 +65,17 @@
     UUID ble_uuid = UUID(shortID);
     // ble_uuid.type  = UUID_TYPE_SHORT
     // ble_uuid.value = 0x180F
-    
+
     // Creeate a long UUID
     uint8_t longID[16] = { 0x00, 0x11, 0x22, 0x33,
-                           0x44, 0x55, 0x66, 0x77, 
-                           0x88, 0x99, 0xAA, 0xBB, 
+                           0x44, 0x55, 0x66, 0x77,
+                           0x88, 0x99, 0xAA, 0xBB,
                            0xCC, 0xDD, 0xEE, 0xFF };
     UUID custom_uuid = UUID(longID);
     // custom_uuid.type  = UUID_TYPE_LONG
     // custom_uuid.value = 0x3322
     // custom_uuid.base  = 00 11 22 33 44 55 66 77 88 99 AA BB CC DD EE FF
-   
+
     @endcode
 */
 /**************************************************************************/
@@ -85,15 +85,12 @@
     value = (uint16_t)((uuid_base[3] << 8) | (uuid_base[2]));
 
     /* Check if this is a short of a long UUID */
-    if (uuid_base[0]  + uuid_base[1]  +
-        uuid_base[4]  + uuid_base[5]  + uuid_base[6]  + uuid_base[7] +
-        uuid_base[8]  + uuid_base[9]  + uuid_base[10] + uuid_base[11] +
-        uuid_base[12] + uuid_base[13] + uuid_base[14] + uuid_base[15] == 0)
-    {
-        type = UUID_TYPE_SHORT; 
-    }
-    else
-    {
+    if (uuid_base[0] + uuid_base[1] +
+        uuid_base[4] + uuid_base[5] + uuid_base[6] + uuid_base[7] +
+        uuid_base[8] + uuid_base[9] + uuid_base[10] + uuid_base[11] +
+        uuid_base[12] + uuid_base[13] + uuid_base[14] + uuid_base[15] == 0) {
+        type = UUID_TYPE_SHORT;
+    } else   {
         type = UUID_TYPE_LONG;
     }
 }
@@ -109,9 +106,9 @@
 UUID::UUID(uint16_t const ble_uuid)
 {
     memset(base, 0, 16);
-    memcpy(base+2, (uint8_t *)&ble_uuid, 2);
+    memcpy(base + 2, (uint8_t *)&ble_uuid, 2);
     value = ble_uuid;
-    type = UUID_TYPE_SHORT;
+    type  = UUID_TYPE_SHORT;
 }
 
 /**************************************************************************/
@@ -126,11 +123,11 @@
 /**************************************************************************/
 /*!
     @brief  Updates the value of the UUID
-    
+
     @args[in]   uuid_base
                 The 128-bit value to use when updating the UUID.  For
                 16-bit IDs, insert the ID in bytes 2/3 in LSB format.
-                
+
     @returns    BLE_ERROR_NONE (0) if everything executed correctly, or an
                 error code if there was a problem
     @retval     BLE_ERROR_NONE
@@ -139,8 +136,8 @@
     @section EXAMPLE
 
     @code
-   
-    @endcode    
+
+    @endcode
 */
 /**************************************************************************/
 ble_error_t UUID::update(uint8_t const uuid_base[16])
@@ -149,28 +146,25 @@
     value = (uint16_t)((uuid_base[3] << 8) | (uuid_base[2]));
 
     /* Check if this is a short of a long UUID */
-    if (uuid_base[0]  + uuid_base[1]  +
-        uuid_base[4]  + uuid_base[5]  + uuid_base[6]  + uuid_base[7] +
-        uuid_base[8]  + uuid_base[9]  + uuid_base[10] + uuid_base[11] +
-        uuid_base[12] + uuid_base[13] + uuid_base[14] + uuid_base[15] == 0)
-    {
-        type = UUID_TYPE_SHORT; 
-    }
-    else
-    {
+    if (uuid_base[0] + uuid_base[1] +
+        uuid_base[4] + uuid_base[5] + uuid_base[6] + uuid_base[7] +
+        uuid_base[8] + uuid_base[9] + uuid_base[10] + uuid_base[11] +
+        uuid_base[12] + uuid_base[13] + uuid_base[14] + uuid_base[15] == 0) {
+        type = UUID_TYPE_SHORT;
+    } else   {
         type = UUID_TYPE_LONG;
     }
-    
+
     return BLE_ERROR_NONE;
 }
 
 /**************************************************************************/
 /*!
     @brief  Updates the value of the UUID
-    
+
     @args[in]   ble_uuid
                 The 16-bit value to use when updating the UUID.
-                
+
     @returns    BLE_ERROR_NONE (0) if everything executed correctly, or an
                 error code if there was a problem
     @retval     BLE_ERROR_NONE
@@ -179,16 +173,16 @@
     @section EXAMPLE
 
     @code
-   
-    @endcode    
+
+    @endcode
 */
 /**************************************************************************/
 ble_error_t UUID::update(uint16_t const ble_uuid)
 {
     memset(base, 0, 16);
-    memcpy(base+2, (uint8_t *)&ble_uuid, 2);
+    memcpy(base + 2, (uint8_t *)&ble_uuid, 2);
     value = ble_uuid;
-    type = UUID_TYPE_SHORT;
-    
+    type  = UUID_TYPE_SHORT;
+
     return BLE_ERROR_NONE;
 }