* 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.

diff --git a/ChangeLog b/ChangeLog
index e546128541794f5882e905412a1c91fba879db8d..9af4b23a4d5376650ed3d370f9eed4170a3daaac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * netboot/etherboot.h: Remove incorrect extern declarations of

diff --git a/netboot/natsemi.c b/netboot/natsemi.c
index 56ff42dc4792dd5db4662b9fe8e962e6a7b620f9..5a164185ae79f9a66e456fb5a70025271dd1b43b 100644 (file)
--- a/netboot/natsemi.c
+++ b/netboot/natsemi.c
@@ -608,7 +608,7 @@ natsemi_transmit(struct nic  *nic,
                 const char  *p)     /* Packet */
 {
     u32 status, to, nstype;
-    u32 tx_status;
+    volatile u32 tx_status;
     
     /* Stop the transmitter */
     outl(TxOff, ioaddr + ChipCmd);
@@ -647,7 +647,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/netboot/sis900.c b/netboot/sis900.c
index 6208a26a44c8dcd92af0ba9306a0acdcef47cc76..44980d856e60a4c7c4e620bb36e47d4ec38f5cb5 100644 (file)
--- a/netboot/sis900.c
+++ b/netboot/sis900.c
@@ -901,7 +901,7 @@ sis900_transmit(struct nic  *nic,
                 const char  *p)     /* Packet */
 {
     u32 status, to, nstype;
-    u32 tx_status;
+    volatile u32 tx_status;
     
     /* Stop the transmitter */
     outl(TxDIS, ioaddr + cr);
@@ -940,7 +940,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) {