[src/trunk]: src/sys/dev/ic Fix ex_read_eeprom() for 3c57x.

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

details:   https://anonhg.NetBSD.org/src/rev/fc46657d10b8
branches:  trunk
changeset: 471876:fc46657d10b8
user:      jonathan <jonathan%NetBSD.org@localhost>
date:      Tue Apr 13 23:07:25 1999 +0000

description:
Fix ex_read_eeprom() for 3c57x.

diffstat:

 sys/dev/ic/elinkxl.c    |  14 +++++++++++---
 sys/dev/ic/elinkxlvar.h |   3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 3e5abcd3ed4a -r fc46657d10b8 sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Tue Apr 13 22:34:05 1999 +0000
+++ b/sys/dev/ic/elinkxl.c      Tue Apr 13 23:07:25 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.7 1999/03/29 11:11:34 fvdl Exp $ */
+/*     $NetBSD: elinkxl.c,v 1.8 1999/04/13 23:07:25 jonathan Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1520,8 +1520,16 @@
        GO_WINDOW(0);
        if (ex_eeprom_busy(sc))
                goto out;
-       bus_space_write_1(iot, ioh, ELINK_W0_EEPROM_COMMAND,
-           READ_EEPROM | (offset & 0x3f));
+       switch (sc->ex_bustype) {
+       case EX_BUS_PCI:
+               bus_space_write_1(iot, ioh, ELINK_W0_EEPROM_COMMAND,
+                   READ_EEPROM | (offset & 0x3f));
+               break;
+       case EX_BUS_CARDBUS:
+               bus_space_write_2(iot, ioh, ELINK_W0_EEPROM_COMMAND,
+                   0x230 + (offset & 0x3f));
+               break;
+       }
        if (ex_eeprom_busy(sc))
                goto out;
        data = bus_space_read_2(iot, ioh, ELINK_W0_EEPROM_DATA);
diff -r 3e5abcd3ed4a -r fc46657d10b8 sys/dev/ic/elinkxlvar.h
--- a/sys/dev/ic/elinkxlvar.h   Tue Apr 13 22:34:05 1999 +0000
+++ b/sys/dev/ic/elinkxlvar.h   Tue Apr 13 23:07:25 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxlvar.h,v 1.1 1998/11/04 00:29:29 fvdl Exp $      */
+/*     $NetBSD: elinkxlvar.h,v 1.2 1999/04/13 23:07:26 jonathan Exp $  */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -106,6 +106,7 @@
        u_char  ex_bustype;             /* parent bus type (currently unused) */
 
 #define EX_BUS_PCI     0
+#define EX_BUS_CARDBUS 1
 
 #if NRND > 0
        rndsource_element_t rnd_source;