yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mixer.cpp: warnx -> PX4_ERR

Browse Source
This commit is contained in:
Beat Küng
2016-08-15 15:14:13 +02:00
parent d297d31c23
commit 44ac7d11e7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/systemcmds/mixer/mixer.cpp
View File

@@ -78,7 +78,7 @@ mixer_main(int argc, char *argv[])
int ret = load(argv[2], argv[3], false);
if (ret != 0) {
warnx("failed to load mixer");
PX4_ERR("failed to load mixer");
return 1;
}
@@ -124,14 +124,14 @@ load(const char *devname, const char *fname, bool append)
/* open the device */
if ((dev = px4_open(devname, 0)) < 0) {
warnx("can't open %s\n", devname);
PX4_ERR("can't open %s\n", devname);
return 1;
}
/* reset mixers on the device, but not if appending */
if (!append) {
if (px4_ioctl(dev, MIXERIOCRESET, 0)) {
warnx("can't reset mixers on %s", devname);
PX4_ERR("can't reset mixers on %s", devname);
return 1;
}
}
@@ -139,7 +139,7 @@ load(const char *devname, const char *fname, bool append)
char buf[2048];
if (load_mixer_file(fname, &buf[0], sizeof(buf)) < 0) {
warnx("can't load mixer: %s", fname);
PX4_ERR("can't load mixer file: %s", fname);
return 1;
}
@@ -147,7 +147,7 @@ load(const char *devname, const char *fname, bool append)
int ret = px4_ioctl(dev, MIXERIOCLOADBUF, (unsigned long)buf);
if (ret < 0) {
warnx("error loading mixers from %s", fname);
PX4_ERR("failed to load mixers from %s", fname);
return 1;
}