diff options
author | Michael Brown | 2008-10-12 20:56:52 +0200 |
---|---|---|
committer | Michael Brown | 2008-10-12 21:22:02 +0200 |
commit | 16f1e35775c972ba8e02bc2d97d7a2eb333eae1b (patch) | |
tree | f653099d4b230c9807986aa2b4cd89dce2cffe9b /src/drivers/net/eepro100.c | |
parent | [process] Add DBG2() messages to help track down frozen processes (diff) | |
download | ipxe-16f1e35775c972ba8e02bc2d97d7a2eb333eae1b.tar.gz ipxe-16f1e35775c972ba8e02bc2d97d7a2eb333eae1b.tar.xz ipxe-16f1e35775c972ba8e02bc2d97d7a2eb333eae1b.zip |
[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/eepro100.c')
-rw-r--r-- | src/drivers/net/eepro100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c index f746976a..e6e7db49 100644 --- a/src/drivers/net/eepro100.c +++ b/src/drivers/net/eepro100.c @@ -407,7 +407,7 @@ static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, un } hdr; unsigned short status; int s1, s2; - tick_t ct; + unsigned long ct; status = inw(ioaddr + SCBStatus); /* Acknowledge all of the current interrupt sources ASAP. */ @@ -448,7 +448,7 @@ static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, un ct = currticks(); /* timeout 10 ms for transmit */ - while (!txfd.status && ct + 10*USECS_IN_MSEC) + while (!txfd.status && ct + 10*1000) /* Wait */; s2 = inw (ioaddr + SCBStatus); @@ -608,7 +608,7 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) { int read_cmd, ee_size; int options; int rx_mode; - tick_t ct; + unsigned long ct; /* we cache only the first few words of the EEPROM data be careful not to access beyond this array */ @@ -753,7 +753,7 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) { whereami ("started TX thingy (config, iasetup)."); ct = currticks(); - while (!txfd.status && ct + 10*USECS_IN_MSEC < currticks()) + while (!txfd.status && ct + 10*1000 < currticks()) /* Wait */; /* Read the status register once to disgard stale data */ |