Merge branch 'devel' into blkdrv-move

Author: thomas-bc

CFDP/Checksum/Checksum.hpp

@@ -106,7 +106,7 @@ namespace CFDP {
       //! Get the checksum value
       U32 getValue() const;
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Private instance methods
@@ -130,7 +130,7 @@ namespace CFDP {
           const U8 offset //! The offset
       );
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Private member variables

Drv/Ip/IpSocket.hpp

@@ -138,7 +138,7 @@ class IpSocket {
      *
      * Closes the socket opened by the open call. In this case of the TcpServer, this does NOT close server's listening
      * port but will close the active client connection.
-     * 
+     *
      * \param socketDescriptor: socket descriptor to close
      */
     void close(const SocketDescriptor& socketDescriptor);
@@ -151,12 +151,12 @@ class IpSocket {
      *
      * A shut down begins the termination of communication. The underlying socket will coordinate a clean shutdown, and
      * it is safe to close the socket once a recv with 0 size has returned or an appropriate timeout has been reached.
-     * 
+     *
      * \param socketDescriptor: socket descriptor to shutdown
      */
     void shutdown(const SocketDescriptor& socketDescriptor);
 
-  PROTECTED:
+  protected:
     /**
      * \brief Check if the given port is valid for the socket
      *

Drv/Ip/SocketComponentHelper.hpp

@@ -156,7 +156,7 @@ class SocketComponentHelper {
      */
     Os::Task::Status join();
 
-  PROTECTED:
+  protected:
     /**
      * \brief receive off the TCP socket
      */
@@ -210,7 +210,7 @@ class SocketComponentHelper {
      */
     static void readTask(void* pointer);
 
-  PRIVATE:
+  private:
     /**
      * \brief Re-open port if it has been disconnected
      *
@@ -222,7 +222,7 @@ class SocketComponentHelper {
      */
     SocketIpStatus reopen();
 
-  PROTECTED:
+  protected:
     Os::Task m_task;
     Os::Mutex m_lock;
     SocketDescriptor m_descriptor;

Drv/Ip/TcpClientSocket.hpp

@@ -29,7 +29,7 @@ class TcpClientSocket : public IpSocket {
      * \brief Constructor for client socket tcp implementation
      */
     TcpClientSocket();
-  PROTECTED:
+  protected:
     /**
      * \brief Check if the given port is valid for the socket
      *

Drv/Ip/TcpServerSocket.hpp

@@ -62,7 +62,7 @@ class TcpServerSocket : public IpSocket {
      */
     U16 getListenPort();
 
-  PROTECTED:
+  protected:
     /**
      * \brief Tcp specific implementation for opening a client socket connected to this server.
      * \param socketDescriptor: (output) descriptor opened. Only valid on SOCK_SUCCESS. Otherwise will be invalid

Drv/Ip/UdpSocket.hpp

@@ -39,7 +39,7 @@ class UdpSocket : public IpSocket {
 
     /**
      * \brief configure is disabled
-     * 
+     *
      * \warning configure is disabled for UdpSocket. Use configureSend and configureRecv instead.
      */
     SocketIpStatus configure(const char* hostname, const U16 port, const U32 send_timeout_seconds,
@@ -90,7 +90,7 @@ class UdpSocket : public IpSocket {
      */
     U16 getRecvPort();
 
-  PROTECTED:
+  protected:
 
     /**
      * \brief bind the UDP to a port such that it can receive packets at the previously configured port

Drv/LinuxGpioDriver/LinuxGpioDriver.hpp

@@ -80,7 +80,7 @@ class LinuxGpioDriver final : public LinuxGpioDriverComponentBase {
     //!
     void join();
 
-  PRIVATE:
+  private:
     //! \brief helper to setup a line handle (read or write).
     Os::File::Status setupLineHandle(const PlatformIntType chip_descriptor,
                                      const U32 gpio,

Drv/LinuxI2cDriver/LinuxI2cDriver.hpp

@@ -36,7 +36,7 @@ namespace Drv {
       //!
       ~LinuxI2cDriver();
 
-    PRIVATE:
+    private:
 
       // ----------------------------------------------------------------------
       // Handler implementations for user-defined typed input ports

Drv/LinuxSpiDriver/LinuxSpiDriverComponentImpl.hpp

@@ -37,16 +37,16 @@ namespace Drv {
      * SPI Mode Select
      *
      * Defines the SPI Clock Polarity and Phase for each SPI Transaction.
-     * 
+     *
      * SPI Clock Polarity(CPOL): Defines clock polarity as idle low (CPOL = 0) or idle high(CPOL = 1)
-     * SPI Clock Phase(CPHA): Defines if data is shifted out on the rising clock edge and sampled 
-     *                        on the falling clock edge(CPHA = 0) or if data is shifted out on the 
+     * SPI Clock Phase(CPHA): Defines if data is shifted out on the rising clock edge and sampled
+     *                        on the falling clock edge(CPHA = 0) or if data is shifted out on the
      *                        falling clock edge and sampled on the rising clock edge(CPHA=1)
-     * 
+     *
      */
     enum SpiMode
     {
-        SPI_MODE_CPOL_LOW_CPHA_LOW, ///< (CPOL = 0, CPHA = 0) 
+        SPI_MODE_CPOL_LOW_CPHA_LOW, ///< (CPOL = 0, CPHA = 0)
         SPI_MODE_CPOL_LOW_CPHA_HIGH,///< (CPOL = 0, CPHA = 1)
         SPI_MODE_CPOL_HIGH_CPHA_LOW,///< (CPOL = 1, CPHA = 0)
         SPI_MODE_CPOL_HIGH_CPHA_HIGH,///< (CPOL = 1, CPHA = 1)
@@ -76,7 +76,7 @@ namespace Drv {
                       SpiFrequency clock,
                       SpiMode spiMode = SpiMode::SPI_MODE_CPOL_LOW_CPHA_LOW);
 
-        PRIVATE:
+        private:
 
             // ----------------------------------------------------------------------
             // Handler implementations for user-defined typed input ports

Drv/LinuxUartDriver/LinuxUartDriver.hpp

@@ -86,7 +86,7 @@ class LinuxUartDriver final : public LinuxUartDriverComponentBase {
     //!
     ~LinuxUartDriver();
 
-  PRIVATE:
+  private:
     // ----------------------------------------------------------------------
     // Handler implementations for user-defined typed input ports
     // ----------------------------------------------------------------------