From owner-p4-projects@FreeBSD.ORG  Fri Aug 11 00:16:02 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 60F9716A4E0; Fri, 11 Aug 2006 00:16:02 +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 18B3F16A4DE
	for <perforce@freebsd.org>; Fri, 11 Aug 2006 00:16:02 +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 D7C4943D45
	for <perforce@freebsd.org>; Fri, 11 Aug 2006 00:16:01 +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 k7B0G1eC084431
	for <perforce@freebsd.org>; Fri, 11 Aug 2006 00:16:01 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7B0G10F084428
	for perforce@freebsd.org; Fri, 11 Aug 2006 00:16:01 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 11 Aug 2006 00:16:01 GMT
Message-Id: <200608110016.k7B0G10F084428@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 103621 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: Fri, 11 Aug 2006 00:16:02 -0000

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

Change 103621 by imp@imp_lighthouse on 2006/08/11 00:15:24

	Kill dead code, minor formatting nits

Affected files ...

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

Differences ...

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

@@ -269,9 +269,9 @@
 int
 sdcard_init(void)
 {
-///////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 //  MCI Init : common to MMC and SDCard
-///////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 
 	//initInts();
 
@@ -283,28 +283,12 @@
 	// Init MCI Device Structures
 	AT91F_CfgDevice();
 
-	/*
-	// Disable all the interrupts
-	AT91C_BASE_MCI->MCI_IDR = 0xFFFFFFFF;
-
-
-	// Configure MCI interrupt 
-	AT91F_AIC_ConfigureIt(AT91C_BASE_AIC,
-						 AT91C_ID_MCI,
-						 AT91C_AIC_PRIOR_HIGHEST,
-						 AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE,
-						 AT91F_MCI_Handler);
-
-	// Enable MCI interrupt
-	AT91F_AIC_EnableIt(AT91C_BASE_AIC,AT91C_ID_MCI);
-	*/
-
 	AT91F_MCI_Configure(AT91C_BASE_MCI,
-						AT91C_MCI_DTOR_1MEGA_CYCLES,
-						AT91C_MCI_MR_PDCMODE,			// 15MHz for MCK = 60MHz (CLKDIV = 1)
-						AT91C_MCI_SDCARD_4BITS_SLOTA);
+	    AT91C_MCI_DTOR_1MEGA_CYCLES,
+	    AT91C_MCI_MR_PDCMODE,			// 15MHz for MCK = 60MHz (CLKDIV = 1)
+	    AT91C_MCI_SDCARD_4BITS_SLOTA);
 	
-	if(AT91F_MCI_SDCard_Init(&MCI_Device) != AT91C_INIT_OK)
+	if (AT91F_MCI_SDCard_Init(&MCI_Device) != AT91C_INIT_OK)
 		return 0;
 	return 1;
 }