From owner-p4-projects@FreeBSD.ORG  Thu Aug 10 23:03:30 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 C236516A55D; Thu, 10 Aug 2006 23:03:30 +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 6FEAE16A55B
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:03:30 +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 78A7143D64
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:03:28 +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 k7AN3SuN078553
	for <perforce@freebsd.org>; Thu, 10 Aug 2006 23:03:28 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7AN3SAf078550
	for perforce@freebsd.org; Thu, 10 Aug 2006 23:03:28 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 10 Aug 2006 23:03:28 GMT
Message-Id: <200608102303.k7AN3SAf078550@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 103613 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, 10 Aug 2006 23:03:31 -0000

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

Change 103613 by imp@imp_lighthouse on 2006/08/10 23:02:49

	Kill some code

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootsd/Makefile#3 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#5 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ints.c#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/ints.h#2 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/sd-card.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/bootsd/Makefile#3 (text+ko) ====

@@ -5,7 +5,7 @@
 P=bootsd
 FILES=${P}
 SRCS=arm_init.S main.c
-SRCS+=ints.c mci_device.c sd-card.c stormy16-lib2.c
+SRCS+=mci_device.c sd-card.c stormy16-lib2.c
 NO_MAN=
 LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}

==== //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#5 (text+ko) ====

@@ -80,7 +80,6 @@
 int
 main(void)
 {
-	unsigned	low_addr, high_addr;
 #ifdef REAL
 	int i;
 #endif
@@ -98,9 +97,7 @@
 #endif
 	EMAC_Init();
 	sdcard_init();
-	low_addr = (mac[3] << 24) | (mac[2] << 16) | (mac[1] << 8) | mac[0];
-	high_addr = (mac[5] << 8) | mac[4];
-	SetMACAddress(low_addr, high_addr);
+	SetMACAddress(mac);
 	printf("Reading from card...");
 #ifdef REAL
 	for (i = 0x80; i < 10 * 2048; i++) {

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

@@ -229,62 +229,6 @@
 }
 
 
-#if 0
-//*----------------------------------------------------------------------------
-//* \fn    AT91F_Test
-//* \brief Test Functions
-//*----------------------------------------------------------------------------
-static int AT91F_Test(void)
-{
-	int i;
-	unsigned int Max_Read_DataBlock_Length;
-	int status;
-		
-	Max_Read_DataBlock_Length = MCI_Device.pMCI_DeviceFeatures->Max_Read_DataBlock_Length;
-	
-	//* ReadBlock & WriteBlock Test -> Entire Block
-
-	//* Wait MCI Device Ready
-	AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
-
-	//* Read Block 1
-	for(i=0;i<BUFFER_SIZE_MCI_DEVICE;i++) 	Buffer[i] = 0x00;	
-	status = AT91F_MCI_ReadBlock(&MCI_Device,(1*Max_Read_DataBlock_Length),(unsigned int*) Buffer,Max_Read_DataBlock_Length);
-		if (status != AT91C_READ_OK)
-		{
-			printf("\r\npre: Read error %x", status);
-		}
-
-	//* Wait end of Read
-	AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
-
-	//* Write Page 1
-    //sprintf(Buffer,"\r\nThis sentence is written in your device... Congratulations\r\n");
-	status = AT91F_MCI_WriteBlock(&MCI_Device,(1*Max_Read_DataBlock_Length),(unsigned int*) Buffer,Max_Read_DataBlock_Length);
-		if (status != AT91C_WRITE_OK)
-			printf("\r\npre: write error %x", status);
-
-	//* Wait end of Write
-	AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
-
-	//* Read Block 1
-	for(i=0;i<BUFFER_SIZE_MCI_DEVICE;i++) 	Buffer[i] = 0x00;	
-	status = AT91F_MCI_ReadBlock(&MCI_Device,(1*Max_Read_DataBlock_Length),(unsigned int*) Buffer,Max_Read_DataBlock_Length);
-	//printf(Buffer);
-		if (status != AT91C_READ_OK)
-			printf("\r\npre: Read error %x", status);
-
-	//* Wait end of Read
-	AT91F_MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
-
-	//* End Of Test
-	printf("\r\nTests Completed: !!!\r\n");
-	printf(Buffer);
-
-	return TRUE;
-}
-#endif
-
 //*----------------------------------------------------------------------------
 //* \fn    AT91F_CfgDevice
 //* \brief This function is used to initialise MMC or SDCard Features