[src/netbsd-1-5]: src/sys/dev/cardbus Pull up revision 1.18 (via patch, reque...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/966cea5faf9c
branches:  netbsd-1-5
changeset: 491186:966cea5faf9c
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 05 23:56:00 2001 +0000

description:
Pull up revision 1.18 (via patch, requested by fvdl):
  Add explicit config values for 8 bit and offset EEPROMS, since
  this property is now shared with the PCI frontend.

  Done in conjunction with adding support for the 3Com 3c555, 3c556
  and 3c556B MiniPCI Ethernet cards.

diffstat:

 sys/dev/cardbus/if_ex_cardbus.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 99e0ae401550 -r 966cea5faf9c sys/dev/cardbus/if_ex_cardbus.c
--- a/sys/dev/cardbus/if_ex_cardbus.c   Thu Apr 05 23:48:27 2001 +0000
+++ b/sys/dev/cardbus/if_ex_cardbus.c   Thu Apr 05 23:56:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ex_cardbus.c,v 1.14.4.1 2000/09/01 00:59:28 haya Exp $      */
+/*     $NetBSD: if_ex_cardbus.c,v 1.14.4.2 2001/04/05 23:56:00 he Exp $        */
 
 /*
  * CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter
@@ -129,20 +129,22 @@
        const char      *ecp_name;      /* device name */
 } ex_cardbus_products[] = {
        { CARDBUS_PRODUCT_3COM_3C575TX,
-         EX_CONF_MII,
+         EX_CONF_MII | EX_CONF_EEPROM_OFF | EX_CONF_EEPROM_8BIT,
          CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MASTER_ENABLE,
          EX_3C575,
          "3c575-TX Ethernet" },
 
        { CARDBUS_PRODUCT_3COM_3C575BTX,
-         EX_CONF_90XB|EX_CONF_MII|EX_CONF_INV_LED_POLARITY,
+         EX_CONF_90XB|EX_CONF_MII|EX_CONF_INV_LED_POLARITY |
+           EX_CONF_EEPROM_OFF | EX_CONF_EEPROM_8BIT,
          CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MEM_ENABLE |
              CARDBUS_COMMAND_MASTER_ENABLE,
          EX_3C575B,
          "3c575B-TX Ethernet" },
 
        { CARDBUS_PRODUCT_3COM_3C575CTX,
-         EX_CONF_90XB|EX_CONF_PHY_POWER,
+         EX_CONF_90XB | EX_CONF_PHY_POWER | EX_CONF_EEPROM_OFF |
+           EX_CONF_EEPROM_8BIT,
          CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MEM_ENABLE |
              CARDBUS_COMMAND_MASTER_ENABLE,
          EX_3C575C,