treewide: rework line configuration

index 65da13f..f719072 100644
@@ -15,7 +15,9 @@ libgpiodcxx_la_SOURCES =	\
 	line-config.cpp		\
 	line-info.cpp		\
 	line-request.cpp	\
+	line-settings.cpp	\
 	misc.cpp		\
+	request-builder.cpp	\
 	request-config.cpp
 
 libgpiodcxx_la_CXXFLAGS = -Wall -Wextra -g -std=gnu++17

index e3e6f27..c4f0ab5 100644
@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <[email protected]>
 
+#include <ostream>
+#include <utility>
+
 #include "internal.hpp"
 
 namespace gpiod {

88 lines not on this page · raw message

index 0ece132..ff398f1 100644
@@ -2,6 +2,8 @@
 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <[email protected]>
 
 #include <iterator>
+#include <ostream>
+#include <utility>
 
 #include "internal.hpp"
 

index 275fe3b..5992934 100644
@@ -2,6 +2,8 @@
 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <[email protected]>
 
 #include <map>
+#include <ostream>
+#include <utility>
 
 #include "internal.hpp"
 

index 0136f5f..6cf042c 100644
@@ -20,13 +20,21 @@ int main(int argc, char **argv)
 	for (int i = 2; i < argc; i++)
 		offsets.push_back(::std::stoul(argv[i]));
 
-	::gpiod::chip chip(argv[1]);
-	auto request = chip.request_lines(
-			::gpiod::request_config({
-				{ ::gpiod::request_config::property::OFFSETS, offsets },
-				{ ::gpiod::request_config::property::CONSUMER, "gpiogetcxx" }
-			}),
-			::gpiod::line_config());
+	auto request = ::gpiod::chip(argv[1])
+		.prepare_request()
+		.set_request_config(
+			::gpiod::request_config()
+				.set_consumer("gpiogetcxx")
+		)
+		.set_line_config(
+			::gpiod::line_config()
+				.add_line_settings(
+					offsets,
+					::gpiod::line_settings()
+						.set_direction(::gpiod::line::direction::INPUT)
+				)
+		)
+		.do_request();
 
 	auto vals = request.get_values();
 

index a79138e..e50d2f4 100644
@@ -42,27 +42,22 @@ int main(int argc, char **argv)
 	for (int i = 2; i < argc; i++)
 		offsets.push_back(::std::stoul(argv[i]));
 
-	::gpiod::chip chip(argv[1]);
-	auto request = chip.request_lines(
-		::gpiod::request_config(
-			{
-				{ ::gpiod::request_config::property::OFFSETS, offsets},
-				{ ::gpiod::request_config::property::CONSUMER, "gpiomoncxx"},
-			}
-		),
-		::gpiod::line_config(
-			{
-				{
-					::gpiod::line_config::property::DIRECTION,
-					::gpiod::line::direction::INPUT
-				},
-				{
-					::gpiod::line_config::property::EDGE_DETECTION,
-					::gpiod::line::edge::BOTH
-				}
-			}
+	auto request = ::gpiod::chip(argv[1])
+		.prepare_request()
+		.set_request_config(
+			::gpiod::request_config()
+				.set_consumer("gpiomoncxx")
 		)
-	);
+		.set_line_config(
+			::gpiod::line_config()
+				.add_line_settings(
+					offsets,
+					::gpiod::line_settings()
+						.set_direction(::gpiod::line::direction::INPUT)
+						.set_edge_detection(::gpiod::line::edge::BOTH)
+				)
+		)
+		.do_request();
 
 	::gpiod::edge_event_buffer buffer;
 

index 838d801..a81a94f 100644
@@ -36,18 +36,21 @@ int main(int argc, char **argv)
 						       ::gpiod::line::value::INACTIVE);
 	}
 
-	::gpiod::chip chip(argv[1]);
-	auto request = chip.request_lines(
-			::gpiod::request_config({
-				{ ::gpiod::request_config::property::OFFSETS, offsets },
-				{ ::gpiod::request_config::property::CONSUMER, "gpiogetcxx" }
-			}),
-			::gpiod::line_config({
-				{
-					::gpiod::line_config::property::DIRECTION,
-					::gpiod::line::direction::OUTPUT
-				}
-			}));
+	auto request = ::gpiod::chip(argv[1])
+		.prepare_request()
+		.set_request_config(
+			::gpiod::request_config()
+				.set_consumer("gpiosetcxx")
+		)
+		.set_line_config(
+			::gpiod::line_config()
+				.add_line_settings(
+					offsets,
+					::gpiod::line_settings()
+						.set_direction(::gpiod::line::direction::OUTPUT)
+				)
+		)
+		.do_request();
 
 	request.set_values(values);
 

