From 8ade9d1fe831e387b3255b21d3b12e3e3e3560d8 Mon Sep 17 00:00:00 2001
From: Pierre Kancir <pierre.kancir@retdtechfrance.com>
Date: Mon, 9 Jan 2017 13:23:23 +0100
Subject: [PATCH] AP_HAL_SITL: style fixes

---
 libraries/AP_HAL_SITL/AP_HAL_SITL.h           |  2 +-
 libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h |  2 +-
 libraries/AP_HAL_SITL/HAL_SITL_Class.cpp      | 32 +++++++++----------
 libraries/AP_HAL_SITL/HAL_SITL_Class.h        |  2 +-
 libraries/AP_HAL_SITL/Semaphores.cpp          | 10 +++---
 libraries/AP_HAL_SITL/Semaphores.h            |  2 +-
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/libraries/AP_HAL_SITL/AP_HAL_SITL.h b/libraries/AP_HAL_SITL/AP_HAL_SITL.h
index 68a4ea08fc..10c4aa7a66 100644
--- a/libraries/AP_HAL_SITL/AP_HAL_SITL.h
+++ b/libraries/AP_HAL_SITL/AP_HAL_SITL.h
@@ -6,4 +6,4 @@
 
 #include "HAL_SITL_Class.h"
 
-#endif // CONFIG_HAL_BOARD
+#endif  // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h b/libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h
index 58e9abcb2b..a5d54c438f 100644
--- a/libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h
+++ b/libraries/AP_HAL_SITL/AP_HAL_SITL_Namespace.h
@@ -14,4 +14,4 @@ class Util;
 class Semaphore;
 class GPIO;
 class DigitalSource;
-}
+}  // namespace HALSITL
diff --git a/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp b/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
index 84eedd0ddc..b11c5cedf5 100644
--- a/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
+++ b/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
@@ -46,22 +46,22 @@ static Util utilInstance(&sitlState);
 
 HAL_SITL::HAL_SITL() :
     AP_HAL::HAL(
-        &sitlUart0Driver,  /* uartA */
-        &sitlUart1Driver,  /* uartB */
-        &sitlUart2Driver,  /* uartC */
-        &sitlUart3Driver,  /* uartD */
-        &sitlUart4Driver,  /* uartE */
-        &sitlUart5Driver,  /* uartF */
+        &sitlUart0Driver,   /* uartA */
+        &sitlUart1Driver,   /* uartB */
+        &sitlUart2Driver,   /* uartC */
+        &sitlUart3Driver,   /* uartD */
+        &sitlUart4Driver,   /* uartE */
+        &sitlUart5Driver,   /* uartF */
         &i2c_mgr_instance,
-        &emptySPI, /* spi */
-        &sitlAnalogIn, /* analogin */
+        &emptySPI,          /* spi */
+        &sitlAnalogIn,      /* analogin */
         &sitlEEPROMStorage, /* storage */
-        &sitlUart0Driver, /* console */
-        &sitlGPIO, /* gpio */
-        &sitlRCInput,  /* rcinput */
-        &sitlRCOutput, /* rcoutput */
-        &sitlScheduler, /* scheduler */
-        &utilInstance, /* util */
+        &sitlUart0Driver,   /* console */
+        &sitlGPIO,          /* gpio */
+        &sitlRCInput,       /* rcinput */
+        &sitlRCOutput,      /* rcoutput */
+        &sitlScheduler,     /* scheduler */
+        &utilInstance,      /* util */
         &emptyOpticalFlow), /* onboard optical flow */
     _sitl_state(&sitlState)
 {}
@@ -77,7 +77,7 @@ void HAL_SITL::run(int argc, char * const argv[], Callbacks* callbacks) const
     rcin->init();
     rcout->init();
 
-    //spi->init();
+    // spi->init();
     analogin->init();
 
     callbacks->setup();
@@ -93,4 +93,4 @@ const AP_HAL::HAL& AP_HAL::get_HAL() {
     return hal;
 }
 
-#endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL
+#endif  // CONFIG_HAL_BOARD == HAL_BOARD_SITL
diff --git a/libraries/AP_HAL_SITL/HAL_SITL_Class.h b/libraries/AP_HAL_SITL/HAL_SITL_Class.h
index 09f2711d34..268ee6f424 100644
--- a/libraries/AP_HAL_SITL/HAL_SITL_Class.h
+++ b/libraries/AP_HAL_SITL/HAL_SITL_Class.h
@@ -17,4 +17,4 @@ private:
     HALSITL::SITL_State *_sitl_state;
 };
 
-#endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL
+#endif  // CONFIG_HAL_BOARD == HAL_BOARD_SITL
diff --git a/libraries/AP_HAL_SITL/Semaphores.cpp b/libraries/AP_HAL_SITL/Semaphores.cpp
index 5c46a07765..5a207d7dd3 100644
--- a/libraries/AP_HAL_SITL/Semaphores.cpp
+++ b/libraries/AP_HAL_SITL/Semaphores.cpp
@@ -8,12 +8,12 @@ extern const AP_HAL::HAL& hal;
 
 using namespace HALSITL;
 
-bool Semaphore::give() 
+bool Semaphore::give()
 {
     return pthread_mutex_unlock(&_lock) == 0;
 }
 
-bool Semaphore::take(uint32_t timeout_ms) 
+bool Semaphore::take(uint32_t timeout_ms)
 {
     if (timeout_ms == 0) {
         return pthread_mutex_lock(&_lock) == 0;
@@ -27,13 +27,13 @@ bool Semaphore::take(uint32_t timeout_ms)
         if (take_nonblocking()) {
             return true;
         }
-    } while ((AP_HAL::micros64() - start) < timeout_ms*1000);
+    } while ((AP_HAL::micros64() - start) < timeout_ms * 1000);
     return false;
 }
 
-bool Semaphore::take_nonblocking() 
+bool Semaphore::take_nonblocking()
 {
     return pthread_mutex_trylock(&_lock) == 0;
 }
 
-#endif // CONFIG_HAL_BOARD
+#endif  // CONFIG_HAL_BOARD
diff --git a/libraries/AP_HAL_SITL/Semaphores.h b/libraries/AP_HAL_SITL/Semaphores.h
index f36d253dc4..04a225312e 100644
--- a/libraries/AP_HAL_SITL/Semaphores.h
+++ b/libraries/AP_HAL_SITL/Semaphores.h
@@ -17,5 +17,5 @@ public:
 private:
     pthread_mutex_t _lock;
 };
-#endif // CONFIG_HAL_BOARD
+#endif  // CONFIG_HAL_BOARD