minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: ftmac100: update get_timer() usages

Browse Source 
Use get_timer() the same way as drivers/net/ftgmac100.c

Signed-off-by: Po-Yu Chuang <ratbert@faraday-tech.com>
Reviewed-by: Macpaul Lin <macpaul@gmail.com>
Tested-by: Macpaul Lin <macpaul@gmail.com>
This commit is contained in:
Po-Yu Chuang 2011-01-21 15:51:25 +08:00 committed by Wolfgang Denk
parent 6f6e6e09b2
commit 8d8fd5b696
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ftmac100.c
View File

@ -195,8 +195,8 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length)
{ {
struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase; struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase;
struct ftmac100_data *priv = dev->priv; struct ftmac100_data *priv = dev->priv;
int tmo;
struct ftmac100_txdes *curr_des = priv->txdes; struct ftmac100_txdes *curr_des = priv->txdes;
ulong start;
if (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { if (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) {
debug ("%s(): no TX descriptor available\n", __func__); debug ("%s(): no TX descriptor available\n", __func__);
@ -224,9 +224,9 @@ ftmac100_send (struct eth_device *dev, volatile void *packet, int length)
/* wait for transfer to succeed */ /* wait for transfer to succeed */
tmo = get_timer (0) + 5 * CONFIG_SYS_HZ; start = get_timer(0);
while (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) { while (curr_des->txdes0 & FTMAC100_TXDES0_TXDMA_OWN) {
if (get_timer (0) >= tmo) { if (get_timer(start) >= 5) {
debug ("%s(): timed out\n", __func__); debug ("%s(): timed out\n", __func__);
return -1; return -1;
} }