index c5645b2..8981db4 100644
@@ -40,6 +40,8 @@
 #include "gpiodcxx/line-config.hpp"
 #include "gpiodcxx/line-info.hpp"
 #include "gpiodcxx/line-request.hpp"
+#include "gpiodcxx/line-settings.hpp"
+#include "gpiodcxx/request-builder.hpp"
 #include "gpiodcxx/request-config.hpp"
 #undef __LIBGPIOD_GPIOD_CXX_INSIDE__
 

index 71532e6..e3a3b9b 100644
@@ -13,6 +13,8 @@ otherinclude_HEADERS = \
 	line-config.hpp \
 	line-info.hpp \
 	line-request.hpp \
+	line-settings.hpp \
 	misc.hpp \
+	request-builder.hpp \
 	request-config.hpp \
 	timestamp.hpp

index 5bfcc99..8c2f07a 100644
@@ -27,6 +27,7 @@ class info_event;
 class line_config;
 class line_info;
 class line_request;
+class request_builder;
 class request_config;
 
 /**

@@ -48,8 +49,6 @@ public:
 	 */
 	explicit chip(const ::std::filesystem::path& path);
 
-	chip(const chip& other) = delete;
-
 	/**
 	 * @brief Move constructor.
 	 * @param other Object to move.

@@ -147,19 +146,20 @@ public:
 	int get_line_offset_from_name(const ::std::string& name) const;
 
 	/**
-	 * @brief Request a set of lines for exclusive usage.
-	 * @param req_cfg Request config object.
-	 * @param line_cfg Line config object.
-	 * @return New line_request object.
+	 * @brief Create a request_builder associated with this chip.
+	 * @return New request_builder object.
 	 */
-	line_request request_lines(const request_config& req_cfg,
-				   const line_config& line_cfg);
+	request_builder prepare_request();
 
 private:
 
 	struct impl;
 
-	::std::unique_ptr<impl> _m_priv;
+	::std::shared_ptr<impl> _m_priv;
+
+	chip(const chip& other);
+
+	friend request_builder;
 };
 
 /**

546 lines not on this page · raw message

index be0c71f..659251b 100644
@@ -53,6 +53,7 @@ public:
 	/**
 	 * @brief Move assignment operator.
 	 * @param other Object to move.
+	 * @return Reference to self.
 	 */
 	line_request& operator=(line_request&& other) noexcept;
 

@@ -130,35 +131,40 @@ public:
 	 * @brief Set the value of a single requested line.
 	 * @param offset Offset of the line to set within the chip.
 	 * @param value New line value.
+	 * @return Reference to self.
 	 */
-	void set_value(line::offset offset, line::value value);
+	line_request& set_value(line::offset offset, line::value value);
 
 	/**
 	 * @brief Set the values of a subset of requested lines.
 	 * @param values Vector containing a set of offset->value mappings.
+	 * @return Reference to self.
 	 */
-	void set_values(const line::value_mappings& values);
+	line_request& set_values(const line::value_mappings& values);
 
 	/**
 	 * @brief Set the values of a subset of requested lines.
 	 * @param offsets Vector containing the offsets of lines to set.
 	 * @param values Vector containing new values with indexes
 	 *               corresponding with those in the offsets vector.
+	 * @return Reference to self.
 	 */
-	void set_values(const line::offsets& offsets, const line::values& values);
+	line_request& set_values(const line::offsets& offsets, const line::values& values);
 
 	/**
 	 * @brief Set the values of all requested lines.
 	 * @param values Array of new line values. The size must be equal to
 	 *               the value returned by line_request::num_lines.
+	 * @return Reference to self.
 	 */
-	void set_values(const line::values& values);
+	line_request& set_values(const line::values& values);
 
 	/**
 	 * @brief Apply new config options to requested lines.
 	 * @param config New configuration.
+	 * @return Reference to self.
 	 */
