PERFORCE change 103613 for review
Warner Losh
imp at FreeBSD.org
Thu Aug 10 23:03:31 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103613
Change 103613 by imp at 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
More information about the p4-projects
mailing list