From owner-p4-projects@FreeBSD.ORG  Thu Nov  9 01:05:25 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B35FC16A47C; Thu,  9 Nov 2006 01:05:25 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 776DF16A403
	for <perforce@freebsd.org>; Thu,  9 Nov 2006 01:05:25 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3B71343D5A
	for <perforce@freebsd.org>; Thu,  9 Nov 2006 01:05:25 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA915P9s029007
	for <perforce@freebsd.org>; Thu, 9 Nov 2006 01:05:25 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA915ON6029004
	for perforce@freebsd.org; Thu, 9 Nov 2006 01:05:24 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 9 Nov 2006 01:05:24 GMT
Message-Id: <200611090105.kA915ON6029004@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109587 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Nov 2006 01:05:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=109587

Change 109587 by imp@imp_lighthouse on 2006/11/09 01:04:57

	Inline a little.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#15 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#15 (text+ko) ====

@@ -362,10 +362,12 @@
 	MCI_Device.state		= AT91C_MCI_IDLE;
 	MCI_Device.SDCard_bus_width	= AT91C_MCI_SCDBUS;
 
-	AT91F_MCI_Configure(AT91C_BASE_MCI,
-	    AT91C_MCI_DTOR_1MEGA_CYCLES,
-	    AT91C_MCI_PDCMODE,
-	    AT91C_MCI_SDCARD_4BITS_SLOTA);
+	//* Reset the MCI
+	AT91C_BASE_MCI->MCI_CR = AT91C_MCI_MCIEN | AT91C_MCI_PWSEN;
+	AT91C_BASE_MCI->MCI_IDR = 0xFFFFFFFF;
+	AT91C_BASE_MCI->MCI_DTOR = AT91C_MCI_DTOR_1MEGA_CYCLES;
+	AT91C_BASE_MCI->MCI_MR = AT91C_MCI_PDCMODE;
+	AT91C_BASE_MCI->MCI_SDCR = AT91C_MCI_SDCARD_4BITS_SLOTA;
 	MCI_SendCommand(GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT);
 
 	for (i = 0; i < 100; i++) {