Skip to content

Commit a8d8bd6

Browse files
Tharazi97Tharazi97
committed
Astyle
1 parent 17a4c1b commit a8d8bd6

File tree

4 files changed

+57
-45
lines changed

4 files changed

+57
-45
lines changed

‎TESTS/mbed-crypto/sanity/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,4 +460,4 @@ int main(void)
460460
{
461461
return !Harness::run(specification);
462462
}
463-
#endif // ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
463+
#endif // ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))

‎TESTS/network/emac/main.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ int main()
8484
}
8585

8686
#endif // (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI) && \
87-
!defined(TARGET_UBLOX_EVK_ODIN_W2) && \
88-
!defined(TARGET_REALTEK_RTL8195AM) && \
89-
!defined(TARGET_MTB_ADV_WISE_1530) && \
90-
!defined(TARGET_MTB_USI_WM_BN_BM_22) && \
91-
!defined(TARGET_MTB_MXCHIP_EMW3166) && \
92-
!defined(TARGET_MTB_UBLOX_ODIN_W2) && \
93-
!defined(TARGET_UNO_91H)
87+
!defined(TARGET_UBLOX_EVK_ODIN_W2) && \
88+
!defined(TARGET_REALTEK_RTL8195AM) && \
89+
!defined(TARGET_MTB_ADV_WISE_1530) && \
90+
!defined(TARGET_MTB_USI_WM_BN_BM_22) && \
91+
!defined(TARGET_MTB_MXCHIP_EMW3166) && \
92+
!defined(TARGET_MTB_UBLOX_ODIN_W2) && \
93+
!defined(TARGET_UNO_91H)
9494

9595
#endif // MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != ETHERNET && MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != WIFI
9696
#endif // !defined(MBED_CONF_APP_ECHO_SERVER) || !defined(MBED_CONF_APP_ECHO_SERVER_TRACE) || !defined(MBED_CONF_APP_WIFI_SCAN)

‎TESTS/network/wifi/main.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ int main()
9393
return !Harness::run(specification);
9494
}
9595
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) && \
96-
!defined(MBED_CONF_APP_AP_MAC_UNSECURE) || \
97-
!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \
98-
!defined(MBED_CONF_APP_WIFI_CH_UNSECURE) || \
99-
!defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
96+
!defined(MBED_CONF_APP_AP_MAC_UNSECURE) || \
97+
!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \
98+
!defined(MBED_CONF_APP_WIFI_CH_UNSECURE) || \
99+
!defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
100100

101101
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID) && \
102-
(!defined(MBED_CONF_APP_AP_MAC_SECURE) || \
103-
!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \
104-
!defined(MBED_CONF_APP_WIFI_CH_SECURE) || \
105-
!defined(MBED_CONF_APP_WIFI_PASSWORD) || \
106-
!defined(MBED_CONF_APP_WIFI_SECURE_SSID) || \
107-
!defined MBED_CONF_APP_WIFI_SECURE_PROTOCOL)
108-
102+
(!defined(MBED_CONF_APP_AP_MAC_SECURE) || \
103+
!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \
104+
!defined(MBED_CONF_APP_WIFI_CH_SECURE) || \
105+
!defined(MBED_CONF_APP_WIFI_PASSWORD) || \
106+
!defined(MBED_CONF_APP_WIFI_SECURE_SSID) || \
107+
!defined MBED_CONF_APP_WIFI_SECURE_PROTOCOL)
108+
109109
#endif //!defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != WIFI

‎features/FEATURE_BLE/targets/TARGET_CORDIO/TESTS/cordio_hci/transport/main.cpp

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ using namespace utest::v1;
3131
using ble::vendor::cordio::CordioHCIDriver;
3232
using ble::vendor::cordio::CordioHCITransportDriver;
3333

34-
extern ble::vendor::cordio::CordioHCIDriver& ble_cordio_get_hci_driver();
34+
extern ble::vendor::cordio::CordioHCIDriver &ble_cordio_get_hci_driver();
3535

