Minor cleanup of mixer changes

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
RomanBapst · May 3, 2015 · 1a8bd15 · 1a8bd15
1 parent 1b985ab
commit 1a8bd15
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/makefiles/posix/config_posix_default.mk b/makefiles/posix/config_posix_default.mk
@@ -17,6 +17,7 @@ MODULES		+= modules/sensors
 # System commands
 #
 MODULES	+= systemcmds/param
+MODULES += systemcmds/mixer
 MODULES += systemcmds/topic_listener
 
 #

diff --git a/src/systemcmds/mixer/mixer.cpp b/src/systemcmds/mixer/mixer.cpp
@@ -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,15 +70,18 @@ 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) {
 			warnx("failed to load mixer");
 			return 1;
 		}
 	}
+	usage("Unknown command");
 	return 0;
 }
 

diff --git a/src/systemcmds/mixer/module.mk b/src/systemcmds/mixer/module.mk
@@ -42,5 +42,7 @@ MODULE_STACKSIZE = 4096
 
 MAXOPTIMIZATION	 = -Os
 
+ifdef ($(PX4_TARGET_OS),nuttx)
 EXTRACXXFLAGS = -Wframe-larger-than=2048
+endif