# HG changeset patch
# User sergeig
# Date 1326825270 0
# Node ID afc51ff1474bf26d781116ac288a8252bf0b7b58
# Parent  f782e74a7b6b1dffe1b509d3973483e36e1220af
* src/via_rhine.h: Fix some compiler warning.
* src/if_rhine.c (via_rhine_init): Manage ESA with HAL_PCI_IO* macros.
[ Bugzilla 1001269 ]

diff --git a/packages/devs/eth/via/rhine/current/ChangeLog b/packages/devs/eth/via/rhine/current/ChangeLog
--- a/packages/devs/eth/via/rhine/current/ChangeLog
+++ b/packages/devs/eth/via/rhine/current/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-28  Stephen Polkowski  <stephen@centtech.com>
+            Sergei Gavrikov  <sergei.gavrikov@gmail.com>
+
+	* src/via_rhine.h: Fix some compiler warning.
+	* src/if_rhine.c (via_rhine_init): Manage ESA with HAL_PCI_IO* macros.
+	[ Bugzilla 1001269 ]
+
 2004-08-12  Jani Monoses <jani@iv.ro>
 
 	* src/if_rhine.c: Fix builing with lwip.
diff --git a/packages/devs/eth/via/rhine/current/src/if_rhine.c b/packages/devs/eth/via/rhine/current/src/if_rhine.c
--- a/packages/devs/eth/via/rhine/current/src/if_rhine.c
+++ b/packages/devs/eth/via/rhine/current/src/if_rhine.c
@@ -538,14 +538,12 @@ via_rhine_init(struct cyg_netdevtab_entr
     // Prepare ESA
     if (cpd->hardwired_esa) {
         // Force the NIC to use the specified ESA
-        p = cpd->base + RHINE_PAR0;
         for (i = 0; i < 6; i++)
-            *p++ = cpd->esa[i];
+            HAL_PCI_IO_WRITE_UINT8(cpd->base + RHINE_PAR0 + i, cpd->esa[i]);
     } else {
         // Use the address from the serial EEPROM
-        p = cpd->base + RHINE_PAR0;
         for (i = 0; i < 6; i++)
-            cpd->esa[i] = *p++;
+            HAL_PCI_IO_READ_UINT8(cpd->base + RHINE_PAR0 + i, cpd->esa[i]);
     }
 #if DEBUG & 8
     diag_printf("RHINE - %s ESA: %02x:%02x:%02x:%02x:%02x:%02x\n",
diff --git a/packages/devs/eth/via/rhine/current/src/via_rhine.h b/packages/devs/eth/via/rhine/current/src/via_rhine.h
--- a/packages/devs/eth/via/rhine/current/src/via_rhine.h
+++ b/packages/devs/eth/via/rhine/current/src/via_rhine.h
@@ -464,5 +464,5 @@ typedef struct rhine_priv_data {
 } rhine_priv_data;
 
 // ------------------------------------------------------------------------
-#endif CYGONCE_DEVS_ETH_VIA_RHINE_H
+#endif // CYGONCE_DEVS_ETH_VIA_RHINE_H
 // EOF via_rhine.h