[src/netbsd-1-4]: src/sys/dev/ic pullup 1.7->1.8 (Jonathan Stone)

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

details:   https://anonhg.NetBSD.org/src/rev/d65a5e92661a
branches:  netbsd-1-4
changeset: 468499:d65a5e92661a
user:      perry <perry%NetBSD.org@localhost>
date:      Tue Apr 27 00:10:53 1999 +0000

description:
pullup 1.7->1.8 (Jonathan Stone)

diffstat:

 sys/dev/ic/elinkxl.c |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 9d444b030a05 -r d65a5e92661a sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Tue Apr 27 00:04:51 1999 +0000
+++ b/sys/dev/ic/elinkxl.c      Tue Apr 27 00:10:53 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.7.2.1 1999/04/27 00:10:53 perry 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);