ported mixer app

This commit is contained in:
tumbili
2015-05-03 17:30:31 +02:00
parent ebdf178ba3
commit 8a873df9d0
+31 -19
View File
@@ -37,6 +37,8 @@
* Mixer utility. * Mixer utility.
*/ */
#include <px4_config.h>
#include <px4_posix.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@@ -44,7 +46,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include <nuttx/compiler.h>
#include <systemlib/err.h> #include <systemlib/err.h>
#include <systemlib/mixer/mixer.h> #include <systemlib/mixer/mixer.h>
@@ -58,22 +59,27 @@
extern "C" __EXPORT int mixer_main(int argc, char *argv[]); extern "C" __EXPORT int mixer_main(int argc, char *argv[]);
static void usage(const char *reason) noreturn_function; static void usage(const char *reason) noreturn_function;
static void load(const char *devname, const char *fname) noreturn_function; static int load(const char *devname, const char *fname) noreturn_function;
int int
mixer_main(int argc, char *argv[]) mixer_main(int argc, char *argv[])
{ {
if (argc < 2) if (argc < 2) {
usage("missing command"); usage("missing command");
return 1;
}
if (!strcmp(argv[1], "load")) { if (!strcmp(argv[1], "load")) {
if (argc < 4) if (argc < 4)
usage("missing device or filename"); usage("missing device or filename");
load(argv[2], argv[3]); int ret = load(argv[2], argv[3]);
if(ret !=0) {
warnx("failed to load mixer");
return 1;
}
} }
return 0;
usage("unrecognised command");
} }
static void static void
@@ -84,31 +90,37 @@ usage(const char *reason)
fprintf(stderr, "usage:\n"); fprintf(stderr, "usage:\n");
fprintf(stderr, " mixer load <device> <filename>\n"); fprintf(stderr, " mixer load <device> <filename>\n");
/* XXX other useful commands? */
exit(1);
} }
static void static int
load(const char *devname, const char *fname) load(const char *devname, const char *fname)
{ {
int dev; int dev;
char buf[2048]; char buf[2048];
/* open the device */ /* open the device */
if ((dev = open(devname, 0)) < 0) if ((dev = px4_open(devname, 0)) < 0) {
err(1, "can't open %s\n", devname); warnx("can't open %s\n", devname);
return 1;
}
/* reset mixers on the device */ /* reset mixers on the device */
if (ioctl(dev, MIXERIOCRESET, 0)) if (px4_ioctl(dev, MIXERIOCRESET, 0)) {
err(1, "can't reset mixers on %s", devname); warnx("can't reset mixers on %s", devname);
return 1;
}
if (load_mixer_file(fname, &buf[0], sizeof(buf)) < 0) if (load_mixer_file(fname, &buf[0], sizeof(buf)) < 0) {
err(1, "can't load mixer: %s", fname); warnx("can't load mixer: %s", fname);
return 1;
}
/* XXX pass the buffer to the device */ /* XXX pass the buffer to the device */
int ret = ioctl(dev, MIXERIOCLOADBUF, (unsigned long)buf); int ret = px4_ioctl(dev, MIXERIOCLOADBUF, (unsigned long)buf);
if (ret < 0) if (ret < 0) {
err(1, "error loading mixers from %s", fname); warnx("error loading mixers from %s", fname);
exit(0); return 1;
}
return 0;
} }