Revision 330:2a3f554ee9fd, committed 2015-04-15

Comitter:

rgrover1

Date:

Wed Apr 15 09:05:10 2015 +0100

Parent:

329:2e082a9c7c13

Child:

331:10f190629734

Commit message:

Synchronized with git rev 88e59f33
Author: Rohit Grover
merge GattService.cpp into GattService.h

Changed in this revision

--- a/common/GattService.cpp	Wed Apr 15 09:05:10 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <stdio.h>
-#include <string.h>
-
-#include "GattService.h"
-
-/**************************************************************************/
-/*!
-    @brief  Creates a new GattService using the specified 128-bit UUID
-
-    @note   The UUID value must be unique on the device
-
-    @param[in]  uuid
-                The 16 byte (128-bit) UUID to use for this characteristic
-
-    @section EXAMPLE
-
-    @code
-
-    @endcode
-*/
-/**************************************************************************/
-GattService::GattService(const UUID &uuid, GattCharacteristic *characteristics[], unsigned numCharacteristics) :
-    _primaryServiceID(uuid), _characteristicCount(numCharacteristics), _characteristics(characteristics), _handle(0)
-{
-    /* empty */
-}
\ No newline at end of file

--- a/public/GattService.h	Wed Apr 15 09:05:10 2015 +0100
+++ b/public/GattService.h	Wed Apr 15 09:05:10 2015 +0100
@@ -57,7 +57,10 @@
      *  @param[in]  numCharacteristics
      *              The number of characteristics
      */
-    GattService(const UUID &uuid, GattCharacteristic *characteristics[], unsigned numCharacteristics);
+    GattService(const UUID &uuid, GattCharacteristic *characteristics[], unsigned numCharacteristics) :
+        _primaryServiceID(uuid), _characteristicCount(numCharacteristics), _characteristics(characteristics), _handle(0) {
+        /* empty */
+    }
 
     const UUID &getUUID(void)                const {return _primaryServiceID;   }
     uint16_t    getHandle(void)              const {return _handle;             }