diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-12-12 14:36:02 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-12-14 13:56:44 -0800 |
| commit | e2ab9215d792d07cfb725de290f416e331b87627 (patch) | |
| tree | 7fbf2b3f921ef78b277f5d89c1a9a14960a49edc /gpxe/src/drivers/net/eepro100.c | |
| parent | 36390f9712ac56be1dce7a635322bd96e15620c1 (diff) | |
| download | syslinux-e2ab9215d792d07cfb725de290f416e331b87627.tar.gz | |
gPXE: update to the "kkpxe" branchkkpxe
Update gPXE to the "kkpxe" branch, an experimental branch of the gPXE
tree which should let us eliminate the gpxelinux-specific hacks.
Specifically, this corresponds to checkin
0963c883a9402bd5846e687a100e196f7e8a2ef7 of
git://git.etherboot.org/scm/people/mcb30/gpxe.git.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'gpxe/src/drivers/net/eepro100.c')
| -rw-r--r-- | gpxe/src/drivers/net/eepro100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gpxe/src/drivers/net/eepro100.c b/gpxe/src/drivers/net/eepro100.c index f746976a..e6e7db49 100644 --- a/gpxe/src/drivers/net/eepro100.c +++ b/gpxe/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 */ |