From owner-svn-src-head@FreeBSD.ORG  Wed Aug 29 04:41:25 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 ADF1D106566B;
	Wed, 29 Aug 2012 04:41:25 +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 98FF58FC08;
	Wed, 29 Aug 2012 04:41:25 +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 q7T4fPTA083964;
	Wed, 29 Aug 2012 04:41:25 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7T4fPVX083962;
	Wed, 29 Aug 2012 04:41:25 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201208290441.q7T4fPVX083962@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 29 Aug 2012 04:41:25 +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: r239804 - head/sys/arm/at91
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, 29 Aug 2012 04:41:25 -0000

Author: imp
Date: Wed Aug 29 04:41:25 2012
New Revision: 239804
URL: http://svn.freebsd.org/changeset/base/239804

Log:
  When copying data, use memcpy instead of bcopy.  It matches the
  arguments better.
  Also, set the need to use the workaround flag before we actually need
  to use it, rather than after.

Modified:
  head/sys/arm/at91/at91_mci.c

Modified: head/sys/arm/at91/at91_mci.c
==============================================================================
--- head/sys/arm/at91/at91_mci.c	Wed Aug 29 04:11:00 2012	(r239803)
+++ head/sys/arm/at91/at91_mci.c	Wed Aug 29 04:41:25 2012	(r239804)
@@ -211,7 +211,7 @@ at91_bswap_buf(struct at91_mci_softc *sc
 	 * ansley.com)
 	 */
 	if (!(sc->sc_cap & CAP_NEEDS_BYTESWAP)) {
-		bcopy(dptr, sptr, memsize);
+		memcpy(dptr, sptr, memsize);
 		return;
 	}
 
@@ -364,6 +364,12 @@ at91_mci_attach(device_t dev)
 	sc->sc_cap = 0;
 	if (at91_is_rm92())
 		sc->sc_cap |= CAP_NEEDS_BYTESWAP;
+	/*
+	 * MCI1 Rev 2 controllers need some workarounds, flag if so.
+	 */
+	if (at91_mci_is_mci1rev2xx())
+		sc->sc_cap |= CAP_MCI1_REV2XX;
+
 	err = at91_mci_activate(dev);
 	if (err)
 		goto out;
@@ -409,12 +415,6 @@ at91_mci_attach(device_t dev)
 	}
 
 	/*
-	 * MCI1 Rev 2 controllers need some workarounds, flag if so.
-	 */
-	if (at91_mci_is_mci1rev2xx())
-		sc->sc_cap |= CAP_MCI1_REV2XX;
-
-	/*
 	 * Allow 4-wire to be initially set via #define.
 	 * Allow a device hint to override that.
 	 * Allow a sysctl to override that.