From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Kent Gibson <warthog618@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Linus Walleij <linus.walleij@linaro.org>
Cc: linux-gpio@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [libgpiod][PATCH 3/6] treewide: rename BIAS_AS_IS to BIAS_NONE
Date: Mon, 11 Jan 2021 14:34:23 +0100 [thread overview]
Message-ID: <20210111133426.22040-4-brgl@bgdev.pl> (raw)
In-Reply-To: <20210111133426.22040-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
When inspecting the current bias setting of a GPIO line, the AS_IS name
of one of the possible values really means that there's no bias so it
should be renamed to NONE for clarity.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
bindings/cxx/gpiod.hpp | 2 +-
bindings/cxx/line.cpp | 2 +-
bindings/cxx/tests/tests-line.cpp | 8 ++++----
bindings/python/gpiodmodule.c | 10 +++++-----
bindings/python/tests/gpiod_py_test.py | 6 +++---
include/gpiod.h | 4 ++--
lib/core.c | 2 +-
tests/tests-line.c | 12 ++++++------
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/bindings/cxx/gpiod.hpp b/bindings/cxx/gpiod.hpp
index 8b4a8f9..fb675fc 100644
--- a/bindings/cxx/gpiod.hpp
+++ b/bindings/cxx/gpiod.hpp
@@ -486,7 +486,7 @@ public:
* @brief Possible bias settings.
*/
enum : int {
- BIAS_AS_IS = 1,
+ BIAS_NONE = 1,
/**< Line's bias state is unknown. */
BIAS_DISABLE,
/**< Line's internal bias is disabled. */
diff --git a/bindings/cxx/line.cpp b/bindings/cxx/line.cpp
index 5a907db..19c974d 100644
--- a/bindings/cxx/line.cpp
+++ b/bindings/cxx/line.cpp
@@ -17,7 +17,7 @@ const ::std::map<int, int> bias_mapping = {
{ GPIOD_LINE_BIAS_PULL_UP, line::BIAS_PULL_UP, },
{ GPIOD_LINE_BIAS_PULL_DOWN, line::BIAS_PULL_DOWN, },
{ GPIOD_LINE_BIAS_DISABLE, line::BIAS_DISABLE, },
- { GPIOD_LINE_BIAS_AS_IS, line::BIAS_AS_IS, },
+ { GPIOD_LINE_BIAS_NONE, line::BIAS_NONE, },
};
} /* namespace */
diff --git a/bindings/cxx/tests/tests-line.cpp b/bindings/cxx/tests/tests-line.cpp
index 3c7ea39..2a6cdf8 100644
--- a/bindings/cxx/tests/tests-line.cpp
+++ b/bindings/cxx/tests/tests-line.cpp
@@ -35,7 +35,7 @@ TEST_CASE("Line information can be correctly retrieved", "[line]")
REQUIRE_FALSE(line.is_used());
REQUIRE_FALSE(line.is_open_drain());
REQUIRE_FALSE(line.is_open_source());
- REQUIRE(line.bias() == ::gpiod::line::BIAS_AS_IS);
+ REQUIRE(line.bias() == ::gpiod::line::BIAS_NONE);
}
SECTION("exported line")
@@ -54,7 +54,7 @@ TEST_CASE("Line information can be correctly retrieved", "[line]")
REQUIRE(line.is_used());
REQUIRE_FALSE(line.is_open_drain());
REQUIRE_FALSE(line.is_open_source());
- REQUIRE(line.bias() == ::gpiod::line::BIAS_AS_IS);
+ REQUIRE(line.bias() == ::gpiod::line::BIAS_NONE);
}
SECTION("exported line with flags")
@@ -75,7 +75,7 @@ TEST_CASE("Line information can be correctly retrieved", "[line]")
REQUIRE(line.is_used());
REQUIRE(line.is_open_drain());
REQUIRE_FALSE(line.is_open_source());
- REQUIRE(line.bias() == ::gpiod::line::BIAS_AS_IS);
+ REQUIRE(line.bias() == ::gpiod::line::BIAS_NONE);
}
SECTION("exported open source line")
@@ -95,7 +95,7 @@ TEST_CASE("Line information can be correctly retrieved", "[line]")
REQUIRE(line.is_used());
REQUIRE_FALSE(line.is_open_drain());
REQUIRE(line.is_open_source());
- REQUIRE(line.bias() == ::gpiod::line::BIAS_AS_IS);
+ REQUIRE(line.bias() == ::gpiod::line::BIAS_NONE);
}
SECTION("exported bias disable line")
diff --git a/bindings/python/gpiodmodule.c b/bindings/python/gpiodmodule.c
index b48a83a..228ac73 100644
--- a/bindings/python/gpiodmodule.c
+++ b/bindings/python/gpiodmodule.c
@@ -68,7 +68,7 @@ enum {
};
enum {
- gpiod_BIAS_AS_IS = 1,
+ gpiod_BIAS_NONE = 1,
gpiod_BIAS_DISABLE,
gpiod_BIAS_PULL_UP,
gpiod_BIAS_PULL_DOWN,
@@ -374,9 +374,9 @@ static PyObject *gpiod_Line_bias(gpiod_LineObject *self,
return Py_BuildValue("I", gpiod_BIAS_PULL_DOWN);
case GPIOD_LINE_BIAS_DISABLE:
return Py_BuildValue("I", gpiod_BIAS_DISABLE);
- case GPIOD_LINE_BIAS_AS_IS:
+ case GPIOD_LINE_BIAS_NONE:
default:
- return Py_BuildValue("I", gpiod_BIAS_AS_IS);
+ return Py_BuildValue("I", gpiod_BIAS_NONE);
}
}
@@ -2527,8 +2527,8 @@ static gpiod_ConstDescr gpiod_ConstList[] = {
},
{
.typeobj = &gpiod_LineType,
- .name = "BIAS_AS_IS",
- .val = gpiod_BIAS_AS_IS,
+ .name = "BIAS_NONE",
+ .val = gpiod_BIAS_NONE,
},
{
.typeobj = &gpiod_LineType,
diff --git a/bindings/python/tests/gpiod_py_test.py b/bindings/python/tests/gpiod_py_test.py
index 3093a1c..d9521de 100755
--- a/bindings/python/tests/gpiod_py_test.py
+++ b/bindings/python/tests/gpiod_py_test.py
@@ -241,7 +241,7 @@ class LineInfo(MockupTestCase):
self.assertTrue(line.is_requested())
self.assertTrue(line.is_open_drain())
self.assertFalse(line.is_open_source())
- self.assertEqual(line.bias(), gpiod.Line.BIAS_AS_IS)
+ self.assertEqual(line.bias(), gpiod.Line.BIAS_NONE)
def test_exported_open_drain_line(self):
with gpiod.Chip(mockup.chip_path(0)) as chip:
@@ -259,7 +259,7 @@ class LineInfo(MockupTestCase):
self.assertTrue(line.is_requested())
self.assertTrue(line.is_open_drain())
self.assertFalse(line.is_open_source())
- self.assertEqual(line.bias(), gpiod.Line.BIAS_AS_IS)
+ self.assertEqual(line.bias(), gpiod.Line.BIAS_NONE)
def test_exported_open_source_line(self):
with gpiod.Chip(mockup.chip_path(0)) as chip:
@@ -277,7 +277,7 @@ class LineInfo(MockupTestCase):
self.assertTrue(line.is_requested())
self.assertFalse(line.is_open_drain())
self.assertTrue(line.is_open_source())
- self.assertEqual(line.bias(), gpiod.Line.BIAS_AS_IS)
+ self.assertEqual(line.bias(), gpiod.Line.BIAS_NONE)
def test_exported_bias_disable_line(self):
with gpiod.Chip(mockup.chip_path(0)) as chip:
diff --git a/include/gpiod.h b/include/gpiod.h
index 75da84c..18017d5 100644
--- a/include/gpiod.h
+++ b/include/gpiod.h
@@ -284,7 +284,7 @@ enum {
* @brief Possible internal bias settings.
*/
enum {
- GPIOD_LINE_BIAS_AS_IS = 1,
+ GPIOD_LINE_BIAS_NONE = 1,
/**< The internal bias state is unknown. */
GPIOD_LINE_BIAS_DISABLE,
/**< The internal bias is disabled. */
@@ -337,7 +337,7 @@ bool gpiod_line_is_active_low(struct gpiod_line *line) GPIOD_API;
* @brief Read the GPIO line bias setting.
* @param line GPIO line object.
* @return Returns GPIOD_LINE_BIAS_PULL_UP, GPIOD_LINE_BIAS_PULL_DOWN,
- * GPIOD_LINE_BIAS_DISABLE or GPIOD_LINE_BIAS_AS_IS.
+ * GPIOD_LINE_BIAS_DISABLE or GPIOD_LINE_BIAS_NONE.
*/
int gpiod_line_bias(struct gpiod_line *line) GPIOD_API;
diff --git a/lib/core.c b/lib/core.c
index c6fb474..60b39c6 100644
--- a/lib/core.c
+++ b/lib/core.c
@@ -485,7 +485,7 @@ int gpiod_line_bias(struct gpiod_line *line)
if (line->info_flags & GPIOLINE_FLAG_BIAS_PULL_DOWN)
return GPIOD_LINE_BIAS_PULL_DOWN;
- return GPIOD_LINE_BIAS_AS_IS;
+ return GPIOD_LINE_BIAS_NONE;
}
bool gpiod_line_is_used(struct gpiod_line *line)
diff --git a/tests/tests-line.c b/tests/tests-line.c
index d6264af..07d5601 100644
--- a/tests/tests-line.c
+++ b/tests/tests-line.c
@@ -418,7 +418,7 @@ GPIOD_TEST_CASE(set_flags_bias, 0, { 8 })
ret = gpiod_line_request_input(line, GPIOD_TEST_CONSUMER);
g_assert_cmpint(ret, ==, 0);
gpiod_test_return_if_failed();
- g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_AS_IS);
+ g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_NONE);
ret = gpiod_line_set_flags(line,
GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE);
@@ -762,7 +762,7 @@ GPIOD_TEST_CASE(misc_flags, 0, { 8 })
g_assert_false(gpiod_line_is_used(line));
g_assert_false(gpiod_line_is_open_drain(line));
g_assert_false(gpiod_line_is_open_source(line));
- g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_AS_IS);
+ g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_NONE);
config.request_type = GPIOD_LINE_REQUEST_DIRECTION_OUTPUT;
config.consumer = GPIOD_TEST_CONSUMER;
@@ -775,7 +775,7 @@ GPIOD_TEST_CASE(misc_flags, 0, { 8 })
g_assert_true(gpiod_line_is_used(line));
g_assert_true(gpiod_line_is_open_drain(line));
g_assert_false(gpiod_line_is_open_source(line));
- g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_AS_IS);
+ g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_NONE);
g_assert_cmpint(gpiod_line_direction(line), ==,
GPIOD_LINE_DIRECTION_OUTPUT);
@@ -790,7 +790,7 @@ GPIOD_TEST_CASE(misc_flags, 0, { 8 })
g_assert_true(gpiod_line_is_used(line));
g_assert_false(gpiod_line_is_open_drain(line));
g_assert_true(gpiod_line_is_open_source(line));
- g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_AS_IS);
+ g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_NONE);
g_assert_cmpint(gpiod_line_direction(line), ==,
GPIOD_LINE_DIRECTION_OUTPUT);
@@ -829,7 +829,7 @@ GPIOD_TEST_CASE(misc_flags_work_together, 0, { 8 })
g_assert_true(gpiod_line_is_used(line));
g_assert_true(gpiod_line_is_open_drain(line));
g_assert_false(gpiod_line_is_open_source(line));
- g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_AS_IS);
+ g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_NONE);
g_assert_true(gpiod_line_is_active_low(line));
g_assert_cmpint(gpiod_line_direction(line), ==,
GPIOD_LINE_DIRECTION_OUTPUT);
@@ -846,7 +846,7 @@ GPIOD_TEST_CASE(misc_flags_work_together, 0, { 8 })
g_assert_true(gpiod_line_is_used(line));
g_assert_false(gpiod_line_is_open_drain(line));
g_assert_true(gpiod_line_is_open_source(line));
- g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_AS_IS);
+ g_assert_cmpint(gpiod_line_bias(line), ==, GPIOD_LINE_BIAS_NONE);
g_assert_true(gpiod_line_is_active_low(line));
gpiod_line_release(line);
--
2.29.1
next prev parent reply other threads:[~2021-01-11 13:35 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 13:34 [libgpiod][PATCH 0/6] treewide: remove more cruft and Bartosz Golaszewski
2021-01-11 13:34 ` [libgpiod][PATCH 1/6] treewide: remove helpers for opening chips by name & number Bartosz Golaszewski
2021-01-11 13:34 ` [libgpiod][PATCH 2/6] treewide: simplify the active-low line property Bartosz Golaszewski
2021-01-11 13:34 ` Bartosz Golaszewski [this message]
2021-01-11 14:31 ` [libgpiod][PATCH 3/6] treewide: rename BIAS_AS_IS to BIAS_NONE Kent Gibson
2021-01-11 13:34 ` [libgpiod][PATCH 4/6] treewide: make drive settings an enum Bartosz Golaszewski
2021-01-11 14:39 ` Kent Gibson
2021-01-11 14:48 ` Bartosz Golaszewski
2021-01-11 13:34 ` [libgpiod][PATCH 5/6] bindings: cxx: line: reorder bias mapping entries Bartosz Golaszewski
2021-01-11 13:34 ` [libgpiod][PATCH 6/6] core: add the kernel uapi header to the repository Bartosz Golaszewski
2021-01-11 13:46 ` Andy Shevchenko
2021-01-11 14:06 ` Bartosz Golaszewski
2021-01-11 14:46 ` Andy Shevchenko
2021-01-11 15:15 ` Bartosz Golaszewski
2021-01-25 5:55 ` Kent Gibson
2021-01-25 10:54 ` Andy Shevchenko
2021-01-26 15:07 ` Bartosz Golaszewski
2021-01-26 17:11 ` Greg Kroah-Hartman
2021-01-26 19:08 ` Bartosz Golaszewski
2021-01-27 11:43 ` Greg Kroah-Hartman
2021-01-28 3:26 ` Kent Gibson
2021-01-28 7:51 ` Greg Kroah-Hartman
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=20210111133426.22040-4-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;
as well as URLs for NNTP newsgroup(s).