From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Kent Gibson <warthog618@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: linux-gpio@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [libgpiod][PATCH 4/7] bindings: cxx: provide a method for reading multiple line events
Date: Wed, 18 Dec 2019 15:24:46 +0100 [thread overview]
Message-ID: <20191218142449.10957-5-brgl@bgdev.pl> (raw)
In-Reply-To: <20191218142449.10957-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Add a new method to gpiod::line class allowing to read up to 16 line
events at once.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
bindings/cxx/gpiod.hpp | 7 +++++++
bindings/cxx/line.cpp | 45 ++++++++++++++++++++++++++++++++++--------
2 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/bindings/cxx/gpiod.hpp b/bindings/cxx/gpiod.hpp
index 078201b..bd99d28 100644
--- a/bindings/cxx/gpiod.hpp
+++ b/bindings/cxx/gpiod.hpp
@@ -421,6 +421,12 @@ public:
*/
GPIOD_API line_event event_read(void) const;
+ /**
+ * @brief Read up to 16 line events.
+ * @return Vector of line event objects.
+ */
+ GPIOD_API ::std::vector<line_event> event_read_multiple(void) const;
+
/**
* @brief Get the event file descriptor associated with this line.
* @return File descriptor number.
@@ -513,6 +519,7 @@ private:
line(::gpiod_line* line, const chip& owner);
void throw_if_null(void) const;
+ line_event make_line_event(const ::gpiod_line_event& event) const noexcept;
::gpiod_line* _m_line;
chip _m_chip;
diff --git a/bindings/cxx/line.cpp b/bindings/cxx/line.cpp
index ed6ef55..11deae6 100644
--- a/bindings/cxx/line.cpp
+++ b/bindings/cxx/line.cpp
@@ -206,6 +206,23 @@ bool line::event_wait(const ::std::chrono::nanoseconds& timeout) const
return !!event_bulk;
}
+line_event line::make_line_event(const ::gpiod_line_event& event) const noexcept
+{
+ line_event ret;
+
+ if (event.event_type == GPIOD_LINE_EVENT_RISING_EDGE)
+ ret.event_type = line_event::RISING_EDGE;
+ else if (event.event_type == GPIOD_LINE_EVENT_FALLING_EDGE)
+ ret.event_type = line_event::FALLING_EDGE;
+
+ ret.timestamp = ::std::chrono::nanoseconds(
+ event.ts.tv_nsec + (event.ts.tv_sec * 1000000000));
+
+ ret.source = *this;
+
+ return ret;
+}
+
line_event line::event_read(void) const
{
this->throw_if_null();
@@ -219,17 +236,29 @@ line_event line::event_read(void) const
throw ::std::system_error(errno, ::std::system_category(),
"error reading line event");
- if (event_buf.event_type == GPIOD_LINE_EVENT_RISING_EDGE)
- event.event_type = line_event::RISING_EDGE;
- else if (event_buf.event_type == GPIOD_LINE_EVENT_FALLING_EDGE)
- event.event_type = line_event::FALLING_EDGE;
+ return this->make_line_event(event_buf);
+}
+
+::std::vector<line_event> line::event_read_multiple(void) const
+{
+ this->throw_if_null();
- event.timestamp = ::std::chrono::nanoseconds(
- event_buf.ts.tv_nsec + (event_buf.ts.tv_sec * 1000000000));
+ /* 16 is the maximum number of events stored in the kernel FIFO. */
+ ::std::array<::gpiod_line_event, 16> event_buf;
+ ::std::vector<line_event> events;
+ int rv;
+
+ rv = ::gpiod_line_event_read_multiple(this->_m_line,
+ event_buf.data(), event_buf.size());
+ if (rv < 0)
+ throw ::std::system_error(errno, ::std::system_category(),
+ "error reading multiple line events");
- event.source = *this;
+ events.reserve(rv);
+ for (int i = 0; i < rv; i++)
+ events.push_back(this->make_line_event(event_buf[i]));
- return event;
+ return events;
}
int line::event_get_fd(void) const
--
2.23.0
next prev parent reply other threads:[~2019-12-18 14:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 14:24 [libgpiod][PATCH 0/7] teach libgpiod to read multiple line events at once Bartosz Golaszewski
2019-12-18 14:24 ` [libgpiod][PATCH 1/7] core: use gpiod_line_event_get_fd() in gpiod_line_event_read() Bartosz Golaszewski
2019-12-18 14:24 ` [libgpiod][PATCH 2/7] core: provide functions for reading multiple line events at once Bartosz Golaszewski
2019-12-18 14:24 ` [libgpiod][PATCH 3/7] tests: event: extend test coverage " Bartosz Golaszewski
2019-12-19 13:35 ` Kent Gibson
2019-12-19 13:48 ` Bartosz Golaszewski
2019-12-19 14:05 ` Kent Gibson
2019-12-19 14:07 ` Bartosz Golaszewski
2019-12-19 14:36 ` Kent Gibson
2019-12-19 16:19 ` Bartosz Golaszewski
2019-12-24 12:11 ` Bartosz Golaszewski
2019-12-18 14:24 ` Bartosz Golaszewski [this message]
2019-12-18 14:24 ` [libgpiod][PATCH 5/7] bindings: cxx: tests: add a test-case for reading multiple line events Bartosz Golaszewski
2019-12-18 14:24 ` [libgpiod][PATCH 6/7] bindings: python: add a method " Bartosz Golaszewski
2019-12-18 14:24 ` [libgpiod][PATCH 7/7] bindings: python: tests: add a test-case " Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191218142449.10957-5-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=warthog618@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox