From patchwork Thu Nov 21 00:35:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 1198605 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="b3c4UJf9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47JLGS4Szyz9sNx for ; Thu, 21 Nov 2019 11:36:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726351AbfKUAgc (ORCPT ); Wed, 20 Nov 2019 19:36:32 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:36379 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726044AbfKUAgc (ORCPT ); Wed, 20 Nov 2019 19:36:32 -0500 Received: by mail-pj1-f68.google.com with SMTP id cq11so617969pjb.3 for ; Wed, 20 Nov 2019 16:36:31 -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=Ji4XS3PkDfmdwlRr49EB6DYi3k4STZ5B6ixXS4OLMWw=; b=b3c4UJf9jhKYpEAqkCPLVCYbxF+dNtyplHsW74SrZMgzsW1yusQV/jOiPRkhQfpemg 3MT38dUQvxVu91fP8iqyqboHKFoGj9xqLWUVCyvxPIKW7LOgGYv1yt4b9r2PPm1l+xSZ 56dle4lXrlUiVTm8frGMtek5YCEqcVuqcgi2u/dSJrCFCQPI7yd6WvGSAi3heJhmJK/C GeWh7rKty84iB404EfLPPDVN7b24zs5L8hXeDPN5CtUOGU5E2/8MXScTFR8CvD/lPWjd bXngMCeMy4jrx7EzKoSKHVnsWzqSBIfcf/xMosZ3r7Z14OimAn2bxBwo3SxlM2Lu2s0R t8iA== 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=Ji4XS3PkDfmdwlRr49EB6DYi3k4STZ5B6ixXS4OLMWw=; b=YRvKwmnq8vk8wC5QkPS6qVl9axde64gpX6z7YOAuh7kCBElaJcMVjpS2S3v+vJX0RU 7m64Onb70nmnY/D6rZpR+aLB+rkwOCUL3OAU4fE5zbAXWiuPVP6VX5tFlcBIawHVR5p+ YevqaQoHR1KoxmAIFIYIj2pSVOcc3RKNI1+dRLHxNnIlUDIaSYTUM+f9Fv2WpFrzerbE vT6oAFfa5v+D7Md+lSmPVioD2ild20uXCVjTupl0ldp9fJ1DoN4fJAnUpX6L89+hheuR he38uByp4RQkDzHl2NNbagyDkz13dKVARF1g8GD+Nz1bXoEExK9lM3rwHE4AIQy7f5Aw Ftgg== X-Gm-Message-State: APjAAAXAM4nj4Wf0gSG/OEOu24aOnxtQqdQNJuWnmvZarpEUFxt/E+Q+ lGI2VO36ZCz887Oemxyd5tN+hzxMyfc= X-Google-Smtp-Source: APXvYqwpflVHTxGFL37hUNn9sruenCDcXW3IO68elrsYicZqwvJblilUHFgjkHZjnfHT8hxvb6n4WQ== X-Received: by 2002:a17:90a:2a44:: with SMTP id d4mr7521190pjg.91.1574296590387; Wed, 20 Nov 2019 16:36:30 -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 s1sm420756pgk.9.2019.11.20.16.36.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2019 16:36:29 -0800 (PST) From: Kent Gibson To: linux-gpio@vger.kernel.org, bgolaszewski@baylibre.com Cc: Kent Gibson Subject: [libgpiod] [PATCH v2 05/14] bindings: python: add support for bias flags Date: Thu, 21 Nov 2019 08:35:47 +0800 Message-Id: <20191121003556.9020-6-warthog618@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191121003556.9020-1-warthog618@gmail.com> References: <20191121003556.9020-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/python/gpiodmodule.c | 82 +++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/bindings/python/gpiodmodule.c b/bindings/python/gpiodmodule.c index 2f6ef51..4723771 100644 --- a/bindings/python/gpiodmodule.c +++ b/bindings/python/gpiodmodule.c @@ -60,6 +60,9 @@ enum { gpiod_LINE_REQ_FLAG_OPEN_DRAIN = GPIOD_BIT(0), gpiod_LINE_REQ_FLAG_OPEN_SOURCE = GPIOD_BIT(1), gpiod_LINE_REQ_FLAG_ACTIVE_LOW = GPIOD_BIT(2), + gpiod_LINE_REQ_FLAG_BIAS_DISABLE = GPIOD_BIT(3), + gpiod_LINE_REQ_FLAG_BIAS_PULL_DOWN = GPIOD_BIT(4), + gpiod_LINE_REQ_FLAG_BIAS_PULL_UP = GPIOD_BIT(5), }; enum { @@ -72,6 +75,13 @@ enum { gpiod_ACTIVE_LOW, }; +enum { + gpiod_BIAS_AS_IS = 1, + gpiod_BIAS_DISABLE, + gpiod_BIAS_PULL_UP, + gpiod_BIAS_PULL_DOWN, +}; + enum { gpiod_RISING_EDGE = 1, gpiod_FALLING_EDGE, @@ -358,6 +368,34 @@ static PyObject *gpiod_Line_active_state(gpiod_LineObject *self, return ret; } +PyDoc_STRVAR(gpiod_Line_bias_doc, +"bias() -> integer\n" +"\n" +"Get the bias setting of this GPIO line."); + +static PyObject *gpiod_Line_bias(gpiod_LineObject *self, + PyObject *Py_UNUSED(ignored)) +{ + int bias; + + if (gpiod_ChipIsClosed(self->owner)) + return NULL; + + bias = gpiod_line_bias(self->line); + + switch (bias) { + case GPIOD_LINE_BIAS_PULL_UP: + return Py_BuildValue("I", gpiod_BIAS_PULL_UP); + case GPIOD_LINE_BIAS_PULL_DOWN: + 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: + default: + return Py_BuildValue("I", gpiod_BIAS_AS_IS); + } +} + PyDoc_STRVAR(gpiod_Line_is_used_doc, "is_used() -> boolean\n" "\n" @@ -752,6 +790,12 @@ static PyMethodDef gpiod_Line_methods[] = { .ml_flags = METH_NOARGS, .ml_doc = gpiod_Line_active_state_doc, }, + { + .ml_name = "bias", + .ml_meth = (PyCFunction)gpiod_Line_bias, + .ml_flags = METH_NOARGS, + .ml_doc = gpiod_Line_bias_doc, + }, { .ml_name = "is_used", .ml_meth = (PyCFunction)gpiod_Line_is_used, @@ -1030,6 +1074,12 @@ static void gpiod_MakeRequestConfig(struct gpiod_line_request_config *conf, conf->flags |= GPIOD_LINE_REQUEST_FLAG_OPEN_SOURCE; if (flags & gpiod_LINE_REQ_FLAG_ACTIVE_LOW) conf->flags |= GPIOD_LINE_REQUEST_FLAG_ACTIVE_LOW; + if (flags & gpiod_LINE_REQ_FLAG_BIAS_DISABLE) + conf->flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_DISABLE; + if (flags & gpiod_LINE_REQ_FLAG_BIAS_PULL_DOWN) + conf->flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_DOWN; + if (flags & gpiod_LINE_REQ_FLAG_BIAS_PULL_UP) + conf->flags |= GPIOD_LINE_REQUEST_FLAG_BIAS_PULL_UP; } PyDoc_STRVAR(gpiod_LineBulk_request_doc, @@ -2313,6 +2363,26 @@ static gpiod_ConstDescr gpiod_ConstList[] = { .name = "ACTIVE_LOW", .val = gpiod_ACTIVE_LOW, }, + { + .typeobj = &gpiod_LineType, + .name = "BIAS_AS_IS", + .val = gpiod_BIAS_AS_IS, + }, + { + .typeobj = &gpiod_LineType, + .name = "BIAS_DISABLE", + .val = gpiod_BIAS_DISABLE, + }, + { + .typeobj = &gpiod_LineType, + .name = "BIAS_PULL_UP", + .val = gpiod_BIAS_PULL_UP, + }, + { + .typeobj = &gpiod_LineType, + .name = "BIAS_PULL_DOWN", + .val = gpiod_BIAS_PULL_DOWN, + }, { .typeobj = &gpiod_LineEventType, .name = "RISING_EDGE", @@ -2381,6 +2451,18 @@ static gpiod_ModuleConst gpiod_ModuleConsts[] = { .name = "LINE_REQ_FLAG_ACTIVE_LOW", .value = gpiod_LINE_REQ_FLAG_ACTIVE_LOW, }, + { + .name = "LINE_REQ_FLAG_BIAS_DISABLE", + .value = gpiod_LINE_REQ_FLAG_BIAS_DISABLE, + }, + { + .name = "LINE_REQ_FLAG_BIAS_PULL_DOWN", + .value = gpiod_LINE_REQ_FLAG_BIAS_PULL_DOWN, + }, + { + .name = "LINE_REQ_FLAG_BIAS_PULL_UP", + .value = gpiod_LINE_REQ_FLAG_BIAS_PULL_UP, + }, { } };