Browse Source

Minor cleanup of mixer changes

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
sbg
Mark Charlebois 10 years ago
parent
commit
1a8bd15d98
  1. 1
      makefiles/posix/config_posix_default.mk
  2. 9
      src/systemcmds/mixer/mixer.cpp
  3. 2
      src/systemcmds/mixer/module.mk

1
makefiles/posix/config_posix_default.mk

@ -17,6 +17,7 @@ MODULES += modules/sensors @@ -17,6 +17,7 @@ MODULES += modules/sensors
# System commands
#
MODULES += systemcmds/param
MODULES += systemcmds/mixer
MODULES += systemcmds/topic_listener
#

9
src/systemcmds/mixer/mixer.cpp

@ -58,8 +58,8 @@ @@ -58,8 +58,8 @@
*/
extern "C" __EXPORT int mixer_main(int argc, char *argv[]);
static void usage(const char *reason) noreturn_function;
static int load(const char *devname, const char *fname) noreturn_function;
static void usage(const char *reason);
static int load(const char *devname, const char *fname);
int
mixer_main(int argc, char *argv[])
@ -70,8 +70,10 @@ mixer_main(int argc, char *argv[]) @@ -70,8 +70,10 @@ mixer_main(int argc, char *argv[])
}
if (!strcmp(argv[1], "load")) {
if (argc < 4)
if (argc < 4) {
usage("missing device or filename");
return 1;
}
int ret = load(argv[2], argv[3]);
if(ret !=0) {
@ -79,6 +81,7 @@ mixer_main(int argc, char *argv[]) @@ -79,6 +81,7 @@ mixer_main(int argc, char *argv[])
return 1;
}
}
usage("Unknown command");
return 0;
}

2
src/systemcmds/mixer/module.mk

@ -42,5 +42,7 @@ MODULE_STACKSIZE = 4096 @@ -42,5 +42,7 @@ MODULE_STACKSIZE = 4096
MAXOPTIMIZATION = -Os
ifdef ($(PX4_TARGET_OS),nuttx)
EXTRACXXFLAGS = -Wframe-larger-than=2048
endif

Loading…
Cancel
Save