cores/psoc6: libraries: Fix unint and misra config errors.

Signed-off-by: Ramya Subramanyam <[email protected]>

Author: ramya-subramanyam

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     hooks:
       - id: codeformat-c-cpp
         name: Running clang formatter for changed C/ C++ files
-        entry: extras/makers-devops/tools/code_checks/run_clang_format.sh ./cores/psoc/* 
+        entry: extras/makers-devops/tools/code_checks/run_clang_format.sh ./cores/psoc/* ./libraries/*
         language: system
       - id: codeformat-python
         name: Running black formatter for changed python scripts files

config/project.yml

@@ -15,6 +15,8 @@ check:
       tool: cppcheck
       command: extras/makers-devops/tools/code_checks/run_cppcheck.sh ./cores/psoc6/* ./libraries/*  
                | -I extras/arduino-core-api/api/ -I variants/CY8CKIT-062S2-AI/mtb-bsp -I extras/mtb-libs/core-lib/include 
+               | -I libraries/WiFi/src -I libraries/Wire/src -I libraries/SPI/src -I extras/mtb-libs/mtb-hal-cat1/include
+               | -I variants/CY8CKIT-062S2-AI -I cores/psoc6 --suppress=*:variants/CY8CKIT-062S2-AI/* --suppress=*:extras/mtb-libs/mtb-hal-cat1/include/*
                | --suppress=*:extras/arduino-core-api/api/* --suppress=*:variants/CY8CKIT-062S2-AI/mtb-bsp/* --suppress=*:extras/mtb-libs/core-lib/include/*
 
     clang-format:

cores/psoc6/Arduino.h

@@ -62,6 +62,10 @@ enum {
 
 #define abs(x) ((x) > 0 ? (x) : -(x))
 
+#ifndef nullptr
+    #define nullptr 0
+#endif
+
 // Globally enable or disable interrupts
 #define interrupts() __enable_irq()
 #define noInterrupts() __disable_irq()

libraries/SPI/src/SPI.cpp

@@ -1,12 +1,21 @@
 #include "SPI.h"
 
-#define spi_assert(cy_ret)   if (cy_ret != CY_RSLT_SUCCESS) { \
-            return; \
-}
-
+#define spi_assert(cy_ret)           \
+    if (cy_ret != CY_RSLT_SUCCESS) { \
+        return;                      \
+    }
 
-SPIClassPSOC::SPIClassPSOC(cyhal_gpio_t mosi, cyhal_gpio_t miso, cyhal_gpio_t sck, cyhal_gpio_t ssel)
-    : _mosi_pin(mosi), _miso_pin(miso), _sck_pin(sck), _ssel_pin(ssel), _is_initialized(false), _is_slave(false) {
+SPIClassPSOC::SPIClassPSOC(cyhal_gpio_t mosi,
+                           cyhal_gpio_t miso,
+                           cyhal_gpio_t sck,
+                           cyhal_gpio_t ssel)
+    : _mosi_pin(mosi),
+      _miso_pin(miso),
+      _sck_pin(sck),
+      _ssel_pin(ssel),
+      _is_initialized(false),
+      _is_slave(false),
+      status(CY_RSLT_SUCCESS) {
 }
 
 SPIClassPSOC::~SPIClassPSOC() {
@@ -19,7 +28,8 @@ void SPIClassPSOC::begin() {
         return;
     }
 
-    status = cyhal_spi_init(&_spi_obj, _mosi_pin, _miso_pin, _sck_pin, _ssel_pin, NULL, 8, getSpiMode(), _is_slave);
+    status = cyhal_spi_init(&_spi_obj, _mosi_pin, _miso_pin, _sck_pin, _ssel_pin, NULL, 8,
+                            getSpiMode(), _is_slave);
     spi_assert(status);
     status = cyhal_spi_set_frequency(&_spi_obj, _settings.getClockFreq());
     spi_assert(status);
@@ -40,16 +50,20 @@ cyhal_spi_mode_t SPIClassPSOC::getSpiMode() const {
 
     switch (_settings.getDataMode()) {
         case SPI_MODE0:
-            mode = (_settings.getBitOrder() == MSBFIRST) ? CYHAL_SPI_MODE_00_MSB : CYHAL_SPI_MODE_00_LSB;
+            mode = (_settings.getBitOrder() == MSBFIRST) ? CYHAL_SPI_MODE_00_MSB
+                                                         : CYHAL_SPI_MODE_00_LSB;
             break;
         case SPI_MODE1:
-            mode = (_settings.getBitOrder() == MSBFIRST) ? CYHAL_SPI_MODE_01_MSB : CYHAL_SPI_MODE_01_LSB;
+            mode = (_settings.getBitOrder() == MSBFIRST) ? CYHAL_SPI_MODE_01_MSB
+                                                         : CYHAL_SPI_MODE_01_LSB;
             break;
         case SPI_MODE2:
-            mode = (_settings.getBitOrder() == MSBFIRST) ? CYHAL_SPI_MODE_10_MSB : CYHAL_SPI_MODE_10_LSB;
+            mode = (_settings.getBitOrder() == MSBFIRST) ? CYHAL_SPI_MODE_10_MSB
+                                                         : CYHAL_SPI_MODE_10_LSB;
             break;
         case SPI_MODE3:
-            mode = (_settings.getBitOrder() == MSBFIRST) ? CYHAL_SPI_MODE_11_MSB : CYHAL_SPI_MODE_11_LSB;
+            mode = (_settings.getBitOrder() == MSBFIRST) ? CYHAL_SPI_MODE_11_MSB
+                                                         : CYHAL_SPI_MODE_11_LSB;
             break;
         default:
             break;
@@ -67,11 +81,14 @@ byte SPIClassPSOC::transfer(uint8_t data) {
 }
 
 uint16_t SPIClassPSOC::transfer16(uint16_t data) {
-// Union to split 16-bit data into two 8-bit data
-    union { uint16_t val;
-            struct { uint8_t lsb;
-                     uint8_t msb;
-            };
+    // Union to split 16-bit data into two 8-bit data
+    union {
+        uint16_t val;
+
+        struct {
+            uint8_t lsb;
+            uint8_t msb;
+        };
     } data_in_out;
 
     data_in_out.val = data;
@@ -88,27 +105,27 @@ uint16_t SPIClassPSOC::transfer16(uint16_t data) {
 }
 
 void SPIClassPSOC::transfer(void *buf, size_t count) {
-    uint8_t *buffer = reinterpret_cast < uint8_t * > (buf);
+    uint8_t *buffer = reinterpret_cast<uint8_t *>(buf);
     for (size_t i = 0; i < count; i++) {
         *buffer = transfer(*buffer);
         buffer++;
     }
 }
 
 void SPIClassPSOC::usingInterrupt(int interruptNumber) {
-// TODO: Implement
+    // TODO: Implement
 }
 
 void SPIClassPSOC::notUsingInterrupt(int interruptNumber) {
-// TODO: Implement
+    // TODO: Implement
 }
 
 void SPIClassPSOC::attachInterrupt() {
-// TODO: Implement
+    // TODO: Implement
 }
 
 void SPIClassPSOC::detachInterrupt() {
-// TODO: Implement
+    // TODO: Implement
 }
 
 void SPIClassPSOC::beginTransaction(arduino::SPISettings settings) {
@@ -117,6 +134,7 @@ void SPIClassPSOC::beginTransaction(arduino::SPISettings settings) {
         begin();
     }
 }
+
 void SPIClassPSOC::endTransaction() {
     end();
 }

libraries/SPI/src/SPI.h

@@ -1,11 +1,11 @@
 #ifndef SPI_H
 #define SPI_H
 
-#include <Arduino.h>
 #include "cyhal_spi.h"
+#include <Arduino.h>
 #include <HardwareSPI.h>
 
-class SPIClassPSOC: public arduino::HardwareSPI {
+class SPIClassPSOC : public arduino::HardwareSPI {
 public:
     SPIClassPSOC(cyhal_gpio_t mosi, cyhal_gpio_t miso, cyhal_gpio_t sck, cyhal_gpio_t ssel);
     ~SPIClassPSOC();
@@ -28,7 +28,8 @@ class SPIClassPSOC: public arduino::HardwareSPI {
     cy_rslt_t status;
 
 private:
-    arduino::SPISettings const DEFAULT_SPI_SETTINGS = arduino::SPISettings(1000000, MSBFIRST, arduino::SPI_MODE0);
+    arduino::SPISettings const DEFAULT_SPI_SETTINGS =
+        arduino::SPISettings(1000000, MSBFIRST, arduino::SPI_MODE0);
 
     cyhal_spi_mode_t getSpiMode() const;
 

libraries/WiFi/src/SecSocket.cpp

@@ -1,20 +1,15 @@
-#include <SecSocket.h>
+#include "SecSocket.h"
 
-#define socket_assert(cy_ret)   if (cy_ret != CY_RSLT_SUCCESS) { \
-            _status = SOCKET_STATUS_ERROR; \
-            return; \
-}
-
-#define socket_assert_raise(cy_ret)   if (cy_ret != CY_RSLT_SUCCESS) { \
-            return cy_ret; \
-}
+#define socket_assert(cy_ret)          \
+    if (cy_ret != CY_RSLT_SUCCESS) {   \
+        _status = SOCKET_STATUS_ERROR; \
+        return;                        \
+    }
 
-Socket::Socket():
-    socket(nullptr),
-    _status(SOCKET_STATUS_UNINITED),
-    _last_error(CY_RSLT_SUCCESS),
-    remote_ip(0, 0, 0, 0),
-    _port(0) {
+#define socket_assert_raise(cy_ret)  \
+    if (cy_ret != CY_RSLT_SUCCESS) { \
+        return cy_ret;               \
+    }
 
 Socket::Socket()
     : socket(nullptr),
@@ -29,7 +24,7 @@ void Socket::begin() {
     socket_assert(_last_error);
 
     _last_error = cy_socket_create(CY_SOCKET_DOMAIN_AF_INET, CY_SOCKET_TYPE_STREAM,
-        CY_SOCKET_IPPROTO_TCP, &socket);
+                                   CY_SOCKET_IPPROTO_TCP, &socket);
     socket_assert(_last_error);
 
     _status = SOCKET_STATUS_CREATED;
@@ -48,9 +43,8 @@ void Socket::end() {
 }
 
 void Socket::setTimeout(uint32_t timeout) {
-    _last_error = cy_socket_setsockopt(socket, CY_SOCKET_SOL_SOCKET,
-        CY_SOCKET_SO_RCVTIMEO, &timeout,
-        sizeof(timeout));
+    _last_error = cy_socket_setsockopt(socket, CY_SOCKET_SOL_SOCKET, CY_SOCKET_SO_RCVTIMEO,
+                                       &timeout, sizeof(timeout));
     socket_assert(_last_error);
 }
 
@@ -68,12 +62,7 @@ void Socket::setDisconnectOptCallback(cy_socket_callback_t cback, void *arg) {
 
 void Socket::bind(uint16_t port) {
     cy_socket_sockaddr_t address = {
-        .port = port,
-        .ip_address = {
-            .version = CY_SOCKET_IP_VER_V4,
-            .ip = { .v4 = 0 }
-        }
-    };
+        .port = port, .ip_address = {.version = CY_SOCKET_IP_VER_V4, .ip = {.v4 = 0}}};
 
     _last_error = cy_socket_bind(socket, &address, sizeof(cy_socket_sockaddr_t));
     socket_assert(_last_error);
@@ -86,23 +75,13 @@ void Socket::bind(uint16_t port) {
 bool Socket::connect(IPAddress ip, uint16_t port) {
     uint32_t ip_u32 = (ip[3] << 24) | (ip[2] << 16) | (ip[1] << 8) | ip[0];
     cy_socket_sockaddr_t address = {
-        .port = port,
-        .ip_address = {
-            .version = CY_SOCKET_IP_VER_V4,
-            .ip = { .v4 = ip_u32 }
-        }
-    };
+        .port = port, .ip_address = {.version = CY_SOCKET_IP_VER_V4, .ip = {.v4 = ip_u32}}};
 
     return connect(&address);
 }
 
 bool Socket::connect(const char *host, uint16_t port) {
-    cy_socket_sockaddr_t address = {
-        .port = port,
-        .ip_address = {
-            .version = CY_SOCKET_IP_VER_V4
-        }
-    };
+    cy_socket_sockaddr_t address = {.port = port, .ip_address = {.version = CY_SOCKET_IP_VER_V4}};
     _last_error = cy_socket_gethostbyname(host, CY_SOCKET_IP_VER_V4, &(address.ip_address));
     if (_last_error != CY_RSLT_SUCCESS) {
         _status = SOCKET_STATUS_ERROR;
@@ -144,14 +123,14 @@ bool Socket::accept(Socket &client_socket) {
 
 uint32_t Socket::send(const void *data, uint32_t len) {
     uint32_t bytes_sent = 0;
-    _last_error = cy_socket_send(socket, data, len,
-        CY_SOCKET_FLAGS_NONE, &bytes_sent);
+    _last_error = cy_socket_send(socket, data, len, CY_SOCKET_FLAGS_NONE, &bytes_sent);
     if (_last_error != CY_RSLT_SUCCESS) {
         _status = SOCKET_STATUS_ERROR;
     }
 
     return bytes_sent;
 }
+
 uint32_t Socket::available() {
     return rx_buf.available();
 }
@@ -186,7 +165,7 @@ uint16_t Socket::port() {
     return _port;
 }
 
-int Socket::hostByName(const char *aHostname, IPAddress& ip) {
+int Socket::hostByName(const char *aHostname, IPAddress &ip) {
     cy_socket_sockaddr_t address;
 
     cy_rslt_t ret = cy_socket_gethostbyname(aHostname, CY_SOCKET_IP_VER_V4, &(address.ip_address));
@@ -227,8 +206,8 @@ void Socket::receiveCallback() {
         uint8_t temp_rx_buff[bytes_rcvd_request] = {0};
 
         uint32_t bytes_received = 0;
-        _last_error = cy_socket_recv(socket, temp_rx_buff, bytes_rcvd_request,
-            CY_SOCKET_FLAGS_NONE, &bytes_received);
+        _last_error = cy_socket_recv(socket, temp_rx_buff, bytes_rcvd_request, CY_SOCKET_FLAGS_NONE,
+                                     &bytes_received);
         socket_assert(_last_error);
 
         for (uint32_t i = 0; i < bytes_received; i++) {
@@ -243,9 +222,8 @@ void Socket::setOptCallback(int optname, cy_socket_callback_t cback, void *arg)
     cy_opt_callback.callback = cback;
     cy_opt_callback.arg = arg;
 
-    _last_error = cy_socket_setsockopt(socket, CY_SOCKET_SOL_SOCKET,
-        optname,
-        &cy_opt_callback, sizeof(cy_socket_opt_callback_t));
+    _last_error = cy_socket_setsockopt(socket, CY_SOCKET_SOL_SOCKET, optname, &cy_opt_callback,
+                                       sizeof(cy_socket_opt_callback_t));
     socket_assert(_last_error);
 }
 

libraries/WiFi/src/SecSocket.h

@@ -1,8 +1,9 @@
-#ifndef CY_SECURE_SOCKET_H
-#define CY_SECURE_SOCKET_H
+#ifndef SECSOCKET_H
+#define SECSOCKET_H
 
 #include "IPAddress.h"
 #include "RingBuffer.h"
+#include "cy_result.h"
 #include "cy_secure_sockets.h"
 
 typedef enum {
@@ -74,4 +75,4 @@ class Socket {
     friend class WiFiClient;
 };
 
-#endif /* CY_SECURE_SOCKET_H */
+#endif /* SECSOCKET_H */