Diff: UUID.h

Revision:

67:0fac4e99f29b

Parent:

61:119faa0dfeee

Child:

68:dcadab8a56dd

diff -r 14120914e08b -r 0fac4e99f29b UUID.h
--- a/UUID.h	Thu Jun 05 08:22:59 2014 +0100
+++ b/UUID.h	Thu Jun 05 08:48:51 2014 +0100
@@ -20,6 +20,10 @@
 
 #include "blecommon.h"
 
+const unsigned LENGTH_OF_LONG_UUID = 16;
+typedef uint16_t ShortUUID_t;
+typedef uint8_t  LongUUID_t[LENGTH_OF_LONG_UUID];
+
 class UUID
 {
 public:
@@ -28,11 +32,9 @@
         UUID_TYPE_LONG  = 1     // Full 128-bit UUID
     };
 
-    static const unsigned LENGTH_OF_LONG_UUID = 16;
-
 public:
-    UUID(const uint8_t longUUID[LENGTH_OF_LONG_UUID]);
-    UUID(uint16_t      uuid);
+    UUID(const LongUUID_t);
+    UUID(ShortUUID_t);
     virtual ~UUID(void);
 
 public:
@@ -42,18 +44,18 @@
     const uint8_t* getBaseUUID(void) const {
         return baseUUID;
     }
-    uint16_t get16BitUUID(void) const {
+    ShortUUID_t getShortUUID(void) const {
         return shortUUID;
     }
 
 private:
-    uint8_t  type;         // UUID_TYPE_SHORT or UUID_TYPE_LONG
-    uint8_t  baseUUID[LENGTH_OF_LONG_UUID]; /* the base of the long UUID (if
+    uint8_t     type;      // UUID_TYPE_SHORT or UUID_TYPE_LONG
+    LongUUID_t  baseUUID;  /* the base of the long UUID (if
                             * used). Note: bytes 12 and 13 (counting from LSB)
                             * are zeroed out to allow comparison with other long
                             * UUIDs which differ only in the 16-bit relative
                             * part.*/
-    uint16_t shortUUID;     // 16 bit uuid (byte 2-3 using with base)
+    ShortUUID_t shortUUID; // 16 bit uuid (byte 2-3 using with base)
 };
 
 #endif // ifndef __UUID_H__