-	void reconfigure_lines(const line_config& config);
+	line_request& reconfigure_lines(const line_config& config);
 
 	/**
 	 * @brief Get the file descriptor number associated with this line

@@ -201,7 +207,7 @@ private:
 
 	::std::unique_ptr<impl> _m_priv;
 
-	friend chip;
+	friend request_builder;
 };
 
 /**

193 lines not on this page · raw message

92 lines not on this page · raw message

125 lines not on this page · raw message

index 8e99f9c..d9e14a3 100644
@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <[email protected]>
 
 #include <map>
+#include <ostream>
 
 #include "internal.hpp"
 

index 8b3c2f8..0703474 100644
@@ -5,8 +5,7 @@
 #define __LIBGPIOD_CXX_INTERNAL_HPP__
 
 #include <gpiod.h>
-#include <iostream>
-#include <iterator>
+#include <map>
 #include <memory>
 #include <string>
 #include <utility>

@@ -25,6 +24,7 @@ map_int_to_enum(int value, const ::std::map<int, enum_type>& mapping)
 	try {
 		return mapping.at(value);
 	} catch (const ::std::out_of_range& err) {
+		/* FIXME Demangle the name. */
 		throw bad_mapping(::std::string("invalid value for ") +
 				  typeid(enum_type).name());
 	}

@@ -40,9 +40,11 @@ template<class T, void F(T*)> struct deleter
 	}
 };
 
+using chip_deleter = deleter<::gpiod_chip, ::gpiod_chip_close>;
 using chip_info_deleter = deleter<::gpiod_chip_info, ::gpiod_chip_info_free>;
 using line_info_deleter = deleter<::gpiod_line_info, ::gpiod_line_info_free>;
 using info_event_deleter = deleter<::gpiod_info_event, ::gpiod_info_event_free>;
+using line_settings_deleter = deleter<::gpiod_line_settings, ::gpiod_line_settings_free>;
 using line_config_deleter = deleter<::gpiod_line_config, ::gpiod_line_config_free>;
 using request_config_deleter = deleter<::gpiod_request_config, ::gpiod_request_config_free>;
 using line_request_deleter = deleter<::gpiod_line_request, ::gpiod_line_request_release>;

@@ -50,9 +52,11 @@ using edge_event_deleter = deleter<::gpiod_edge_event, ::gpiod_edge_event_free>;
 using edge_event_buffer_deleter = deleter<::gpiod_edge_event_buffer,
 					  ::gpiod_edge_event_buffer_free>;
 
+using chip_ptr = ::std::unique_ptr<::gpiod_chip, chip_deleter>;
 using chip_info_ptr = ::std::unique_ptr<::gpiod_chip_info, chip_info_deleter>;
 using line_info_ptr = ::std::unique_ptr<::gpiod_line_info, line_info_deleter>;
 using info_event_ptr = ::std::unique_ptr<::gpiod_info_event, info_event_deleter>;
+using line_settings_ptr = ::std::unique_ptr<::gpiod_line_settings, line_settings_deleter>;
 using line_config_ptr = ::std::unique_ptr<::gpiod_line_config, line_config_deleter>;
 using request_config_ptr = ::std::unique_ptr<::gpiod_request_config, request_config_deleter>;
 using line_request_ptr = ::std::unique_ptr<::gpiod_line_request, line_request_deleter>;

@@ -60,6 +64,19 @@ using edge_event_ptr = ::std::unique_ptr<::gpiod_edge_event, edge_event_deleter>
 using edge_event_buffer_ptr = ::std::unique_ptr<::gpiod_edge_event_buffer,
 						edge_event_buffer_deleter>;
 
+struct chip::impl
+{
+	impl(const ::std::filesystem::path& path);
+	impl(const impl& other) = delete;
+	impl(impl&& other) = delete;
+	impl& operator=(const impl& other) = delete;
+	impl& operator=(impl&& other) = delete;
+
+	void throw_if_closed() const;
+
+	chip_ptr chip;
+};
+
 struct chip_info::impl
 {
 	impl() = default;

@@ -100,6 +117,17 @@ struct info_event::impl
 	line_info info;
 };
 