3636
#if CORDIO_ZERO_COPY_HCI
3737
#error [NOT_SUPPORTED] Test not relevant for zero copy hci.
@@ -42,15 +42,18 @@ namespace vendor {
4242
namespace cordio {
4343

4444
struct CordioHCIHook {
45-
static CordioHCIDriver& get_driver() {
45+
static CordioHCIDriver &get_driver()
46+
{
4647
return ble_cordio_get_hci_driver();
4748
}
4849

49-
static CordioHCITransportDriver& get_transport_driver() {
50+
static CordioHCITransportDriver &get_transport_driver()
51+
{
5052
return get_driver()._transport_driver;
5153
}
5254

53-
static void set_data_received_handler(void (*handler)(uint8_t*, uint8_t)) {
55+
static void set_data_received_handler(void (*handler)(uint8_t *, uint8_t))
56+
{
5457
get_transport_driver().set_data_received_handler(handler);
5558
}
5659
};
@@ -75,22 +78,24 @@ static const uint32_t WAITING_FLAGS =
7578

7679
static rtos::EventFlags event_channel;
7780

78-
static void signal_flag(uint32_t flag) {
81+
static void signal_flag(uint32_t flag)
82+
{
7983
if (!(event_channel.get() & flag)) {
8084
event_channel.set(flag);
8185
}
8286
}
8387

84-
uint32_t wait_for_event() {
88+
uint32_t wait_for_event()
89+
{
8590
// clear reception flags
8691
uint32_t flags = event_channel.get();
8792
event_channel.clear(flags & ~RESET_RECEIVED_FLAG);
8893

8994
return event_channel.wait_any(
90-
WAITING_FLAGS,
91-
/* timeout */ RESET_COMMAND_TIMEOUT,
92-
/* clear */ false
93-
);
95+
WAITING_FLAGS,
96+
/* timeout */ RESET_COMMAND_TIMEOUT,
97+
/* clear */ false
98+
);
9499
}
95100

96101
//
@@ -104,7 +109,8 @@ uint32_t wait_for_event() {
104109
#define RESET_PACKET_LENGTH (1 + HCI_EVT_HDR_LEN + RESET_PARAMETER_LENGTH)
105110
#define RESET_STATUS_INDEX 6
106111

107-
static bool is_reset_event(const uint8_t* data, uint16_t len) {
112+
static bool is_reset_event(const uint8_t *data, uint16_t len)
113+
{
108114
if (len != RESET_PACKET_LENGTH) {
109115
return false;
110116
}
@@ -135,7 +141,8 @@ static bool is_reset_event(const uint8_t* data, uint16_t len) {
135141
return true;
136142
}
137143

138-
static void hci_driver_rx_reset_handler(uint8_t* data, uint8_t len) {
144+
static void hci_driver_rx_reset_handler(uint8_t *data, uint8_t len)
145+
{
139146
enum packet_state_t {
140147
WAITING_FOR_PACKET_TYPE,
141148
WAITING_FOR_HEADER_COMPLETE,
@@ -166,19 +173,20 @@ static void hci_driver_rx_reset_handler(uint8_t* data, uint8_t len) {
166173

167174
case WAITING_FOR_HEADER_COMPLETE:
168175
case WAITING_FOR_DATA_COMPLETE: {
169-
uint16_t step = std::min((uint16_t) len, (uint16_t) (packet_length - position));
176+
uint16_t step = std::min((uint16_t) len, (uint16_t)(packet_length - position));
170177
memcpy(packet + position, data, step);
171-
position+= step;
178+
position += step;
172179
data += step;
173180
len -= step;
174181

175182
if (reception_state == WAITING_FOR_HEADER_COMPLETE &&
176-
position == packet_length
177-
) {
183+
position == packet_length
184+
) {
178185
reception_state = WAITING_FOR_DATA_COMPLETE;
179186
packet_length += packet[HCI_EVT_HDR_LEN];
180187
}
181-
} break;
188+
}
189+
break;
182190

183191

184192
// dead end; we never exit from the error state; just asignal it again.
@@ -192,7 +200,7 @@ static void hci_driver_rx_reset_handler(uint8_t* data, uint8_t len) {
192200
}
193201

194202
bool packet_complete = (reception_state == WAITING_FOR_DATA_COMPLETE) &&
195-
(position == packet_length);
203+
(position == packet_length);
196204

197205
if (packet_complete) {
198206
if (is_reset_event(packet, packet_length)) {
@@ -217,9 +225,10 @@ static uint8_t reset_cmd[] = {
217225
0 // parameter length
218226
};
219227

220-
void test_reset_command() {
221-
CordioHCIDriver& driver = CordioHCIHook::get_driver();
222-
CordioHCITransportDriver& transport_driver = CordioHCIHook::get_transport_driver();
228+
void test_reset_command()
229+
{
230+
CordioHCIDriver &driver = CordioHCIHook::get_driver();
231+
CordioHCITransportDriver &transport_driver = CordioHCIHook::get_transport_driver();
223232

224233
driver.initialize();
225234

@@ -235,9 +244,10 @@ void test_reset_command() {
235244

236245
#define EXPECTED_CONSECUTIVE_RESET 10
237246

238-
void test_multiple_reset_command() {
239-
CordioHCIDriver& driver = CordioHCIHook::get_driver();
240-
CordioHCITransportDriver& transport_driver = CordioHCIHook::get_transport_driver();
247+
void test_multiple_reset_command()
248+
{
249+
CordioHCIDriver &driver = CordioHCIHook::get_driver();
250+
CordioHCITransportDriver &transport_driver = CordioHCIHook::get_transport_driver();
241251

242252
driver.initialize();
243253

@@ -260,14 +270,16 @@ Case cases[] = {
260270
Case("Test multiple reset commands", test_multiple_reset_command)
261271
};
262272

263-
utest::v1::status_t greentea_test_setup(const size_t number_of_cases) {
273+
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
274+
{
264275
GREENTEA_SETUP(15, "default_auto");
265276
return verbose_test_setup_handler(number_of_cases);
266277
}
267278

268279
Specification specification(greentea_test_setup, cases, greentea_test_teardown_handler);
269280

270-
int main() {
281+
int main()
282+
{
271283
return !Harness::run(specification);
272284
}
273285
#endif // CORDIO_ZERO_COPY_HCI

0 commit comments

Comments
 (0)