vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* netboot/natsemi.c: Fix compile error with gcc 4.1.1. Cast

Browse source 
cannot make a variable volatile - it should be declared as such.
* netboot/sis900.c: Likewise.
This commit is contained in:
proski 2006-09-10 07:26:10 +00:00
parent 79a9f283de
commit c819ffee91
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-09-10 Pavel Roskin <proski@gnu.org>
* netboot/natsemi.c: Fix compile error with gcc 4.1.1. Cast
cannot make a variable volatile - it should be declared as such.
* netboot/sis900.c: Likewise.
2006-09-08 Pavel Roskin <proski@gnu.org> 2006-09-08 Pavel Roskin <proski@gnu.org>
* netboot/etherboot.h: Remove incorrect extern declarations of * netboot/etherboot.h: Remove incorrect extern declarations of

4
netboot/natsemi.c
View file

@ -608,7 +608,7 @@ natsemi_transmit(struct nic *nic,
const char *p) /* Packet */ const char *p) /* Packet */
{ {
u32 status, to, nstype; u32 status, to, nstype;
u32 tx_status; volatile u32 tx_status;
/* Stop the transmitter */ /* Stop the transmitter */
outl(TxOff, ioaddr + ChipCmd); outl(TxOff, ioaddr + ChipCmd);
@ -647,7 +647,7 @@ natsemi_transmit(struct nic *nic,
to = currticks() + TX_TIMEOUT; to = currticks() + TX_TIMEOUT;
while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to))
/* wait */ ; /* wait */ ;
if (currticks() >= to) { if (currticks() >= to) {

4
netboot/sis900.c
View file

@ -901,7 +901,7 @@ sis900_transmit(struct nic *nic,
const char *p) /* Packet */ const char *p) /* Packet */
{ {
u32 status, to, nstype; u32 status, to, nstype;
u32 tx_status; volatile u32 tx_status;
/* Stop the transmitter */ /* Stop the transmitter */
outl(TxDIS, ioaddr + cr); outl(TxDIS, ioaddr + cr);
@ -940,7 +940,7 @@ sis900_transmit(struct nic *nic,
to = currticks() + TX_TIMEOUT; to = currticks() + TX_TIMEOUT;
while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to))
/* wait */ ; /* wait */ ;
if (currticks() >= to) { if (currticks() >= to) {