diff options
| author | Michael Brown <mcb30@etherboot.org> | 2008-10-12 19:56:52 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2008-10-12 20:22:02 +0100 |
| commit | 16f1e35775c972ba8e02bc2d97d7a2eb333eae1b (patch) | |
| tree | f653099d4b230c9807986aa2b4cd89dce2cffe9b /src/drivers/net/epic100.c | |
| parent | e6f276ece3e805aec15f7462354faaa2c42e209f (diff) | |
| download | ipxe-16f1e35775c972ba8e02bc2d97d7a2eb333eae1b.tar.gz | |
[timer] Formalise the timer API
We now have two implementations for the timer API: one using the
time-of-day counter at 40:70 and one using RDTSC. Both make use of
timer2_udelay().
Diffstat (limited to 'src/drivers/net/epic100.c')
| -rw-r--r-- | src/drivers/net/epic100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c index 67b4f0fb4..1e36a6802 100644 --- a/src/drivers/net/epic100.c +++ b/src/drivers/net/epic100.c @@ -309,7 +309,7 @@ epic100_transmit(struct nic *nic, const char *destaddr, unsigned int type, unsigned short nstype; unsigned char *txp; int entry; - tick_t ct; + unsigned long ct; /* Calculate the next Tx descriptor entry. */ entry = cur_tx % TX_RING_SIZE; @@ -352,7 +352,7 @@ epic100_transmit(struct nic *nic, const char *destaddr, unsigned int type, ct = currticks(); /* timeout 10 ms for transmit */ while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) && - ct + 10*USECS_IN_MSEC < currticks()) + ct + 10*1000 < currticks()) /* Wait */; if ((le32_to_cpu(tx_ring[entry].status) & TRING_OWN) != 0) |