From patchwork Fri Nov 15 14:43:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 1195683 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VZ9DsuCl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47F1NH1qGwz9sP6 for ; Sat, 16 Nov 2019 01:45:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727556AbfKOOpC (ORCPT ); Fri, 15 Nov 2019 09:45:02 -0500 Received: from mail-pg1-f175.google.com ([209.85.215.175]:40192 "EHLO mail-pg1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727496AbfKOOpC (ORCPT ); Fri, 15 Nov 2019 09:45:02 -0500 Received: by mail-pg1-f175.google.com with SMTP id 15so6114601pgt.7 for ; Fri, 15 Nov 2019 06:45:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uXrx5y2WL4cxWSJZuzUd3RqNYH2UrGCBMAG2mC95Yp4=; b=VZ9DsuClqAdtpSEe2D0+3vFD9mLr9eln7hbc0RrShlrcXRcAW+6TRNbRhQeLQcSMfx bz7WRHgJike6qCPb5aqWA38CdDFKodPkILfNVNzqFDbx0ZVaAHJtEsvkKoPGrPVyBxXB fTOyzHVbcdtCeJP4YIzT/wIaEwsiH9GJHlOlrnRJbg2P0yZYgpZqo/DyflYMh13asYTK vHjkvtJBy/55cLIj/4qeOuSC6z+qjbzu7Lpl516VUG8cgQjZwh7Pox8esEgzVeQBJ6a6 pByHBQrr2+HuNWRfUdGOchzTcOKld2xgYiQazaNlKanWOVIuwpWI6fD6gY+HHBeBFOPF Gagg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uXrx5y2WL4cxWSJZuzUd3RqNYH2UrGCBMAG2mC95Yp4=; b=nPijDr63HKxEgVdAeyh0dC/9HCmGwQPWi+j7XktuY1EmRYPhh9tj9Rk2aC3lT7EElB RkwnLH1tEDvjICdnLxflpUQldQzZ19I50/8gzwzQfrzAJoBPtucJtP+PknCvj5wha1EW p6xHjc5HrbAIckwfVgNUecX93TAuSwQJQWkECxGJbZYzlJ0kRztlafmZoGi8CAZrtNYR qT5pxiD9H/KhIz5hGLdxVDhtIqxH7Q1yInlLJdoOLIT+JiW8cwTpMOzmpy2CpUMyBCZN 4WR6do1F2kb21nQvzUaCRbRwG14mJ15oWzcm/RR+RVknXBjdQ8hA1V4QjY4Gpvwke4yl CkyA== X-Gm-Message-State: APjAAAUMOJyNe9eWOy1eKLBgma8j4E2PsyIQWzyfl8VzRvCBBxUD/7Ei UCbhPSShiXf/kdzUB159MQEfhIcR64M= X-Google-Smtp-Source: APXvYqy6S7oa8q9mhqpGv12k0j2CwxtXIW0OHDeJz6xZlRfecHUUEvkWWiFVgP3RZa7SedCW5pgioA== X-Received: by 2002:a62:e914:: with SMTP id j20mr18215551pfh.245.1573829101276; Fri, 15 Nov 2019 06:45:01 -0800 (PST) Received: from sol.lan (220-235-109-115.dyn.iinet.net.au. [220.235.109.115]) by smtp.gmail.com with ESMTPSA id y123sm10517726pfg.64.2019.11.15.06.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 06:45:00 -0800 (PST) From: Kent Gibson To: linux-gpio@vger.kernel.org, bgolaszewski@baylibre.com Cc: Kent Gibson Subject: [libgpiod] [PATCH 07/19] bindings: cxx: add support for bias flags Date: Fri, 15 Nov 2019 22:43:43 +0800 Message-Id: <20191115144355.975-8-warthog618@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191115144355.975-1-warthog618@gmail.com> References: <20191115144355.975-1-warthog618@gmail.com> MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Add support for bias flags in line requests and returning the line bias setting via a bias accessor. Based on initial work by Drew Fustini . Signed-off-by: Kent Gibson --- bindings/cxx/gpiod.hpp | 26 ++++++++++++++++++++++++++ bindings/cxx/line.cpp | 19 +++++++++++++++++++ bindings/cxx/line_bulk.cpp | 6 ++++++ 3 files changed, 51 insertions(+) diff --git a/bindings/cxx/gpiod.hpp b/bindings/cxx/gpiod.hpp index b5a9401..2b1a6ab 100644 --- a/bindings/cxx/gpiod.hpp +++ b/bindings/cxx/gpiod.hpp @@ -233,6 +233,12 @@ struct line_request /**< The line is an open-source port. */ GPIOD_API static const ::std::bitset<32> FLAG_OPEN_DRAIN; /**< The line is an open-drain port. */ + GPIOD_API static const ::std::bitset<32> FLAG_BIAS_DISABLE; + /**< The line has neither pull-up nor pull-down resistor enabled */ + GPIOD_API static const ::std::bitset<32> FLAG_BIAS_PULL_DOWN; + /**< The line has a configurable pull-down resistor enabled */ + GPIOD_API static const ::std::bitset<32> FLAG_BIAS_PULL_UP; + /**< The line has a configurable pull-up resistor enabled */ ::std::string consumer; /**< Consumer name to pass to the request. */ @@ -320,6 +326,12 @@ public: */ GPIOD_API int active_state(void) const; + /** + * @brief Get current bias of this line. + * @return Current bias setting. + */ + GPIOD_API int bias(void) const; + /** * @brief Check if this line is used by the kernel or other user space * process. @@ -456,6 +468,20 @@ public: /**< Line's active state is high. */ }; + /** + * @brief Possible bias settings. + */ + enum : int { + BIAS_AS_IS = 1, + /**< Line's bias state is unknown. */ + BIAS_DISABLE, + /**< Line's internal bias is disabled. */ + BIAS_PULL_UP, + /**< Line's internal pull-up bias is enabled. */ + BIAS_PULL_DOWN, + /**< Line's internal pull-down bias is enabled. */ + }; + private: line(::gpiod_line* line, const chip& owner); diff --git a/bindings/cxx/line.cpp b/bindings/cxx/line.cpp index df6eada..dd6bb6a 100644 --- a/bindings/cxx/line.cpp +++ b/bindings/cxx/line.cpp @@ -67,6 +67,25 @@ int line::active_state(void) const return active == GPIOD_LINE_ACTIVE_STATE_HIGH ? ACTIVE_HIGH : ACTIVE_LOW; } +int line::bias(void) const +{ + this->throw_if_null(); + + int bias = ::gpiod_line_bias(this->_m_line); + + switch (bias) { + case GPIOD_LINE_BIAS_PULL_UP: + return BIAS_PULL_UP; + case GPIOD_LINE_BIAS_PULL_DOWN: + return BIAS_PULL_DOWN; + case GPIOD_LINE_BIAS_DISABLE: + return BIAS_DISABLE; + case GPIOD_LINE_BIAS_AS_IS: + default: + return BIAS_AS_IS; + } +} + bool line::is_used(void) const { this->throw_if_null(); diff --git a/bindings/cxx/line_bulk.cpp b/bindings/cxx/line_bulk.cpp index c708c8b..5f1cac4 100644 --- a/bindings/cxx/line_bulk.cpp +++ b/bindings/cxx/line_bulk.cpp @@ -14,6 +14,9 @@ namespace gpiod { const ::std::bitset<32> line_request::FLAG_ACTIVE_LOW(GPIOD_BIT(0)); const ::std::bitset<32> line_request::FLAG_OPEN_SOURCE(GPIOD_BIT(1)); const ::std::bitset<32> line_request::FLAG_OPEN_DRAIN(GPIOD_BIT(2)); +const ::std::bitset<32> line_request::FLAG_BIAS_DISABLE(GPIOD_BIT(3)); +const ::std::bitset<32> line_request::FLAG_BIAS_PULL_DOWN(GPIOD_BIT(4)); +const ::std::bitset<32> line_request::FLAG_BIAS_PULL_UP(GPIOD_BIT(5)); namespace { @@ -38,6 +41,9 @@ const ::std::map<::std::bitset<32>, int, bitset_cmp> reqflag_mapping = { { line_request::FLAG_ACTIVE_LOW, GPIOD_LINE_REQUEST_FLAG_ACTIVE_LOW, }, { line_request::FLAG_OPEN_DRAIN, GPIOD_LINE_REQUEST_FLAG_OPEN_DRAIN, }, { line_request::FLAG_OPEN_SOURCE, GPIOD_LINE_REQUEST_FLAG_OPEN_SOURCE, }, + { line_request::FLAG_BIAS_DISABLE, GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE, }, + { line_request::FLAG_BIAS_PULL_DOWN, GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN, }, + { line_request::FLAG_BIAS_PULL_UP, GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP, }, }; } /* namespace */