Merging changes from ATParser towards parser unification

drivers/PwmOut.h

@@ -21,6 +21,7 @@
 #if defined (DEVICE_PWMOUT) || defined(DOXYGEN_ONLY)
 #include "hal/pwmout_api.h"
 #include "platform/mbed_critical.h"
+#include "platform/mbed_sleep.h"
 
 namespace mbed {
 /** \addtogroup drivers */
@@ -56,12 +57,18 @@ class PwmOut {
      *
      *  @param pin PwmOut pin to connect to
      */
-    PwmOut(PinName pin) {
+    PwmOut(PinName pin) : _deep_sleep_locked(false) {
         core_util_critical_section_enter();
         pwmout_init(&_pwm, pin);
         core_util_critical_section_exit();
     }
 
+    ~PwmOut() {
+        core_util_critical_section_enter();
+        unlock_deep_sleep();
+        core_util_critical_section_exit();
+    }
+
     /** Set the ouput duty-cycle, specified as a percentage (float)
      *
      *  @param value A floating-point value representing the output duty-cycle,
@@ -71,6 +78,7 @@ class PwmOut {
      */
     void write(float value) {
         core_util_critical_section_enter();
+        lock_deep_sleep();
         pwmout_write(&_pwm, value);
         core_util_critical_section_exit();
     }
@@ -177,7 +185,24 @@ class PwmOut {
     }
 
 protected:
+    /** Lock deep sleep only if it is not yet locked */
+    void lock_deep_sleep() {
+        if (_deep_sleep_locked == false) {
+            sleep_manager_lock_deep_sleep();
+            _deep_sleep_locked = true;
+        }
+    }
+
+    /** Unlock deep sleep in case it is locked */
+    void unlock_deep_sleep() {
+        if (_deep_sleep_locked == true) {
+            sleep_manager_unlock_deep_sleep();
+            _deep_sleep_locked = false;
+        }
+    }
+
     pwmout_t _pwm;
+    bool _deep_sleep_locked;
 };
 
 } // namespace mbed

drivers/Timer.cpp

@@ -28,6 +28,15 @@ Timer::Timer(const ticker_data_t *data) : _running(), _start(), _time(), _ticker
     reset();
 }
 