+struct line_settings::impl
+{
+	impl();
+	impl(const impl& other) = delete;
+	impl(impl&& other) = delete;
+	impl& operator=(const impl& other) = delete;
+	impl& operator=(impl&& other) = delete;
+
+	line_settings_ptr settings;
+};
+
 struct line_config::impl
 {
 	impl();

735 lines not on this page · raw message

index 66f3242..2ad0baf 100644
@@ -2,7 +2,8 @@
 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <[email protected]>
 
 #include <map>
-#include <iostream>
+#include <ostream>
+#include <utility>
 
 #include "internal.hpp"
 

index 58777f3..bde34e8 100644
@@ -2,6 +2,7 @@
 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <[email protected]>
 
 #include <iterator>
+#include <ostream>
 #include <utility>
 
 #include "internal.hpp"

@@ -126,12 +127,13 @@ GPIOD_CXX_API void line_request::get_values(line::values& values)
 	this->get_values(this->offsets(), values);
 }
 
-GPIOD_CXX_API void line_request::line_request::set_value(line::offset offset, line::value value)
+GPIOD_CXX_API line_request&
+line_request::line_request::set_value(line::offset offset, line::value value)
 {
-	this->set_values({ offset }, { value });
+	return this->set_values({ offset }, { value });
 }
 
-GPIOD_CXX_API void
+GPIOD_CXX_API line_request&
 line_request::set_values(const line::value_mappings& values)
 {
 	line::offsets offsets(values.size());

@@ -142,10 +144,10 @@ line_request::set_values(const line::value_mappings& values)
 		vals[i] = values[i].second;
 	}
 
-	this->set_values(offsets, vals);
+	return this->set_values(offsets, vals);
 }
 
-GPIOD_CXX_API void line_request::set_values(const line::offsets& offsets,
+GPIOD_CXX_API line_request& line_request::set_values(const line::offsets& offsets,
 					    const line::values& values)
 {
 	this->_m_priv->throw_if_released();

@@ -160,14 +162,16 @@ GPIOD_CXX_API void line_request::set_values(const line::offsets& offsets,
 							 reinterpret_cast<const int*>(values.data()));
 	if (ret)
 		throw_from_errno("unable to set line values");
+
+	return *this;
 }
 
-GPIOD_CXX_API void line_request::set_values(const line::values& values)
+GPIOD_CXX_API line_request& line_request::set_values(const line::values& values)
 {
-	this->set_values(this->offsets(), values);
+	return this->set_values(this->offsets(), values);
 }
 
-GPIOD_CXX_API void line_request::reconfigure_lines(const line_config& config)
+GPIOD_CXX_API line_request& line_request::reconfigure_lines(const line_config& config)
 {
 	this->_m_priv->throw_if_released();
 

@@ -175,6 +179,8 @@ GPIOD_CXX_API void line_request::reconfigure_lines(const line_config& config)
 							 config._m_priv->config.get());
 	if (ret)
 		throw_from_errno("unable to reconfigure GPIO lines");
+
+	return *this;
 }
 
 GPIOD_CXX_API int line_request::fd() const

303 lines not on this page · raw message

index fc20c62..a9caedd 100644
@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <[email protected]>
 
+#include <iterator>
+#include <ostream>
+
 #include "internal.hpp"
 
 namespace gpiod {

83 lines not on this page · raw message

159 lines not on this page · raw message

index d40c069..4971dd4 100644
@@ -22,10 +22,11 @@ gpiod_cxx_test_SOURCES =			\
 		tests-chip.cpp			\
 		tests-chip-info.cpp		\
 		tests-edge-event.cpp		\
+		tests-info-event.cpp		\
 		tests-line.cpp			\
 		tests-line-config.cpp		\
 		tests-line-info.cpp		\
 		tests-line-request.cpp		\
-		tests-info-event.cpp		\
+		tests-line-settings.cpp		\
 		tests-misc.cpp			\
-		tests-request-config.cpp
+		tests-request-config.cpp
\ No newline at end of file

246 lines not on this page · raw message

50 lines not on this page · raw message

288 lines not on this page · raw message

259 lines not on this page · raw message

143 lines not on this page · raw message

82 lines not on this page · raw message

index 1bd2b2e..dd90abd 100644

Lines of this file are not shown. View the raw message.

index f37dc03..392f03c 100644

Lines of this file are not shown. View the raw message.

index 69ad786..a259eae 100755

Lines of this file are not shown. View the raw message.