diff options
| author | Michael Brown | 2008-03-10 14:02:53 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-03-10 14:02:53 +0100 |
| commit | 3e781eb87f7b5bfa638f94234bb5e9d64508b0a4 (patch) | |
| tree | 5884ac0438320638c846166856a4b54b3564bd23 /src/drivers/net/epic100.c | |
| parent | [PXE] Work around a buffer-size bug in WinPE (diff) | |
| parent | Use plain C in timer_rdtsc for division instead of inline asssembly. (diff) | |
| download | ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.tar.gz ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.tar.xz ipxe-3e781eb87f7b5bfa638f94234bb5e9d64508b0a4.zip | |
Merge branch 'xl0-timer'
Diffstat (limited to 'src/drivers/net/epic100.c')
| -rw-r--r-- | src/drivers/net/epic100.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c index e79da2b9b..67b4f0fb4 100644 --- a/src/drivers/net/epic100.c +++ b/src/drivers/net/epic100.c @@ -8,7 +8,6 @@ #include <gpxe/pci.h> #include <gpxe/ethernet.h> #include "nic.h" -#include "timer.h" #include "console.h" #include "epic100.h" @@ -310,6 +309,7 @@ epic100_transmit(struct nic *nic, const char *destaddr, unsigned int type, unsigned short nstype; unsigned char *txp; int entry; + tick_t ct; /* Calculate the next Tx descriptor entry. */ entry = cur_tx % TX_RING_SIZE; @@ -339,18 +339,20 @@ epic100_transmit(struct nic *nic, const char *destaddr, unsigned int type, * set the base address with the "ownership" * bits last. */ - + tx_ring[entry].buflength |= cpu_to_le32(len); - tx_ring[entry].status = cpu_to_le32(len << 16) | + tx_ring[entry].status = cpu_to_le32(len << 16) | cpu_to_le32(TRING_OWN); /* Pass ownership to the chip. */ cur_tx++; /* Trigger an immediate transmit demand. */ - outl(CR_QUEUE_TX, command); - - load_timer2(10*TICKS_PER_MS); /* timeout 10 ms for transmit */ - while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) && timer2_running()) + outl(CR_QUEUE_TX, command); + + ct = currticks(); + /* timeout 10 ms for transmit */ + while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) && + ct + 10*USECS_IN_MSEC < currticks()) /* Wait */; if ((le32_to_cpu(tx_ring[entry].status) & TRING_OWN) != 0) |