Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic tm_gpctl and tm_gpdata must be shifted right 16 b...



details:   https://anonhg.NetBSD.org/src/rev/0a8c971f3604
branches:  trunk
changeset: 525652:0a8c971f3604
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sun Apr 14 19:10:18 2002 +0000

description:
tm_gpctl and tm_gpdata must be shifted right 16 bits.  DOH.
This makes another CardBus tlp card work...

diffstat:

 sys/dev/ic/tulip.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r a098ea05424e -r 0a8c971f3604 sys/dev/ic/tulip.c
--- a/sys/dev/ic/tulip.c        Sun Apr 14 17:17:10 2002 +0000
+++ b/sys/dev/ic/tulip.c        Sun Apr 14 19:10:18 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tulip.c,v 1.108 2002/04/09 05:57:20 chs Exp $  */
+/*     $NetBSD: tulip.c,v 1.109 2002/04/14 19:10:18 mycroft Exp $      */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.108 2002/04/09 05:57:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.109 2002/04/14 19:10:18 mycroft Exp $");
 
 #include "bpfilter.h"
 
@@ -4752,8 +4752,8 @@
                                cp++;
 
                        /* Next is GPIO control/data. */
-                       tm->tm_gpctl  = TULIP_ROM_GETW(cp, 0);
-                       tm->tm_gpdata = TULIP_ROM_GETW(cp, 2);
+                       tm->tm_gpctl  = TULIP_ROM_GETW(cp, 0) << 16;
+                       tm->tm_gpdata = TULIP_ROM_GETW(cp, 2) << 16;
 
                        ifmedia_add(&sc->sc_mii.mii_media,
                            IFM_MAKEWORD(IFM_ETHER, tsti->tsti_subtype,
@@ -4898,8 +4898,8 @@
                        tlp_srom_media_info(sc, tsti, tm);
 
                        /* Next is GPIO control/data. */
-                       tm->tm_gpctl  = TULIP_ROM_GETW(cp, 1);
-                       tm->tm_gpdata = TULIP_ROM_GETW(cp, 3);
+                       tm->tm_gpctl  = TULIP_ROM_GETW(cp, 1) << 16;
+                       tm->tm_gpdata = TULIP_ROM_GETW(cp, 3) << 16;
 
                        /*
                         * Next is a word containing OPMODE information



Home | Main Index | Thread Index | Old Index