From owner-svn-src-all@FreeBSD.ORG  Tue Dec  8 21:42:05 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D06D1065700;
	Tue,  8 Dec 2009 21:42:05 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EFC788FC19;
	Tue,  8 Dec 2009 21:42:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB8Lg4Es000845;
	Tue, 8 Dec 2009 21:42:04 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB8Lg4A5000843;
	Tue, 8 Dec 2009 21:42:04 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200912082142.nB8Lg4A5000843@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 8 Dec 2009 21:42:04 +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: r200275 - head/sys/arm/mv
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Dec 2009 21:42:05 -0000

Author: mav
Date: Tue Dec  8 21:42:04 2009
New Revision: 200275
URL: http://svn.freebsd.org/changeset/base/200275

Log:
  Fix the build.

Modified:
  head/sys/arm/mv/mv_sata.c

Modified: head/sys/arm/mv/mv_sata.c
==============================================================================
--- head/sys/arm/mv/mv_sata.c	Tue Dec  8 20:48:06 2009	(r200274)
+++ head/sys/arm/mv/mv_sata.c	Tue Dec  8 21:42:04 2009	(r200275)
@@ -137,6 +137,7 @@ static int	sata_channel_begin_transactio
 static int	sata_channel_end_transaction(struct ata_request *request);
 static int	sata_channel_status(device_t dev);
 static int	sata_channel_setmode(device_t dev, int target, int mode);
+static int	sata_channel_getrev(device_t dev, int target);
 static void	sata_channel_reset(device_t dev);
 static void	sata_channel_dmasetprd(void *xsc, bus_dma_segment_t *segs,
     int nsegs, int error);
@@ -423,7 +424,7 @@ sata_channel_attach(device_t dev)
 
 	ch->dev = dev;
 	ch->unit = device_get_unit(dev);
-	ch->flags |= ATA_USE_16BIT | ATA_NO_SLAVE;
+	ch->flags |= ATA_USE_16BIT | ATA_NO_SLAVE | ATA_SATA;
 
 	/* Set legacy ATA resources. */
 	for (i = ATA_DATA; i <= ATA_COMMAND; i++) {
@@ -754,7 +755,16 @@ sata_channel_setmode(device_t parent, in
 
 	/* Disable EDMA before using legacy registers */
 	sata_edma_ctrl(parent, 0);
-	return (ata_sata_setmode(dev, mode));
+	return (ata_sata_setmode(parent, target, mode));
+}
+
+static int
+sata_channel_getrev(device_t parent, int target)
+{
+
+	/* Disable EDMA before using legacy registers */
+	sata_edma_ctrl(parent, 0);
+	return (ata_sata_getrev(parent, target));
 }
 
 static void
@@ -843,6 +853,7 @@ static device_method_t sata_channel_meth
 	/* ATA channel interface */
 	DEVMETHOD(ata_reset,		sata_channel_reset),
 	DEVMETHOD(ata_setmode,		sata_channel_setmode),
+	DEVMETHOD(ata_getrev,		sata_channel_getrev),
 	{ 0, 0 }
 };