Skip to content

Commit 273961a

Browse files
ramya-subramanyamramya-subramanyam
committed
./libraries: cores/psoc6: Format pointer alignment and include files.
Signed-off-by: Ramya Subramanyam <[email protected]>
1 parent 867bf24 commit 273961a

File tree

16 files changed

+122
-122
lines changed

16 files changed

+122
-122
lines changed

‎cores/psoc6/Uart.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#undef Serial
66
#endif
77

8-
Uart *Uart::g_uarts[MAX_UARTS] = {nullptr};
8+
Uart* Uart::g_uarts[MAX_UARTS] = {nullptr};
99

1010
Uart::Uart(cyhal_gpio_t tx, cyhal_gpio_t rx, cyhal_gpio_t cts, cyhal_gpio_t rts)
1111
: tx_pin(tx),
@@ -120,16 +120,16 @@ size_t Uart::write(uint8_t c) {
120120
return 1;
121121
}
122122

123-
size_t Uart::write(const uint8_t *buffer, size_t size) {
124-
cy_rslt_t result = cyhal_uart_write(&uart_obj, (void *)buffer, &size);
123+
size_t Uart::write(const uint8_t* buffer, size_t size) {
124+
cy_rslt_t result = cyhal_uart_write(&uart_obj, (void*)buffer, &size);
125125
if (result != CY_RSLT_SUCCESS) {
126126
return 0;
127127
}
128128
return size;
129129
}
130130

131-
void Uart::uart_event_handler(void *handler_arg, cyhal_uart_event_t event) {
132-
Uart *uart = static_cast<Uart *>(handler_arg);
131+
void Uart::uart_event_handler(void* handler_arg, cyhal_uart_event_t event) {
132+
Uart* uart = static_cast<Uart*>(handler_arg);
133133
uart->IrqHandler();
134134
}
135135

‎cores/psoc6/Uart.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ enum { MAX_UARTS = 10 };
99

1010
class Uart : public arduino::HardwareSerial {
1111
public:
12-
static Uart *g_uarts[MAX_UARTS];
12+
static Uart* g_uarts[MAX_UARTS];
1313
Uart(cyhal_gpio_t tx, cyhal_gpio_t rx, cyhal_gpio_t cts, cyhal_gpio_t rts);
1414
void begin(unsigned long baud) override;
1515
void begin(unsigned long baud, uint16_t config) override;
@@ -20,7 +20,7 @@ class Uart : public arduino::HardwareSerial {
2020
int read() override;
2121
void flush() override;
2222
size_t write(uint8_t c) override;
23-
virtual size_t write(const uint8_t *buffer, size_t size);
23+
virtual size_t write(const uint8_t* buffer, size_t size);
2424

2525
size_t write(unsigned long n) {
2626
return write(static_cast<uint8_t>(n));
@@ -44,7 +44,7 @@ class Uart : public arduino::HardwareSerial {
4444
return true;
4545
}
4646

47-
static void uart_event_handler(void *handler_arg, cyhal_uart_event_t event);
47+
static void uart_event_handler(void* handler_arg, cyhal_uart_event_t event);
4848

4949
private:
5050
cyhal_gpio_t tx_pin{};

‎cores/psoc6/interrupts.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void attachInterrupt(pin_size_t interruptNumber, voidFuncPtr callback, PinStatus
5353
break;
5454
}
5555

56-
gpio_callback_data.callback = (void (*)(void *, cyhal_gpio_event_t))callback;
56+
gpio_callback_data.callback = (void (*)(void*, cyhal_gpio_event_t))callback;
5757
cyhal_gpio_register_callback(pin, &gpio_callback_data);
5858
cyhal_gpio_enable_event(pin, event, GPIO_INTERRUPT_PRIORITY, true);
5959
}

‎cores/psoc6/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
TaskHandle_t arduino_main_task_handle;
3434

35-
void arduino_main_task(void *arg);
35+
void arduino_main_task(void* arg);
3636

3737
// Weak empty variant initialization function.
3838
// May be redefined by variant files.
@@ -63,7 +63,7 @@ int main() {
6363
return 0;
6464
}
6565

66-
void arduino_main_task(void *arg) {
66+
void arduino_main_task(void* arg) {
6767

6868
/* Enable global interrupts */
6969
interrupts();

‎libraries/SPI/src/SPI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ uint16_t SPIClassPSOC::transfer16(uint16_t data) {
104104
return data_in_out.val;
105105
}
106106

107-
void SPIClassPSOC::transfer(void *buf, size_t count) {
108-
uint8_t *buffer = reinterpret_cast<uint8_t *>(buf);
107+
void SPIClassPSOC::transfer(void* buf, size_t count) {
108+
uint8_t* buffer = reinterpret_cast<uint8_t*>(buf);
109109
for (size_t i = 0; i < count; i++) {
110110
*buffer = transfer(*buffer);
111111
buffer++;

‎libraries/SPI/src/SPI.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef SPI_H
22
#define SPI_H
33

4+
#include "Arduino.h"
5+
#include "HardwareSPI.h"
46
#include "cyhal_spi.h"
5-
#include <Arduino.h>
6-
#include <HardwareSPI.h>
77

88
class SPIClassPSOC : public arduino::HardwareSPI {
99
public:
@@ -12,7 +12,7 @@ class SPIClassPSOC : public arduino::HardwareSPI {
1212

1313
virtual byte transfer(uint8_t data);
1414
virtual uint16_t transfer16(uint16_t data);
15-
virtual void transfer(void *buf, size_t count);
15+
virtual void transfer(void* buf, size_t count);
1616

1717
virtual void usingInterrupt(int interruptNumber);
1818
virtual void notUsingInterrupt(int interruptNumber);

‎libraries/WiFi/src/SecSocket.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ void Socket::setTimeout(uint32_t timeout) {
4848
socket_assert(_last_error);
4949
}
5050

51-
void Socket::setConnectOptCallback(cy_socket_callback_t cback, void *arg) {
51+
void Socket::setConnectOptCallback(cy_socket_callback_t cback, void* arg) {
5252
setOptCallback(CY_SOCKET_SO_CONNECT_REQUEST_CALLBACK, cback, arg);
5353
}
5454

55-
void Socket::setReceiveOptCallback(cy_socket_callback_t cback, void *arg) {
55+
void Socket::setReceiveOptCallback(cy_socket_callback_t cback, void* arg) {
5656
setOptCallback(CY_SOCKET_SO_RECEIVE_CALLBACK, cback, arg);
5757
}
5858

59-
void Socket::setDisconnectOptCallback(cy_socket_callback_t cback, void *arg) {
59+
void Socket::setDisconnectOptCallback(cy_socket_callback_t cback, void* arg) {
6060
setOptCallback(CY_SOCKET_SO_DISCONNECT_CALLBACK, cback, arg);
6161
}
6262

@@ -80,7 +80,7 @@ bool Socket::connect(IPAddress ip, uint16_t port) {
8080
return connect(&address);
8181
}
8282

83-
bool Socket::connect(const char *host, uint16_t port) {
83+
bool Socket::connect(const char* host, uint16_t port) {
8484
cy_socket_sockaddr_t address = {.port = port, .ip_address = {.version = CY_SOCKET_IP_VER_V4}};
8585
_last_error = cy_socket_gethostbyname(host, CY_SOCKET_IP_VER_V4, &(address.ip_address));
8686
if (_last_error != CY_RSLT_SUCCESS) {
@@ -98,7 +98,7 @@ void Socket::listen(int max_connections) {
9898
_status = SOCKET_STATUS_LISTENING;
9999
}
100100

101-
bool Socket::accept(Socket &client_socket) {
101+
bool Socket::accept(Socket& client_socket) {
102102
cy_socket_sockaddr_t peer_addr;
103103
uint32_t peer_addr_len;
104104

@@ -121,7 +121,7 @@ bool Socket::accept(Socket &client_socket) {
121121
return true;
122122
}
123123

124-
uint32_t Socket::send(const void *data, uint32_t len) {
124+
uint32_t Socket::send(const void* data, uint32_t len) {
125125
uint32_t bytes_sent = 0;
126126
_last_error = cy_socket_send(socket, data, len, CY_SOCKET_FLAGS_NONE, &bytes_sent);
127127
if (_last_error != CY_RSLT_SUCCESS) {
@@ -143,7 +143,7 @@ int Socket::peek() {
143143
return rx_buf.peek();
144144
}
145145

146-
uint32_t Socket::receive(uint8_t *data, uint32_t len) {
146+
uint32_t Socket::receive(uint8_t* data, uint32_t len) {
147147
uint32_t bytes_to_read = (uint32_t)rx_buf.available() > len ? len : rx_buf.available();
148148

149149
for (uint32_t i = 0; i < bytes_to_read; i++) {
@@ -165,7 +165,7 @@ uint16_t Socket::port() {
165165
return _port;
166166
}
167167

168-
int Socket::hostByName(const char *aHostname, IPAddress &ip) {
168+
int Socket::hostByName(const char* aHostname, IPAddress& ip) {
169169
cy_socket_sockaddr_t address;
170170

171171
cy_rslt_t ret = cy_socket_gethostbyname(aHostname, CY_SOCKET_IP_VER_V4, &(address.ip_address));
@@ -186,7 +186,7 @@ cy_rslt_t Socket::getLastError() {
186186
return _last_error;
187187
}
188188

189-
bool Socket::connect(cy_socket_sockaddr_t *addr) {
189+
bool Socket::connect(cy_socket_sockaddr_t* addr) {
190190
_last_error = cy_socket_connect(socket, addr, sizeof(cy_socket_sockaddr_t));
191191
if (_last_error != CY_RSLT_SUCCESS) {
192192
_status = SOCKET_STATUS_ERROR;
@@ -216,7 +216,7 @@ void Socket::receiveCallback() {
216216
}
217217
}
218218

219-
void Socket::setOptCallback(int optname, cy_socket_callback_t cback, void *arg) {
219+
void Socket::setOptCallback(int optname, cy_socket_callback_t cback, void* arg) {
220220
cy_socket_opt_callback_t cy_opt_callback;
221221

222222
cy_opt_callback.callback = cback;

‎libraries/WiFi/src/SecSocket.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef SECSOCKET_H
2-
#define SECSOCKET_H
1+
#ifndef CY_SECURE_SOCKET_H
2+
#define CY_SECURE_SOCKET_H
33

44
#include "IPAddress.h"
55
#include "RingBuffer.h"
@@ -26,26 +26,26 @@ class Socket {
2626
void end();
2727

2828
void setTimeout(uint32_t timeout);
29-
void setConnectOptCallback(cy_socket_callback_t cback, void *arg);
30-
void setReceiveOptCallback(cy_socket_callback_t cback, void *arg);
31-
void setDisconnectOptCallback(cy_socket_callback_t cback, void *arg);
29+
void setConnectOptCallback(cy_socket_callback_t cback, void* arg);
30+
void setReceiveOptCallback(cy_socket_callback_t cback, void* arg);
31+
void setDisconnectOptCallback(cy_socket_callback_t cback, void* arg);
3232

3333
void bind(uint16_t port);
3434
bool connect(IPAddress ip, uint16_t port);
35-
bool connect(const char *host, uint16_t port);
35+
bool connect(const char* host, uint16_t port);
3636

3737
void listen(int max_connections);
38-
bool accept(Socket &client_socket);
39-
uint32_t send(const void *data, uint32_t len);
38+
bool accept(Socket& client_socket);
39+
uint32_t send(const void* data, uint32_t len);
4040
uint32_t available();
4141
int peek();
42-
uint32_t receive(uint8_t *data, uint32_t len);
42+
uint32_t receive(uint8_t* data, uint32_t len);
4343
void flush();
4444

4545
IPAddress remoteIP();
4646
uint16_t port();
4747

48-
static int hostByName(const char *aHostname, IPAddress &ip);
48+
static int hostByName(const char* aHostname, IPAddress& ip);
4949

5050
uint8_t status();
5151
cy_rslt_t getLastError();
@@ -58,12 +58,12 @@ class Socket {
5858
IPAddress remote_ip;
5959
uint16_t _port;
6060

61-
void setOptCallback(int optname, cy_socket_callback_t cback, void *arg);
61+
void setOptCallback(int optname, cy_socket_callback_t cback, void* arg);
6262

6363
static const uint16_t RX_BUFFER_SIZE = 256;
6464
arduino::RingBufferN<RX_BUFFER_SIZE> rx_buf;
6565

66-
bool connect(cy_socket_sockaddr_t *addr);
66+
bool connect(cy_socket_sockaddr_t* addr);
6767
void receiveCallback();
6868

6969
static bool global_socket_initialized;
@@ -75,4 +75,4 @@ class Socket {
7575
friend class WiFiClient;
7676
};
7777

78-
#endif /* SECSOCKET_H */
78+
#endif /* CY_SECURE_SOCKET_H */

‎libraries/WiFi/src/WiFi.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
#include "WiFi.h"
12
#include "SecSocket.h"
2-
#include <WiFi.h>
33

44
#define wcm_assert_raise(cy_ret, ret_code) \
55
if (cy_ret != CY_RSLT_SUCCESS) { \
@@ -19,16 +19,16 @@
1919
return ret_code; \
2020
}
2121

22-
WiFiClass &WiFiClass::get_instance() {
22+
WiFiClass& WiFiClass::get_instance() {
2323
static WiFiClass wifi_singleton;
2424
return wifi_singleton;
2525
}
2626

27-
int WiFiClass::begin(const char *ssid) {
27+
int WiFiClass::begin(const char* ssid) {
2828
return begin(ssid, nullptr);
2929
}
3030

31-
int WiFiClass::begin(const char *ssid, const char *passphrase) {
31+
int WiFiClass::begin(const char* ssid, const char* passphrase) {
3232
_last_error = wcm_init(CY_WCM_INTERFACE_TYPE_STA);
3333
wifi_assert_raise(_last_error);
3434

@@ -73,19 +73,19 @@ void WiFiClass::end(void) {
7373
_status = WIFI_STATUS_UNINITED;
7474
}
7575

76-
uint8_t WiFiClass::beginAP(const char *ssid) {
76+
uint8_t WiFiClass::beginAP(const char* ssid) {
7777
return beginAP(ssid, nullptr, 1);
7878
}
7979

80-
uint8_t WiFiClass::beginAP(const char *ssid, uint8_t channel) {
80+
uint8_t WiFiClass::beginAP(const char* ssid, uint8_t channel) {
8181
return beginAP(ssid, nullptr, channel);
8282
}
8383

84-
uint8_t WiFiClass::beginAP(const char *ssid, const char *passphrase) {
84+
uint8_t WiFiClass::beginAP(const char* ssid, const char* passphrase) {
8585
return beginAP(ssid, passphrase, 1);
8686
}
8787

88-
uint8_t WiFiClass::beginAP(const char *ssid, const char *passphrase, uint8_t channel) {
88+
uint8_t WiFiClass::beginAP(const char* ssid, const char* passphrase, uint8_t channel) {
8989
_last_error = wcm_init(CY_WCM_INTERFACE_TYPE_AP);
9090
wifi_assert_raise(_last_error);
9191

@@ -149,7 +149,7 @@ uint8_t WiFiClass::status() {
149149
return _status;
150150
}
151151

152-
int WiFiClass::hostByName(const char *aHostname, IPAddress &ip) {
152+
int WiFiClass::hostByName(const char* aHostname, IPAddress& ip) {
153153
return Socket::hostByName(aHostname, ip);
154154
}
155155

@@ -205,9 +205,9 @@ int WiFiClass::disconnect_ap(void) {
205205
return WIFI_ERROR_STATUS_INVALID;
206206
}
207207

208-
void WiFiClass::set_sta_connect_params(cy_wcm_connect_params_t *connect_params,
209-
const char *ssid,
210-
const char *passphrase) {
208+
void WiFiClass::set_sta_connect_params(cy_wcm_connect_params_t* connect_params,
209+
const char* ssid,
210+
const char* passphrase) {
211211
/* Initialized all connect params to zero */
212212
memset(connect_params, 0, sizeof(cy_wcm_connect_params_t));
213213

@@ -222,9 +222,9 @@ void WiFiClass::set_sta_connect_params(cy_wcm_connect_params_t *connect_params,
222222
}
223223
}
224224

225-
void WiFiClass::set_ap_params(cy_wcm_ap_config_t *ap_config,
226-
const char *ssid,
227-
const char *passphrase,
225+
void WiFiClass::set_ap_params(cy_wcm_ap_config_t* ap_config,
226+
const char* ssid,
227+
const char* passphrase,
228228
uint8_t channel) {
229229
/* Initialized all AP config params to zero */
230230
memset(ap_config, 0, sizeof(cy_wcm_ap_config_t));
@@ -242,4 +242,4 @@ void WiFiClass::set_ap_params(cy_wcm_ap_config_t *ap_config,
242242
}
243243
}
244244

245-
WiFiClass &WiFi = WiFiClass::get_instance();
245+
WiFiClass& WiFi = WiFiClass::get_instance();

0 commit comments

Comments
 (0)