Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "SMC911x driver fixed for NFS boot"

Browse source 
This reverts commit ca9c8a1e10,
which causes compile warnings ("large integer implicitly truncated
to unsigned type") on all systems that use this driver. The warning
results from passing long constants (TX_CFG, RX_CFG) into
smc911x_set_mac_csr() which is declared to accept "unsigned
character" arguments only.

Being close to a release, with nobody available to actually test the
code or the suggested fixes, it seems better to revert the patch.
This commit is contained in:
Wolfgang Denk 2009-06-14 20:31:36 +02:00
parent e7563aff17
commit c3147c1762
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/net/smc911x.c
View file

@ -117,27 +117,6 @@ static int smc911x_phy_reset(void)
return 0;
}
static void smc911x_shutdown(void)
{
unsigned int cr;
/* Turn of Rx and TX */
cr = smc911x_get_mac_csr(MAC_CR);
cr &= ~(MAC_CR_TXEN | MAC_CR_RXEN | MAC_CR_HBDIS);
smc911x_set_mac_csr(MAC_CR, cr);
/* Stop Transmission */
cr = smc911x_get_mac_csr(TX_CFG);
cr &= ~(TX_CFG_STOP_TX);
smc911x_set_mac_csr(TX_CFG, cr);
/* Stop receiving packets */
cr = smc911x_get_mac_csr(RX_CFG);
cr &= ~(RX_CFG_RXDOFF);
smc911x_set_mac_csr(RX_CFG, cr);
}
static void smc911x_phy_configure(void)
{
int timeout;
@ -246,7 +225,7 @@ int eth_send(volatile void *packet, int length)
void eth_halt(void)
{
smc911x_shutdown();
smc911x_reset();
}
int eth_rx(void)