From owner-svn-src-head@FreeBSD.ORG  Wed Aug  1 01:18:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 75DBD106564A;
	Wed,  1 Aug 2012 01:18:37 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 26DB78FC0A;
	Wed,  1 Aug 2012 01:18:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q711IbjY094393;
	Wed, 1 Aug 2012 01:18:37 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q711Ia5p094390;
	Wed, 1 Aug 2012 01:18:36 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201208010118.q711Ia5p094390@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 1 Aug 2012 01:18:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238965 - head/sys/dev/spibus
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2012 01:18:37 -0000

Author: imp
Date: Wed Aug  1 01:18:36 2012
New Revision: 238965
URL: http://svn.freebsd.org/changeset/base/238965

Log:
  Add the chip select glue.

Modified:
  head/sys/dev/spibus/spi.h
  head/sys/dev/spibus/spibus.c

Modified: head/sys/dev/spibus/spi.h
==============================================================================
--- head/sys/dev/spibus/spi.h	Wed Aug  1 00:36:12 2012	(r238964)
+++ head/sys/dev/spibus/spi.h	Wed Aug  1 01:18:36 2012	(r238965)
@@ -1,6 +1,7 @@
 /* $FreeBSD$ */
 
 struct spi_command {
+	int	cs;
 	void	*tx_cmd;
 	uint32_t tx_cmd_sz;
 	void	*rx_cmd;
@@ -10,3 +11,5 @@ struct spi_command {
 	void	*rx_data;
 	uint32_t rx_data_sz;
 };
+
+#define	SPI_CHIP_SELECT_HIGH	0x1		/* Chip select high (else low) */

Modified: head/sys/dev/spibus/spibus.c
==============================================================================
--- head/sys/dev/spibus/spibus.c	Wed Aug  1 00:36:12 2012	(r238964)
+++ head/sys/dev/spibus/spibus.c	Wed Aug  1 01:18:36 2012	(r238965)
@@ -158,6 +158,9 @@ spibus_hinted_child(device_t bus, const 
 static int
 spibus_transfer_impl(device_t dev, device_t child, struct spi_command *cmd)
 {
+	/* Maybe set flags too? spi mode? */
+	spibus_get_cs(dev, &cmd->cs);
+
 	return (SPIBUS_TRANSFER(device_get_parent(dev), child, cmd));
 }