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>,
Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-gpio@vger.kernel.org,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Subject: [libgpiod][PATCH 3/5] bindings: cxx: provide line_request::chip_path()
Date: Wed, 19 Jul 2023 21:20:55 +0200 [thread overview]
Message-ID: <20230719192057.172560-4-brgl@bgdev.pl> (raw)
In-Reply-To: <20230719192057.172560-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Provide a wrapper around gpiod_line_request_get_chip_path() for C++
bindings and update the tests.
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
bindings/cxx/gpiodcxx/line-request.hpp | 7 +++++++
bindings/cxx/line-request.cpp | 10 +++++++++-
bindings/cxx/tests/tests-line-request.cpp | 6 ++++--
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/bindings/cxx/gpiodcxx/line-request.hpp b/bindings/cxx/gpiodcxx/line-request.hpp
index c1e1520..dd8b5b9 100644
--- a/bindings/cxx/gpiodcxx/line-request.hpp
+++ b/bindings/cxx/gpiodcxx/line-request.hpp
@@ -14,6 +14,7 @@
#include <chrono>
#include <cstddef>
+#include <filesystem>
#include <iostream>
#include <memory>
@@ -75,6 +76,12 @@ public:
*/
void release();
+ /**
+ * @brief Get the path of the chip this request was made on.
+ * @return Path to the GPIO chip device.
+ */
+ ::std::filesystem::path chip_path() const;
+
/**
* @brief Get the number of requested lines.
* @return Number of lines in this request.
diff --git a/bindings/cxx/line-request.cpp b/bindings/cxx/line-request.cpp
index b0723c3..33e9d6e 100644
--- a/bindings/cxx/line-request.cpp
+++ b/bindings/cxx/line-request.cpp
@@ -63,6 +63,13 @@ GPIOD_CXX_API void line_request::release()
this->_m_priv->request.reset();
}
+GPIOD_CXX_API ::std::filesystem::path line_request::chip_path() const
+{
+ this->_m_priv->throw_if_released();
+
+ return ::gpiod_line_request_get_chip_path(this->_m_priv->request.get());
+}
+
GPIOD_CXX_API ::std::size_t line_request::num_lines() const
{
this->_m_priv->throw_if_released();
@@ -222,7 +229,8 @@ GPIOD_CXX_API ::std::ostream& operator<<(::std::ostream& out, const line_request
if (!request)
out << "gpiod::line_request(released)";
else
- out << "gpiod::line_request(num_lines=" << request.num_lines() <<
+ out << "gpiod::line_request(chip_path=\"" << request.chip_path() <<
+ "\", num_lines=" << request.num_lines() <<
", line_offsets=" << request.offsets() <<
", fd=" << request.fd() <<
")";
diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp
index d1a56ae..914a60a 100644
--- a/bindings/cxx/tests/tests-line-request.cpp
+++ b/bindings/cxx/tests/tests-line-request.cpp
@@ -468,14 +468,16 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]")
.set_num_lines(4)
.build();
- auto request = ::gpiod::chip(sim.dev_path())
+ auto chip = ::gpiod::chip(sim.dev_path());
+ auto request = chip
.prepare_request()
.add_line_settings({ 3, 1, 0, 2}, ::gpiod::line_settings())
.do_request();
::std::stringstream buf, expected;
- expected << "gpiod::line_request(num_lines=4, line_offsets=gpiod::offsets(3, 1, 0, 2), fd=" <<
+ expected << "gpiod::line_request(chip_path=\"" << chip.path() <<
+ "\", num_lines=4, line_offsets=gpiod::offsets(3, 1, 0, 2), fd=" <<
request.fd() << ")";
SECTION("active request")
--
2.39.2
next prev parent reply other threads:[~2023-07-19 19:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 19:20 [libgpiod][PATCH 0/5] core: provide information about the parent chip in line requests Bartosz Golaszewski
2023-07-19 19:20 ` [libgpiod][PATCH 1/5] core: provide gpiod_line_request_get_chip_path() Bartosz Golaszewski
2023-07-19 19:20 ` [libgpiod][PATCH 2/5] tests: add a test-case for gpiod_line_request_get_chip_path() Bartosz Golaszewski
2023-07-19 19:20 ` Bartosz Golaszewski [this message]
2023-07-19 19:20 ` [libgpiod][PATCH 4/5] bindings: python: provide the chip_path property in line_request Bartosz Golaszewski
2023-07-19 19:20 ` [libgpiod][PATCH 5/5] bindings: rust: provide LineRequest::chip_path() Bartosz Golaszewski
2023-07-20 5:04 ` Erik Schilling
2023-07-20 8:04 ` Bartosz Golaszewski
2023-07-20 8:10 ` Erik Schilling
2023-07-20 3:27 ` [libgpiod][PATCH 0/5] core: provide information about the parent chip in line requests Kent Gibson
2023-07-20 7:59 ` Bartosz Golaszewski
2023-07-20 8:05 ` Kent Gibson
2023-07-20 8:25 ` Bartosz Golaszewski
2023-07-20 8:39 ` Kent Gibson
2023-07-20 8:49 ` Bartosz Golaszewski
2023-07-20 9:16 ` Kent Gibson
2023-07-20 9:38 ` Bartosz Golaszewski
2023-07-20 9:52 ` Kent Gibson
2023-07-20 12:30 ` Bartosz Golaszewski
2023-07-20 13:37 ` Kent Gibson
2023-07-20 15:01 ` Bartosz Golaszewski
2023-07-21 1:37 ` Kent Gibson
2023-07-20 8:42 ` Andy Shevchenko
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=20230719192057.172560-4-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=viresh.kumar@linaro.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;
as well as URLs for NNTP newsgroup(s).