unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / devs / eth / smsc / lan91cxx / v2_0 / src / smsc_lan91cxx.h

diff --git a/packages/devs/eth/smsc/lan91cxx/v2_0/src/smsc_lan91cxx.h b/packages/devs/eth/smsc/lan91cxx/v2_0/src/smsc_lan91cxx.h
index 198b341b5943a84a84c05c4fa4646786c180a051..28c9e624a83baefb9b8e4905489154b9f292e1ae 100644 (file)
--- a/packages/devs/eth/smsc/lan91cxx/v2_0/src/smsc_lan91cxx.h
+++ b/packages/devs/eth/smsc/lan91cxx/v2_0/src/smsc_lan91cxx.h
@@ -318,7 +318,7 @@ typedef struct lan91cxx_priv_data {
     unsigned char enaddr[6];            // Controller ESA
     // Function to configure the ESA - may fetch ESA from EPROM or 
     // RedBoot config option.  Use of the 'config_enaddr()' function
-    // is depreciated in favor of the 'provide_esa()' function and
+    // is deprecated in favor of the 'provide_esa()' function and
     // 'hardwired_esa' boolean
     void (*config_enaddr)(struct lan91cxx_priv_data* cpd);
     // New function to fetch the ESA from flash via RedBoot
@@ -330,6 +330,8 @@ typedef struct lan91cxx_priv_data {
     int within_send;
     int addrsh;                         // Address bits to shift
     int c111_reva;                      // true if this is a revA LAN91C111
+    cyg_uint32 data_buf;
+    int   data_pos;
 #ifdef KEEP_STATISTICS
     struct smsc_lan91cxx_stats stats;
 #endif
@@ -339,7 +341,7 @@ typedef struct lan91cxx_priv_data {
 
 #include CYGDAT_DEVS_ETH_SMSC_LAN91CXX_INL
 
-#ifdef CYGSEM_DEVS_ETH_SMSC_LAN91CXX_USE_32BIT
+#ifdef LAN91CXX_32BIT_RX
 typedef cyg_uint32 rxd_t;
 #else
 typedef cyg_uint16 rxd_t;
@@ -406,7 +408,7 @@ get_data(struct eth_drv_sc *sc)
     struct lan91cxx_priv_data *cpd =
         (struct lan91cxx_priv_data *)sc->driver_private;
        
-#ifdef CYGSEM_DEVS_ETH_SMSC_LAN91CXX_USE_32BIT
+#ifdef LAN91CXX_32BIT_RX
     HAL_READ_UINT32(cpd->base+((LAN91CXX_DATA_HIGH & 0x7) << cpd->addrsh), val);
 #else
     HAL_READ_UINT16(cpd->base+((LAN91CXX_DATA & 0x7) << cpd->addrsh), val);