From c4c05bbbf7180baaeb95e6177a7089c553b42d3e Mon Sep 17 00:00:00 2001 From: George Baum Date: Mon, 23 May 2005 19:30:37 +0000 Subject: [PATCH] the uncontroversal gcc 4.0 compilation fixes --- src/drivers/net/natsemi.c | 4 ++-- 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 774b5e31..e8f6d81c 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 b5ba3f08..c2cb94e8 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) {