From f4b84c0ba787c2d0dc6a1e5c2f07734843f4a0fe Mon Sep 17 00:00:00 2001 From: songnannan Date: Mon, 28 Jun 2021 11:04:44 +0800 Subject: [PATCH] fix(sensortest): move set_interval and batch before activate. modify coding style err. Change-Id: Ib820b81a9a774070b5c4778d11ecb70f1f7cd846 Signed-off-by: songnannan --- testing/sensortest/sensortest.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/testing/sensortest/sensortest.c b/testing/sensortest/sensortest.c index 110a4d9ef..e6aae9843 100644 --- a/testing/sensortest/sensortest.c +++ b/testing/sensortest/sensortest.c @@ -273,18 +273,6 @@ int main(int argc, FAR char *argv[]) goto open_err; } - ret = ioctl(fd, SNIOC_ACTIVATE, 1); - if (ret < 0) - { - ret = -errno; - if (ret != -ENOTTY) - { - printf("Failed to enable sensor:%s, ret:%s\n", - devname, strerror(errno)); - goto ctl_err; - } - } - ret = ioctl(fd, SNIOC_SET_INTERVAL, &interval); if (ret < 0) { @@ -292,7 +280,7 @@ int main(int argc, FAR char *argv[]) if (ret != -ENOTTY) { printf("Failed to set interval for sensor:%s, ret:%s\n", - devname, strerror(errno)); + devname, strerror(errno)); goto ctl_err; } } @@ -304,7 +292,19 @@ int main(int argc, FAR char *argv[]) if (ret != -ENOTTY) { printf("Failed to batch for sensor:%s, ret:%s\n", - devname, strerror(errno)); + devname, strerror(errno)); + goto ctl_err; + } + } + + ret = ioctl(fd, SNIOC_ACTIVATE, 1); + if (ret < 0) + { + ret = -errno; + if (ret != -ENOTTY) + { + printf("Failed to enable sensor:%s, ret:%s\n", + devname, strerror(errno)); goto ctl_err; } }