Merge pull request #1000 from slaclab/lint6

Re-run clang-format on C++ code
slaclab · Apr 29, 2024 · 5b5a167 · 5b5a167
2 parents b0bc15b + 641820b
commit 5b5a167
Show file tree

Hide file tree

Showing 78 changed files with 537 additions and 523 deletions.
diff --git a/.clang-format b/.clang-format
@@ -15,6 +15,7 @@ AlignConsecutiveAssignments: true
 AlignConsecutiveMacros: true
 AccessModifierOffset: -2
 SortIncludes: true
+IndentPPDirectives: BeforeHash
 IncludeBlocks: Regroup
 IncludeCategories:
     # Rogue Directives.h goes first

diff --git a/include/rogue/Directives.h b/include/rogue/Directives.h
@@ -27,7 +27,7 @@
 #define CRCPP_USE_CPP11
 
 #ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
+    #define __STDC_FORMAT_MACROS
 #endif
 
 #endif
diff --git a/include/rogue/GeneralError.h b/include/rogue/GeneralError.h
@@ -28,7 +28,7 @@
 #include <string>
 
 #ifndef NO_PYTHON
-#include <boost/python.hpp>
+    #include <boost/python.hpp>
 #endif
 
 namespace rogue {

diff --git a/include/rogue/GilRelease.h b/include/rogue/GilRelease.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #ifndef NO_PYTHON
-#include <boost/python.hpp>
+    #include <boost/python.hpp>
 #endif
 
 namespace rogue {

diff --git a/include/rogue/ScopedGil.h b/include/rogue/ScopedGil.h
@@ -22,7 +22,7 @@
 
 #include "rogue/Directives.h"
 #ifndef NO_PYTHON
-#include <boost/python.hpp>
+    #include <boost/python.hpp>
 #endif
 
 namespace rogue {

diff --git a/include/rogue/hardware/drivers/AxisDriver.h b/include/rogue/hardware/drivers/AxisDriver.h
@@ -25,8 +25,8 @@
 #include "DmaDriver.h"
 
 // Command definitions
-#define AXIS_Read_Ack 0x2001          // Command to acknowledge read
-#define AXIS_Write_ReqMissed 0x2002   // Command to indicate a missed write request
+#define AXIS_Read_Ack        0x2001  // Command to acknowledge read
+#define AXIS_Write_ReqMissed 0x2002  // Command to indicate a missed write request
 
 // Only define the following if not compiling for kernel space
 #ifndef DMA_IN_KERNEL
@@ -41,14 +41,14 @@
  * @return The combined flags value.
  */
 static inline uint32_t axisSetFlags(uint32_t fuser, uint32_t luser, uint32_t cont) {
-   uint32_t flags;
+    uint32_t flags;
 
-   // Set flags based on input parameters, ensuring each is in its correct position
-   flags  = fuser & 0xFF;            // First user-defined flag
-   flags |= (luser << 8) & 0xFF00;   // Last user-defined flag
-   flags |= (cont  << 16) & 0x10000; // Continuation flag
+    // Set flags based on input parameters, ensuring each is in its correct position
+    flags = fuser & 0xFF;             // First user-defined flag
+    flags |= (luser << 8) & 0xFF00;   // Last user-defined flag
+    flags |= (cont << 16) & 0x10000;  // Continuation flag
 
-   return flags;
+    return flags;
 }
 
 /**
@@ -59,7 +59,7 @@ static inline uint32_t axisSetFlags(uint32_t fuser, uint32_t luser, uint32_t con
  * @return The first user-defined flag.
  */
 static inline uint32_t axisGetFuser(uint32_t flags) {
-   return flags & 0xFF;
+    return flags & 0xFF;
 }
 
 /**
@@ -70,7 +70,7 @@ static inline uint32_t axisGetFuser(uint32_t flags) {
  * @return The last user-defined flag.
  */
 static inline uint32_t axisGetLuser(uint32_t flags) {
-   return (flags >> 8) & 0xFF;
+    return (flags >> 8) & 0xFF;
 }
 
 /**
@@ -81,7 +81,7 @@ static inline uint32_t axisGetLuser(uint32_t flags) {
  * @return The continuation flag.
  */
 static inline uint32_t axisGetCont(uint32_t flags) {
-   return (flags >> 16) & 0x1;
+    return (flags >> 16) & 0x1;
 }
 
 /**
@@ -90,7 +90,7 @@ static inline uint32_t axisGetCont(uint32_t flags) {
  * @param fd File descriptor for the AXIS device.
  */
 static inline void axisReadAck(int32_t fd) {
-   ioctl(fd, AXIS_Read_Ack, 0);
+    ioctl(fd, AXIS_Read_Ack, 0);
 }
 
 /**
@@ -99,8 +99,8 @@ static inline void axisReadAck(int32_t fd) {
  * @param fd File descriptor for the AXIS device.
  */
 static inline void axisWriteReqMissed(int32_t fd) {
-   ioctl(fd, AXIS_Write_ReqMissed, 0);
+    ioctl(fd, AXIS_Write_ReqMissed, 0);
 }
 
-#endif // !DMA_IN_KERNEL
-#endif // __ASIS_DRIVER_H__
+#endif  // !DMA_IN_KERNEL
+#endif  // __ASIS_DRIVER_H__