Skip to content

Commit 94d1b98

Browse files
author
Cruz Monrreal
authored
Merge pull request #7621 from 0xc0170/fix_cellular_style
cellular: astyle fix
2 parents d65e614 + 85ef7a0 commit 94d1b98

File tree

110 files changed

+984
-874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+984
-874
lines changed

‎features/cellular/TESTS/api/cellular_device/main.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@ static void open_close_interfaces()
5555
nw = device->open_network(NULL);
5656
TEST_ASSERT(nw == NULL);
5757

58-
CellularSIM* sim = device->open_sim(&cellular_serial);
58+
CellularSIM *sim = device->open_sim(&cellular_serial);
5959
TEST_ASSERT(sim != NULL);
6060
device->close_sim();
6161
sim = device->open_sim(NULL);
6262
TEST_ASSERT(sim == NULL);
6363

64-
CellularInformation* info = device->open_information(&cellular_serial);
64+
CellularInformation *info = device->open_information(&cellular_serial);
6565
TEST_ASSERT(info != NULL);
6666
device->close_information();
6767
info = device->open_information(NULL);
6868
TEST_ASSERT(info == NULL);
6969

70-
CellularPower* power = device->open_power(&cellular_serial);
70+
CellularPower *power = device->open_power(&cellular_serial);
7171
TEST_ASSERT(power != NULL);
7272
device->close_power();
7373
power = device->open_power(NULL);
7474
TEST_ASSERT(power == NULL);
7575

76-
CellularSMS* sms = device->open_sms(&cellular_serial);
76+
CellularSMS *sms = device->open_sms(&cellular_serial);
7777
TEST_ASSERT(sms != NULL);
7878
device->close_sms();
7979
sms = device->open_sms(NULL);
@@ -86,7 +86,7 @@ static void other_methods()
8686
device->set_timeout(5000);
8787
device->modem_debug_on(true);
8888
device->modem_debug_on(false);
89-
NetworkStack* stack = device->get_stack();
89+
NetworkStack *stack = device->get_stack();
9090
TEST_ASSERT(stack == NULL);
9191

