From owner-svn-src-head@freebsd.org Tue Apr 19 14:18:13 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7EEA5B13670; Tue, 19 Apr 2016 14:18:13 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2F17416BE; Tue, 19 Apr 2016 14:18:13 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3JEICIC023256; Tue, 19 Apr 2016 14:18:12 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3JEICrY023254; Tue, 19 Apr 2016 14:18:12 GMT (envelope-from br@FreeBSD.org) Message-Id: <201604191418.u3JEICrY023254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Tue, 19 Apr 2016 14:18:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298268 - head/sys/dev/spibus X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2016 14:18:13 -0000 Author: br Date: Tue Apr 19 14:18:12 2016 New Revision: 298268 URL: https://svnweb.freebsd.org/changeset/base/298268 Log: Add optional chip_select/deselect methods. This is required when we want to keep CS asserted for multiple transfers. Modified: head/sys/dev/spibus/spibus.c head/sys/dev/spibus/spibus_if.m Modified: head/sys/dev/spibus/spibus.c ============================================================================== --- head/sys/dev/spibus/spibus.c Tue Apr 19 13:36:31 2016 (r298267) +++ head/sys/dev/spibus/spibus.c Tue Apr 19 14:18:12 2016 (r298268) @@ -185,9 +185,24 @@ spibus_hinted_child(device_t bus, const static int spibus_transfer_impl(device_t dev, device_t child, struct spi_command *cmd) { + return (SPIBUS_TRANSFER(device_get_parent(dev), child, cmd)); } +static int +spibus_chip_select_impl(device_t dev, device_t child) +{ + + return (SPIBUS_CHIP_SELECT(device_get_parent(dev), child)); +} + +static int +spibus_chip_deselect_impl(device_t dev, device_t child) +{ + + return (SPIBUS_CHIP_DESELECT(device_get_parent(dev), child)); +} + static device_method_t spibus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, spibus_probe), @@ -208,6 +223,8 @@ static device_method_t spibus_methods[] /* spibus interface */ DEVMETHOD(spibus_transfer, spibus_transfer_impl), + DEVMETHOD(spibus_chip_select, spibus_chip_select_impl), + DEVMETHOD(spibus_chip_deselect, spibus_chip_deselect_impl), DEVMETHOD_END }; Modified: head/sys/dev/spibus/spibus_if.m ============================================================================== --- head/sys/dev/spibus/spibus_if.m Tue Apr 19 13:36:31 2016 (r298267) +++ head/sys/dev/spibus/spibus_if.m Tue Apr 19 14:18:12 2016 (r298268) @@ -39,3 +39,19 @@ METHOD int transfer { device_t child; struct spi_command *cmd; }; + +# +# Assert chip select +# +METHOD int chip_select { + device_t dev; + device_t child; +}; + +# +# Deassert chip select +# +METHOD int chip_deselect { + device_t dev; + device_t child; +};