+Timer::~Timer() {
+    core_util_critical_section_enter();
+    if (_running) {
+        sleep_manager_unlock_deep_sleep();
+    }
+    _running = 0;
+    core_util_critical_section_exit();
+}
+
 void Timer::start() {
     core_util_critical_section_enter();
     if (!_running) {

drivers/Timer.h

@@ -53,6 +53,7 @@ class Timer : private NonCopyable<Timer> {
 public:
     Timer();
     Timer(const ticker_data_t *data);
+    ~Timer();
 
     /** Start the timer
      */

features/FEATURE_BLE/ble/ArrayView.h

@@ -0,0 +1,165 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2017-2017 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.
+ */
+
+#ifndef BLE_ARRAY_VIEW_H_
+#define BLE_ARRAY_VIEW_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace ble {
+
+/**
+ * Immutable view to an array.
+ */
+template<typename T>
+struct ArrayView {
+
+    /**
+     * construct an array view to an empty array
+     */
+    ArrayView() : _array(0), _size(0) { }
+
+    /**
+     * construct an array view from a pointer.
+     * and its size.
+     */
+    ArrayView(T* array_ptr, size_t array_size) :
+    	_array(array_ptr), _size(array_size) { }
+
+    /**
+     * Construct an array view from the reference to an array.
+     */
+    template<size_t Size>
+    ArrayView(T (&elements)[Size]):
+		_array(elements), _size(Size) { }
+
+    /**
+     * Return the size of the array viewed.
+     */
+    size_t size() const {
+    	return _size;
+    }
+
+    /**
+     * Access to a mutable element of the array.
+     */
+    T& operator[](size_t index) {
+    	return _array[index];
+    }
+
+    /**
+     * Access to an immutable element of the array.
+     */
+    const T& operator[](size_t index) const  {
+    	return _array[index];
+    }
+
+    /**
+     * Get the pointer to the array
+     */
+    T* data() {
+        return _array;
+    }
+
+    /**
+     * Get the pointer to the const array
+     */
+    const T* data() const {
+        return _array;
+    }
+
+    /**
+     * Equality operator
+     */
+    friend bool operator==(const ArrayView& lhs, const ArrayView& rhs) {
+    	if (lhs.size() != rhs.size()) {
+    		return false;
+    	}
+
+    	if (lhs.data() == rhs.data()) {
+    		return true;
+    	}
+
+    	return memcmp(lhs.data(), rhs.data(), lhs.size()) == 0;
+    }
+
+    /**
+     * Not equal operator
+     */
+    friend bool operator!=(const ArrayView& lhs, const ArrayView& rhs) {
+    	return !(lhs == rhs);
+    }
+
+private:
+    T* const _array;
+    const size_t _size;
+};
+
+
+/**
+ * Generate an array view from a C/C++ array.
+ * This helper avoid the typing of template parameter when ArrayView are
+ * created 'inline'.
+ * @param elements The array viewed.
+ * @return The array_view to elements.
+ */
+template<typename T, size_t Size>
+ArrayView<T> make_ArrayView(T (&elements)[Size]) {
+    return ArrayView<T>(elements);
+}
+
+/**
+ * Generate an array view from a C/C++ pointer and the size of the array.
+ * This helper avoid the typing of template parameter when ArrayView are
+ * created 'inline'.
+ * @param array_ptr The pointer to the array to view.
+ * @param array_size The size of the array.
+ * @return The array_view to array_ptr with a size of array_size.
+ */
+template<typename T>
+ArrayView<T> make_ArrayView(T* array_ptr, size_t array_size) {
+    return ArrayView<T>(array_ptr, array_size);
+}
+
+/**
+ * Generate a const array view from a C/C++ array.
+ * This helper avoid the typing of template parameter when ArrayView are
+ * created 'inline'.
+ * @param elements The array viewed.
+ * @return The ArrayView to elements.
+ */
+template<typename T, size_t Size>
+ArrayView<const T> make_const_ArrayView(T (&elements)[Size]) {
+    return ArrayView<const T>(elements);
+}
+
+/**
+ * Generate a const array view from a C/C++ pointer and the size of the array.
+ * This helper avoid the typing of template parameter when ArrayView are
+ * created 'inline'.
+ * @param array_ptr The pointer to the array to view.
+ * @param array_size The size of the array.
+ * @return The ArrayView to array_ptr with a size of array_size.
+ */
+template<typename T>
+ArrayView<const T> make_const_ArrayView(T* array_ptr, size_t array_size) {
+    return ArrayView<const T>(array_ptr, array_size);
+}
+
+} // namespace ble
+
+#endif /* BLE_ARRAY_VIEW_H_ */

features/FEATURE_BLE/ble/BLETypes.h

@@ -0,0 +1,77 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2017-2017 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.
+ */
+
+#ifndef BLE_TYPES_H_
+#define BLE_TYPES_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace ble {
+
+/**
+ * A connection handle is an unsigned integer capable of holding a pointer.
+ * The real type (either a pointer to an object or an integer) is opaque and
+ * platform dependent.
+ */
+typedef uintptr_t connection_handle_t;
+
+/**
+ * Model an attribute handle in a GATT database.
+ */
+typedef uint16_t attribute_handle_t;
+
+
+ /**
+  * Model an inclusive range of GATT attributes handles.
+  */
+struct attribute_handle_range_t {
+    attribute_handle_t begin;
+    attribute_handle_t end;
+
+    friend bool operator==(
+        const attribute_handle_range_t& lhs, const attribute_handle_range_t& rhs
+    ) {
+        return (lhs.begin == rhs.begin) && (lhs.end == rhs.end);
+    }
+
+    friend bool operator!=(
+        const attribute_handle_range_t& lhs, const attribute_handle_range_t& rhs
+    ) {
+        return !(lhs == rhs);
+    }
+};
+
+
+/**
+ * Construct an attribute_handle_range_t from its start and end handle.
+ * @note This function is defined instead of a constructor to keep "POD-ness"
+ * of attribute_handle_range_t.
+ */
+static inline attribute_handle_range_t attribute_handle_range(
+    attribute_handle_t begin,
+    attribute_handle_t end
+) {
+    attribute_handle_range_t result = {
+        begin,
+        end
+    };
+    return result;
+}
+
+} // namespace ble
+
+#endif /* BLE_TYPES_H_ */

features/FEATURE_BLE/ble/CharacteristicDescriptorDiscovery.h

@@ -70,6 +70,11 @@ class CharacteristicDescriptorDiscovery {
          * status of the discovery operation
          */
         ble_error_t status;
+
+        /**
+         * error code associated with the status if any.
+         */
+        uint8_t error_code;
     };
 
     /**

features/FEATURE_BLE/ble/DiscoveredCharacteristic.h

@@ -22,7 +22,7 @@
 #include "GattAttribute.h"
 #include "GattClient.h"
 #include "CharacteristicDescriptorDiscovery.h"
-#include "ble/DiscoveredCharacteristicDescriptor.h"
+#include "DiscoveredCharacteristicDescriptor.h"
 
 /**
  * @brief Representation of a characteristic discovered during a GattClient

features/FEATURE_BLE/ble/Gap.h

@@ -17,6 +17,7 @@
 #ifndef __GAP_H__
 #define __GAP_H__
 
+#include "BLETypes.h"
 #include "ble/BLEProtocol.h"
 #include "GapAdvertisingData.h"
 #include "GapAdvertisingParams.h"
@@ -171,7 +172,7 @@ class Gap {
     /**
      * Type for connection handle.
      */
-    typedef uint16_t Handle_t;
+    typedef ble::connection_handle_t Handle_t;
 
     /**
      * Structure containing GAP connection parameters. When in peripheral role

features/FEATURE_BLE/ble/GattAttribute.h

@@ -18,6 +18,7 @@
 #define __GATT_ATTRIBUTE_H__
 
 #include "UUID.h"
+#include "BLETypes.h"
 
 /**
  * Instances of this class encapsulate the data that belongs to a Bluetooth Low
@@ -29,7 +30,7 @@ class GattAttribute {
      * Type for the handle or ID of the attribute in the ATT table. These are
      * unique and are usually generated by the underlying BLE stack.
      */
-    typedef uint16_t Handle_t;
+    typedef ble::attribute_handle_t Handle_t;
     /**
      * Define the value of an invalid attribute handle.
      */