rtos: astyle update

Author: 0xc0170

rtos/EventFlags.h

@@ -36,9 +36,9 @@ namespace rtos {
  * \defgroup rtos_EventFlags EventFlags class
  * @{
  */
- 
+
 /** The EventFlags class is used to signal or wait for an arbitrary event or events.
- @note 
+ @note
  EventFlags support 31 flags so the MSB flag is ignored, it is used to return an error code (@a osFlagsError)
  @note
  Memory considerations: The EventFlags control structures will be created on current thread's stack, both for the mbed OS

rtos/Kernel.cpp

@@ -26,7 +26,8 @@
 
 namespace rtos {
 
-uint64_t Kernel::get_ms_count() {
+uint64_t Kernel::get_ms_count()
+{
     // CMSIS-RTOS 2.1.0 and 2.1.1 differ in the time type. We assume
     // our header at least matches the implementation, so we don't try looking
     // at the run-time version report. (There's no compile-time version report)
@@ -36,7 +37,7 @@ uint64_t Kernel::get_ms_count() {
     // 2.1.x who knows? We assume could go back to uint64_t
     if (sizeof osKernelGetTickCount() == sizeof(uint64_t)) {
         return osKernelGetTickCount();
-    } else /* assume 32-bit */ {
+    } else { /* assume 32-bit */
         // Based on suggestion in CMSIS-RTOS 2.1.1 docs, but with reentrancy
         // protection for the tick memory. We use critical section rather than a
         // mutex, as hopefully this method can be callable from interrupt later -

rtos/Mail.h

@@ -42,7 +42,7 @@ namespace rtos {
  * \defgroup rtos_Mail Mail class
  * @{
  */
- 
+
 /** The Mail class allow to control, send, receive, or wait for mail.
  A mail is a memory block that is send to a thread or interrupt service routine.
   @tparam  T         data type of a single message element.
@@ -67,7 +67,8 @@ class Mail : private mbed::NonCopyable<Mail<T, queue_sz> > {
      *
      * @note You may call this function from ISR context.
      */
-    bool empty() const {
+    bool empty() const
+    {
         return _queue.empty();
     }
 
@@ -77,7 +78,8 @@ class Mail : private mbed::NonCopyable<Mail<T, queue_sz> > {
      *
      * @note You may call this function from ISR context.
      */
-    bool full() const {
+    bool full() const
+    {
         return _queue.full();
     }
 
@@ -87,7 +89,8 @@ class Mail : private mbed::NonCopyable<Mail<T, queue_sz> > {
 
       @note You may call this function from ISR context if the millisec parameter is set to 0.
     */
-    T* alloc(uint32_t millisec=0) {
+    T *alloc(uint32_t millisec = 0)
+    {
         return _pool.alloc();
     }
 
@@ -97,7 +100,8 @@ class Mail : private mbed::NonCopyable<Mail<T, queue_sz> > {
 
       @note You may call this function from ISR context if the millisec parameter is set to 0.
     */
-    T* calloc(uint32_t millisec=0) {
+    T *calloc(uint32_t millisec = 0)
+    {
         return _pool.calloc();
     }
 
@@ -107,7 +111,8 @@ class Mail : private mbed::NonCopyable<Mail<T, queue_sz> > {
 
       @note You may call this function from ISR context.
     */
-    osStatus put(T *mptr) {
+    osStatus put(T *mptr)
+    {
         return _queue.put(mptr);
     }
 
@@ -117,7 +122,8 @@ class Mail : private mbed::NonCopyable<Mail<T, queue_sz> > {
 
       @note You may call this function from ISR context if the millisec parameter is set to 0.
     */
-    osEvent get(uint32_t millisec=osWaitForever) {
+    osEvent get(uint32_t millisec = osWaitForever)
+    {
         osEvent evt = _queue.get(millisec);
         if (evt.status == osEventMessage) {
             evt.status = osEventMail;
@@ -131,7 +137,8 @@ class Mail : private mbed::NonCopyable<Mail<T, queue_sz> > {
 
       @note You may call this function from ISR context.
     */
-    osStatus free(T *mptr) {
+    osStatus free(T *mptr)
+    {
         return _pool.free(mptr);
     }
 

rtos/MemoryPool.h

@@ -37,7 +37,7 @@ namespace rtos {
  * \defgroup rtos_MemoryPool MemoryPool class
  * @{
  */
- 
+
 /** Define and manage fixed-size memory pools of objects of a given type.
   @tparam  T         data type of a single object (element).
   @tparam  queue_sz  maximum number of objects (elements) in the memory pool.
@@ -48,13 +48,14 @@ namespace rtos {
 */
 template<typename T, uint32_t pool_sz>
 class MemoryPool : private mbed::NonCopyable<MemoryPool<T, pool_sz> > {
-	MBED_STATIC_ASSERT(pool_sz > 0, "Invalid memory pool size. Must be greater than 0.");
+    MBED_STATIC_ASSERT(pool_sz > 0, "Invalid memory pool size. Must be greater than 0.");
 public:
     /** Create and Initialize a memory pool.
      *
      * @note You cannot call this function from ISR context.
     */
-    MemoryPool() {
+    MemoryPool()
+    {
         memset(_pool_mem, 0, sizeof(_pool_mem));
         memset(&_obj_mem, 0, sizeof(_obj_mem));
         osMemoryPoolAttr_t attr = { 0 };
@@ -70,7 +71,8 @@ class MemoryPool : private mbed::NonCopyable<MemoryPool<T, pool_sz> > {
      *
      * @note You cannot call this function from ISR context.
     */
-    ~MemoryPool() {
+    ~MemoryPool()
+    {
         osMemoryPoolDelete(_id);
     }
 
@@ -79,17 +81,19 @@ class MemoryPool : private mbed::NonCopyable<MemoryPool<T, pool_sz> > {
 
       @note You may call this function from ISR context.
     */
-    T* alloc(void) {
-        return (T*)osMemoryPoolAlloc(_id, 0);
+    T *alloc(void)
+    {
+        return (T *)osMemoryPoolAlloc(_id, 0);
     }
 
     /** Allocate a memory block of type T from a memory pool and set memory block to zero.
       @return  address of the allocated memory block or NULL in case of no memory available.
 
       @note You may call this function from ISR context.
     */
-    T* calloc(void) {
-        T *item = (T*)osMemoryPoolAlloc(_id, 0);
+    T *calloc(void)
+    {
+        T *item = (T *)osMemoryPoolAlloc(_id, 0);
         if (item != NULL) {
             memset(item, 0, sizeof(T));
         }
@@ -104,8 +108,9 @@ class MemoryPool : private mbed::NonCopyable<MemoryPool<T, pool_sz> > {
 
       @note You may call this function from ISR context.
     */
-    osStatus free(T *block) {
-        return osMemoryPoolFree(_id, (void*)block);
+    osStatus free(T *block)
+    {
+        return osMemoryPoolFree(_id, (void *)block);
     }
 
 private:

rtos/Mutex.cpp

@@ -50,19 +50,22 @@ void Mutex::constructor(const char *name)
     MBED_ASSERT(_id);
 }
 
-osStatus Mutex::lock(uint32_t millisec) {
+osStatus Mutex::lock(uint32_t millisec)
+{
     osStatus status = osMutexAcquire(_id, millisec);
     if (osOK == status) {
         _count++;
     }
     return status;
 }
 
-bool Mutex::trylock() {
+bool Mutex::trylock()
+{
     return trylock_for(0);
 }
 
-bool Mutex::trylock_for(uint32_t millisec) {
+bool Mutex::trylock_for(uint32_t millisec)
+{
     osStatus status = lock(millisec);
     if (status == osOK) {
         return true;
@@ -73,7 +76,8 @@ bool Mutex::trylock_for(uint32_t millisec) {
     return false;
 }
 
-bool Mutex::trylock_until(uint64_t millisec) {
+bool Mutex::trylock_until(uint64_t millisec)
+{
     uint64_t now = Kernel::get_ms_count();
 
     if (now >= millisec) {
@@ -86,16 +90,19 @@ bool Mutex::trylock_until(uint64_t millisec) {
     }
 }
 
-osStatus Mutex::unlock() {
+osStatus Mutex::unlock()
+{
     _count--;
     return osMutexRelease(_id);
 }
 
-osThreadId Mutex::get_owner() {
+osThreadId Mutex::get_owner()
+{
     return osMutexGetOwner(_id);
 }
 
-Mutex::~Mutex() {
+Mutex::~Mutex()
+{
     osMutexDelete(_id);
 }
 

rtos/Mutex.h

@@ -51,7 +51,7 @@ typedef mbed::ScopedLock<Mutex> ScopedMutexLock;
  * \defgroup rtos_Mutex Mutex class
  * @{
  */
- 
+
 /** The Mutex class is used to synchronize the execution of threads.
  This is for example used to protect access to a shared resource.
 
@@ -89,7 +89,7 @@ class Mutex : private mbed::NonCopyable<Mutex> {
 
       @note You cannot call this function from ISR context.
      */
-    osStatus lock(uint32_t millisec=osWaitForever);
+    osStatus lock(uint32_t millisec = osWaitForever);
 
     /** Try to lock the mutex, and return immediately
       @return true if the mutex was acquired, false otherwise.

rtos/Queue.h

@@ -38,7 +38,7 @@ namespace rtos {
  * \defgroup rtos_EventFlags EventFlags class
  * @{
  */
- 
+
 /** The Queue class allow to control, send, receive, or wait for messages.
  A message can be a integer or pointer value  to a certain type T that is send
  to a thread or interrupt service routine.
@@ -56,21 +56,23 @@ class Queue : private mbed::NonCopyable<Queue<T, queue_sz> > {
      *
      * @note You cannot call this function from ISR context.
     */
-    Queue() {
+    Queue()
+    {
         memset(&_obj_mem, 0, sizeof(_obj_mem));
         osMessageQueueAttr_t attr = { 0 };
         attr.mq_mem = _queue_mem;
         attr.mq_size = sizeof(_queue_mem);
         attr.cb_mem = &_obj_mem;
         attr.cb_size = sizeof(_obj_mem);
-        _id = osMessageQueueNew(queue_sz, sizeof(T*), &attr);
+        _id = osMessageQueueNew(queue_sz, sizeof(T *), &attr);
         MBED_ASSERT(_id);
     }
     /** Queue destructor
      *
      * @note You cannot call this function from ISR context.
      */
-    ~Queue() {
+    ~Queue()
+    {
         osMessageQueueDelete(_id);
     }
 
@@ -80,7 +82,8 @@ class Queue : private mbed::NonCopyable<Queue<T, queue_sz> > {
      *
      * @note You may call this function from ISR context.
      */
-    bool empty() const {
+    bool empty() const
+    {
         return osMessageQueueGetCount(_id) == 0;
     }
 
@@ -90,7 +93,8 @@ class Queue : private mbed::NonCopyable<Queue<T, queue_sz> > {
      *
      * @note You may call this function from ISR context.
      */
-    bool full() const {
+    bool full() const
+    {
         return osMessageQueueGetSpace(_id) == 0;
     }
 
@@ -106,7 +110,8 @@ class Queue : private mbed::NonCopyable<Queue<T, queue_sz> > {
 
       @note You may call this function from ISR context if the millisec parameter is set to 0.
     */
-    osStatus put(T* data, uint32_t millisec=0, uint8_t prio=0) {
+    osStatus put(T *data, uint32_t millisec = 0, uint8_t prio = 0)
+    {
         return osMessageQueuePut(_id, &data, prio, millisec);
     }
 
@@ -121,7 +126,8 @@ class Queue : private mbed::NonCopyable<Queue<T, queue_sz> > {
 
       @note You may call this function from ISR context if the millisec parameter is set to 0.
     */
-    osEvent get(uint32_t millisec=osWaitForever) {
+    osEvent get(uint32_t millisec = osWaitForever)
+    {
         osEvent event;
         T *data = NULL;
         osStatus_t res = osMessageQueueGet(_id, &data, NULL, millisec);
@@ -149,7 +155,7 @@ class Queue : private mbed::NonCopyable<Queue<T, queue_sz> > {
 
 private:
     osMessageQueueId_t            _id;
-    char                          _queue_mem[queue_sz * (sizeof(T*) + sizeof(mbed_rtos_storage_message_t))];
+    char                          _queue_mem[queue_sz * (sizeof(T *) + sizeof(mbed_rtos_storage_message_t))];
     mbed_rtos_storage_msg_queue_t _obj_mem;
 };
 /** @}*/

rtos/RtosTimer.cpp

@@ -28,7 +28,8 @@
 
 namespace rtos {
 
-void RtosTimer::constructor(mbed::Callback<void()> func, os_timer_type type) {
+void RtosTimer::constructor(mbed::Callback<void()> func, os_timer_type type)
+{
     _function = func;
     memset(&_obj_mem, 0, sizeof(_obj_mem));
     osTimerAttr_t attr = { 0 };
@@ -38,15 +39,18 @@ void RtosTimer::constructor(mbed::Callback<void()> func, os_timer_type type) {
     MBED_ASSERT(_id);
 }
 
-osStatus RtosTimer::start(uint32_t millisec) {
+osStatus RtosTimer::start(uint32_t millisec)
+{
     return osTimerStart(_id, millisec);
 }
 
-osStatus RtosTimer::stop(void) {
+osStatus RtosTimer::stop(void)
+{
     return osTimerStop(_id);
 }
 
-RtosTimer::~RtosTimer() {
+RtosTimer::~RtosTimer()
+{
     osTimerDelete(_id);
 }