uORB: Update code style

This commit is contained in:
Lorenz Meier
2015-10-19 13:51:18 +02:00
parent af1fe6ab9b
commit c19c8a35b2
5 changed files with 121 additions and 110 deletions
+63 -60
View File
@@ -45,83 +45,86 @@ extern "C" { __EXPORT int uorb_main(int argc, char *argv[]); }
static uORB::DeviceMaster *g_dev = nullptr;
static void usage()
{
warnx("Usage: uorb 'start', 'test', 'latency_test' or 'status'");
warnx("Usage: uorb 'start', 'test', 'latency_test' or 'status'");
}
int
uorb_main(int argc, char *argv[])
{
if (argc < 2) {
usage();
return -EINVAL;
}
if (argc < 2) {
usage();
return -EINVAL;
}
/*
* Start/load the driver.
*
* XXX it would be nice to have a wrapper for this...
*/
if (!strcmp(argv[1], "start")) {
/*
* Start/load the driver.
*
* XXX it would be nice to have a wrapper for this...
*/
if (!strcmp(argv[1], "start")) {
if (g_dev != nullptr) {
warnx("already loaded");
/* user wanted to start uorb, its already running, no error */
return 0;
}
if (g_dev != nullptr) {
warnx("already loaded");
/* user wanted to start uorb, its already running, no error */
return 0;
}
/* create the driver */
g_dev = new uORB::DeviceMaster(uORB::PUBSUB);
/* create the driver */
g_dev = new uORB::DeviceMaster(uORB::PUBSUB);
if (g_dev == nullptr) {
warnx("driver alloc failed");
return -ENOMEM;
}
if (g_dev == nullptr) {
warnx("driver alloc failed");
return -ENOMEM;
}
if (OK != g_dev->init()) {
warnx("driver init failed");
delete g_dev;
g_dev = nullptr;
return -EIO;
}
if (OK != g_dev->init()) {
warnx("driver init failed");
delete g_dev;
g_dev = nullptr;
return -EIO;
}
return OK;
}
return OK;
}
#ifndef __PX4_QURT
/*
* Test the driver/device.
*/
if (!strcmp(argv[1], "test"))
{
uORBTest::UnitTest &t = uORBTest::UnitTest::instance();
return t.test();
}
/*
* Test the latency.
*/
if (!strcmp(argv[1], "latency_test")) {
/*
* Test the driver/device.
*/
if (!strcmp(argv[1], "test")) {
uORBTest::UnitTest &t = uORBTest::UnitTest::instance();
return t.test();
}
/*
* Test the latency.
*/
if (!strcmp(argv[1], "latency_test")) {
uORBTest::UnitTest &t = uORBTest::UnitTest::instance();
if (argc > 2 && !strcmp(argv[2], "medium")) {
return t.latency_test<struct orb_test_medium>(ORB_ID(orb_test_medium), true);
} else if (argc > 2 && !strcmp(argv[2], "large")) {
return t.latency_test<struct orb_test_large>(ORB_ID(orb_test_large), true);
} else {
return t.latency_test<struct orb_test>(ORB_ID(orb_test), true);
}
}
uORBTest::UnitTest &t = uORBTest::UnitTest::instance();
if (argc > 2 && !strcmp(argv[2], "medium")) {
return t.latency_test<struct orb_test_medium>(ORB_ID(orb_test_medium), true);
} else if (argc > 2 && !strcmp(argv[2], "large")) {
return t.latency_test<struct orb_test_large>(ORB_ID(orb_test_large), true);
} else {
return t.latency_test<struct orb_test>(ORB_ID(orb_test), true);
}
}
#endif
/*
* Print driver information.
*/
if (!strcmp(argv[1], "status"))
{
return OK;
}
/*
* Print driver information.
*/
if (!strcmp(argv[1], "status")) {
return OK;
}
usage();
return -EINVAL;
usage();
return -EINVAL;
}