9292
CellularNetwork *nw = device->open_network(&cellular_serial);
@@ -124,7 +124,7 @@ static Case cases[] = {
124124

125125
static utest::v1::status_t test_setup(const size_t number_of_cases)
126126
{
127-
GREENTEA_SETUP(10*60, "default_auto");
127+
GREENTEA_SETUP(10 * 60, "default_auto");
128128
return verbose_test_setup_handler(number_of_cases);
129129
}
130130

‎features/cellular/TESTS/api/cellular_information/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static void test_information_interface()
7676
{
7777
CellularInformation *info = cellular.get_device()->open_information(&cellular_serial);
7878
const int kbuf_size = 100;
79-
char *buf = (char*)malloc(sizeof(char) * kbuf_size);
79+
char *buf = (char *)malloc(sizeof(char) * kbuf_size);
8080

8181
TEST_ASSERT(info->get_manufacturer(buf, kbuf_size) == NSAPI_ERROR_OK);
8282
TEST_ASSERT(info->get_model(buf, kbuf_size) == NSAPI_ERROR_OK);
@@ -112,7 +112,7 @@ static Case cases[] = {
112112

113113
static utest::v1::status_t test_setup(const size_t number_of_cases)
114114
{
115-
GREENTEA_SETUP(10*60, "default_auto");
115+
GREENTEA_SETUP(10 * 60, "default_auto");
116116
return verbose_test_setup_handler(number_of_cases);
117117
}
118118

‎features/cellular/TESTS/api/cellular_network/main.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static rtos::Semaphore network_semaphore(0);
5151
static CellularConnectionFSM cellular;
5252
static CellularConnectionFSM::CellularState cellular_target_state;
5353
static CELLULAR_DEVICE *device;
54-
static CellularNetwork* nw;
54+
static CellularNetwork *nw;
5555

5656

5757
static bool fsm_callback(int state, int next_state)
@@ -73,7 +73,7 @@ static void test_network_interface_fsm()
7373
device = new CELLULAR_DEVICE(queue);
7474
TEST_ASSERT(device != NULL);
7575

76-
CellularNetwork* nw = device->open_network(&cellular_serial);
76+
CellularNetwork *nw = device->open_network(&cellular_serial);
7777
TEST_ASSERT(nw != NULL);
7878
TEST_ASSERT(nw->init() == NSAPI_ERROR_OK);
7979

@@ -99,7 +99,7 @@ static void init_network_interface()
9999

100100

101101
static bool get_network_registration(CellularNetwork::RegistrationType type,
102-
CellularNetwork::RegistrationStatus &status, bool &is_registered)
102+
CellularNetwork::RegistrationStatus &status, bool &is_registered)
103103
{
104104
is_registered = false;
105105
nsapi_error_t err = nw->get_registration_status(type, status);
@@ -147,7 +147,7 @@ static void nw_callback(nsapi_event_t ev, intptr_t intptr)
147147

148148
static void test_network_registration()
149149
{
150-
cellular.get_device()->set_timeout(10*1000);
150+
cellular.get_device()->set_timeout(10 * 1000);
151151
nw = cellular.get_network();
152152
TEST_ASSERT(nw != NULL);
153153

@@ -224,8 +224,8 @@ static void test_other()
224224
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
225225
#if CELLULAR_DEVICE != QUECTEL_BG96 // QUECTEL_BG96 does not give any specific reason for device error
226226
if (err == NSAPI_ERROR_DEVICE_ERROR) {
227-
TEST_ASSERT(((AT_CellularNetwork*)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
228-
((AT_CellularNetwork*)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
227+
TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
228+
((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
229229
}
230230
#endif
231231

@@ -234,8 +234,8 @@ static void test_other()
234234
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
235235
if (err == NSAPI_ERROR_DEVICE_ERROR) {
236236
#if CELLULAR_DEVICE != QUECTEL_BG96 // QUECTEL_BG96 does not give any specific reason for device error
237-
TEST_ASSERT(((AT_CellularNetwork*)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
238-
((AT_CellularNetwork*)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
237+
TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
238+
((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
239239
#endif
240240
} else {
241241
TEST_ASSERT(uplinkRate >= 0);
@@ -245,10 +245,10 @@ static void test_other()
245245
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_UNSUPPORTED);
246246

247247
// scanning of operators might take a long time
248-
cellular.get_device()->set_timeout(240*1000);
248+
cellular.get_device()->set_timeout(240 * 1000);
249249
CellularNetwork::operList_t operators;
250250
TEST_ASSERT(nw->scan_plmn(operators, uplinkRate) == NSAPI_ERROR_OK);
251-
cellular.get_device()->set_timeout(10*1000);
251+
cellular.get_device()->set_timeout(10 * 1000);
252252

253253

254254
// all current targets support IPV4
@@ -262,12 +262,12 @@ static void test_other()
262262
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
263263
if (err == NSAPI_ERROR_DEVICE_ERROR) {
264264
#if CELLULAR_DEVICE != TELIT_HE910 // TELIT_HE910 just gives an error and no specific error number so we can't know is this real error or that modem/network does not support the command
265-
TEST_ASSERT(((AT_CellularNetwork*)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
266-
((AT_CellularNetwork*)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
265+
TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
266+
((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
267267
#endif
268268
} else {
269269
// should have some values, only not optional are apn and bearer id
270-
CellularNetwork::pdpcontext_params_t* params = params_list.get_head();
270+
CellularNetwork::pdpcontext_params_t *params = params_list.get_head();
271271
TEST_ASSERT(strlen(params->apn) > 0);
272272
TEST_ASSERT(params->bearer_id >= 0)
273273
}
@@ -277,8 +277,8 @@ static void test_other()
277277
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
278278
if (err == NSAPI_ERROR_DEVICE_ERROR) {
279279
#if CELLULAR_DEVICE != QUECTEL_BG96 // QUECTEL_BG96 does not give any specific reason for device error
280-
TEST_ASSERT(((AT_CellularNetwork*)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
281-
((AT_CellularNetwork*)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
280+
TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
281+
((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
282282
#endif
283283
} else {
284284
// we should have some values which are not optional
@@ -290,8 +290,8 @@ static void test_other()
290290
err = nw->get_signal_quality(rssi, ber);
291291
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
292292
if (err == NSAPI_ERROR_DEVICE_ERROR) {
293-
TEST_ASSERT(((AT_CellularNetwork*)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
294-
((AT_CellularNetwork*)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
293+
TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
294+
((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
295295
} else {
296296
// test for values
297297
TEST_ASSERT(rssi >= 0);
@@ -319,10 +319,10 @@ static void test_other()
319319
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
320320
if (err == NSAPI_ERROR_DEVICE_ERROR) {
321321
// if device error then we must check was that really device error or that modem/network does not support the commands
322-
TEST_ASSERT(((AT_CellularNetwork*)nw)->get_device_error().errCode == 4// 4 == NOT SUPPORTED BY THE MODEM
323-
&& ((AT_CellularNetwork*)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
322+
TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 4 // 4 == NOT SUPPORTED BY THE MODEM
323+
&& ((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
324324
} else {
325-
CellularNetwork::operator_names_t* opn = op_names.get_head();
325+
CellularNetwork::operator_names_t *opn = op_names.get_head();
326326
TEST_ASSERT(strlen(opn->numeric) > 0);
327327
TEST_ASSERT(strlen(opn->alpha > 0));
328328
}
@@ -336,8 +336,8 @@ static void test_other()
336336
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
337337
if (err == NSAPI_ERROR_DEVICE_ERROR) {
338338
// if device error then we must check was that really device error or that modem/network does not support the commands
339-
TEST_ASSERT(((AT_CellularNetwork*)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
340-
((AT_CellularNetwork*)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
339+
TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
340+
((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
341341
} else {
342342
TEST_ASSERT(supported_opt != SUPPORTED_UE_OPT_MAX);
343343
TEST_ASSERT(preferred_opt != PREFERRED_UE_OPT_MAX);
@@ -347,8 +347,8 @@ static void test_other()
347347
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_DEVICE_ERROR);
348348
if (err == NSAPI_ERROR_DEVICE_ERROR) {
349349
// if device error then we must check was that really device error or that modem/network does not support the commands
350-
TEST_ASSERT(((AT_CellularNetwork*)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
351-
((AT_CellularNetwork*)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
350+
TEST_ASSERT(((AT_CellularNetwork *)nw)->get_device_error().errCode == 100 && // 100 == unknown command for modem
351+
((AT_CellularNetwork *)nw)->get_device_error().errType == 3); // 3 == CME error from the modem
352352
}
353353
#endif
354354

@@ -364,8 +364,8 @@ static void test_disconnect()
364364
static void test_detach()
365365
{
366366
// in PPP mode there is NO CARRIER waiting so flush it out
367-
rtos::Thread::wait(6*1000);
368-
((AT_CellularNetwork*)nw)->get_at_handler().flush();
367+
rtos::Thread::wait(6 * 1000);
368+
((AT_CellularNetwork *)nw)->get_at_handler().flush();
369369

370370
nsapi_connection_status_t st = nw->get_connection_status();
371371
TEST_ASSERT(st == NSAPI_STATUS_DISCONNECTED);
@@ -399,7 +399,7 @@ static Case cases[] = {
399399

400400
static utest::v1::status_t test_setup(const size_t number_of_cases)
401401
{
402-
GREENTEA_SETUP(10*60, "default_auto");
402+
GREENTEA_SETUP(10 * 60, "default_auto");
403403
return verbose_test_setup_handler(number_of_cases);
404404
}
405405

‎features/cellular/TESTS/api/cellular_power/main.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
#define NETWORK_TIMEOUT (180*1000)
4545

4646
static UARTSerial cellular_serial(MDMTXD, MDMRXD, MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
47-
static CELLULAR_DEVICE* cellular_device;
47+
static CELLULAR_DEVICE *cellular_device;
4848
static EventQueue queue(2 * EVENTS_EVENT_SIZE);
4949

5050
static void urc_callback()
5151
{
5252
}
5353

54-
static void wait_for_power(CellularPower* pwr)
54+
static void wait_for_power(CellularPower *pwr)
5555
{
5656
nsapi_error_t err = pwr->set_device_ready_urc_cb(&urc_callback);
5757
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_UNSUPPORTED);
@@ -72,13 +72,13 @@ static void wait_for_power(CellularPower* pwr)
7272
static void test_power_interface()
7373
{
7474
cellular_device = new CELLULAR_DEVICE(queue);
75-
CellularPower* pwr = cellular_device->open_power(&cellular_serial);
75+
CellularPower *pwr = cellular_device->open_power(&cellular_serial);
7676

7777
nsapi_error_t err = pwr->on();
7878
TEST_ASSERT(err == NSAPI_ERROR_OK || err == NSAPI_ERROR_UNSUPPORTED);
7979
wait_for_power(pwr);
8080

81-
TEST_ASSERT(pwr->set_power_level(1,0) == NSAPI_ERROR_OK);
81+
TEST_ASSERT(pwr->set_power_level(1, 0) == NSAPI_ERROR_OK);
8282

8383
err = pwr->reset();
8484
TEST_ASSERT(err == NSAPI_ERROR_OK);
@@ -102,7 +102,7 @@ static Case cases[] = {
102102

103103
static utest::v1::status_t test_setup(const size_t number_of_cases)
104104
{
105-
GREENTEA_SETUP(10*60, "default_auto");
105+
GREENTEA_SETUP(10 * 60, "default_auto");
106106
return verbose_test_setup_handler(number_of_cases);
107107
}
108108

‎features/cellular/TESTS/api/cellular_sim/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static char *get_rand_string(char *str, size_t size)
5656
if (size) {
5757
--size;
5858
for (size_t n = 0; n < size; n++) {
59-
int key = rand() % (int) (sizeof charset - 1);
59+
int key = rand() % (int)(sizeof charset - 1);
6060
str[n] = charset[key];
6161
}
6262
str[size] = '\0';
@@ -144,7 +144,7 @@ static Case cases[] = {
144144

145145
static utest::v1::status_t test_setup(const size_t number_of_cases)
146146
{
147-
GREENTEA_SETUP(10*60, "default_auto");
147+
GREENTEA_SETUP(10 * 60, "default_auto");
148148
return verbose_test_setup_handler(number_of_cases);
149149
}
150150

‎features/cellular/UNITTESTS/at/at_cellularbase/at_cellularbasetest.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,23 @@
1818
#include "test_at_cellularbase.h"
1919
#include "AT_CellularBase.h"
2020

21+
// AStyle ignored as the definition is not clear due to preprocessor usage
22+
// *INDENT-OFF*
2123
TEST_GROUP(AT_CellularBase)
2224
{
23-
Test_AT_CellularBase* unit;
25+
Test_AT_CellularBase *unit;
2426

25-
void setup()
27+
void setup()
2628
{
2729
unit = new Test_AT_CellularBase();
2830
}
2931

30-
void teardown()
32+
void teardown()
3133
{
3234
delete unit;
3335
}
3436
};
37+
// *INDENT-ON*
3538

3639
TEST(AT_CellularBase, Create)
3740
{

‎features/cellular/UNITTESTS/at/at_cellularbase/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "CppUTest/TestPlugin.h"
2020
#include "CppUTest/TestRegistry.h"
2121
#include "CppUTestExt/MockSupportPlugin.h"
22-
int main(int ac, char** av)
22+
int main(int ac, char **av)
2323
{
2424
return CommandLineTestRunner::RunAllTests(ac, av);
2525
}

‎features/cellular/UNITTESTS/at/at_cellularbase/test_at_cellularbase.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ using namespace events;
2727

2828
class my_base : public AT_CellularBase {
2929
public:
30-
my_base(ATHandler &at) : AT_CellularBase(at) {
30+
my_base(ATHandler &at) : AT_CellularBase(at)
31+
{
3132
}
32-
bool check_not_supported() {
33+
bool check_not_supported()
34+
{
3335
static const AT_CellularBase::SupportedFeature unsupported_features[] = {
3436
AT_CellularBase::AT_CGSN_WITH_TYPE,
3537
AT_CellularBase::SUPPORTED_FEATURE_END_MARK
@@ -38,12 +40,14 @@ class my_base : public AT_CellularBase {
3840
return is_supported(AT_CGSN_WITH_TYPE);
3941
}
4042

41-
bool check_supported() {
43+
bool check_supported()
44+
{
4245
set_unsupported_features(NULL);
4346
return is_supported(AT_CGSN_WITH_TYPE);
4447
}
4548

46-
bool check_supported_not_found() {
49+
bool check_supported_not_found()
50+
{
4751
static const AT_CellularBase::SupportedFeature unsupported_features[] = {
4852
AT_CellularBase::AT_CGSN_WITH_TYPE,
4953
AT_CellularBase::SUPPORTED_FEATURE_END_MARK

‎features/cellular/UNITTESTS/at/at_cellularbase/test_at_cellularbase.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
#ifndef TEST_AT_CELLULARBASE_H
1818
#define TEST_AT_CELLULARBASE_H
1919

20-
class Test_AT_CellularBase
21-
{
20+
class Test_AT_CellularBase {
2221
public:
2322
Test_AT_CellularBase();
2423

‎features/cellular/UNITTESTS/at/at_cellulardevice/at_cellulardevicetest.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919

2020
TEST_GROUP(AT_CellularDevice)
2121
{
22-
Test_AT_CellularDevice* unit;
22+
Test_AT_CellularDevice *unit;
2323

24-
void setup()
25-
{
24+
void setup() {
2625
unit = new Test_AT_CellularDevice();
2726
}
2827

29-
void teardown()
30-
{
28+
void teardown() {
3129
delete unit;
3230
}
3331
};

‎features/cellular/UNITTESTS/at/at_cellulardevice/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "CppUTest/TestPlugin.h"
2020
#include "CppUTest/TestRegistry.h"
2121
#include "CppUTestExt/MockSupportPlugin.h"
22-
int main(int ac, char** av)
22+
int main(int ac, char **av)
2323
{
2424
return CommandLineTestRunner::RunAllTests(ac, av);
2525
}

0 commit comments

Comments
 (0)