diff options
| author | George Baum | 2005-05-23 21:30:37 +0200 |
|---|---|---|
| committer | George Baum | 2005-05-23 21:30:37 +0200 |
| commit | c4c05bbbf7180baaeb95e6177a7089c553b42d3e (patch) | |
| tree | 5e1139be5c6bd84ae741374ec0ed99ba50241c2f /src/drivers | |
| parent | Separated out the Etherboot-specific parts of the old pxe.h header. (diff) | |
| download | ipxe-c4c05bbbf7180baaeb95e6177a7089c553b42d3e.tar.gz ipxe-c4c05bbbf7180baaeb95e6177a7089c553b42d3e.tar.xz ipxe-c4c05bbbf7180baaeb95e6177a7089c553b42d3e.zip | |
the uncontroversal gcc 4.0 compilation fixes
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/net/natsemi.c | 4 | ||||
| -rw-r--r-- | src/drivers/net/sis900.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c index 774b5e310..e8f6d81c1 100644 --- a/src/drivers/net/natsemi.c +++ b/src/drivers/net/natsemi.c @@ -604,7 +604,7 @@ natsemi_transmit(struct nic *nic, const char *p) /* Packet */ { u32 to, nstype; - u32 tx_status; + volatile u32 tx_status; /* Stop the transmitter */ outl(TxOff, ioaddr + ChipCmd); @@ -643,7 +643,7 @@ natsemi_transmit(struct nic *nic, to = currticks() + TX_TIMEOUT; - while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) + while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) /* wait */ ; if (currticks() >= to) { diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c index b5ba3f08b..c2cb94e87 100644 --- a/src/drivers/net/sis900.c +++ b/src/drivers/net/sis900.c @@ -1097,7 +1097,7 @@ sis900_transmit(struct nic *nic, const char *p) /* Packet */ { u32 to, nstype; - u32 tx_status; + volatile u32 tx_status; /* Stop the transmitter */ outl(TxDIS | inl(ioaddr + cr), ioaddr + cr); @@ -1136,7 +1136,7 @@ sis900_transmit(struct nic *nic, to = currticks() + TX_TIMEOUT; - while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) + while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) /* wait */ ; if (currticks() >= to) { |