[src/netbsd-1-6]: src/sys/dev/pci Pull up revision 1.5 (requested by matt in ...

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

details:   https://anonhg.NetBSD.org/src/rev/b903f1e21679
branches:  netbsd-1-6
changeset: 530396:b903f1e21679
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Jun 20 07:01:00 2003 +0000

description:
Pull up revision 1.5 (requested by matt in ticket #1299):
 FIx to recognize the PHY on i83543 correctly.

diffstat:

 sys/dev/pci/if_wmreg.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r f8c346f0f135 -r b903f1e21679 sys/dev/pci/if_wmreg.h
--- a/sys/dev/pci/if_wmreg.h    Thu Jun 19 20:35:36 2003 +0000
+++ b/sys/dev/pci/if_wmreg.h    Fri Jun 20 07:01:00 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wmreg.h,v 1.1.6.3 2002/11/21 18:35:44 tron Exp $    */
+/*     $NetBSD: if_wmreg.h,v 1.1.6.4 2003/06/20 07:01:00 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -280,10 +280,10 @@
 #define        CTRL_EXT_GPI_EN(x)      (1U << (x)) /* gpin interrupt enable */
 #define        CTRL_EXT_SWDPINS_SHIFT  4
 #define        CTRL_EXT_SWDPINS_MASK   0x0d
-#define        CTRL_EXT_SWDPIN(x)      (1U << (CTRL_SWDPINS_SHIFT + (x) - 4))
+#define        CTRL_EXT_SWDPIN(x)      (1U << (CTRL_EXT_SWDPINS_SHIFT + (x) - 4))
 #define        CTRL_EXT_SWDPIO_SHIFT   8
 #define        CTRL_EXT_SWDPIO_MASK    0x0d
-#define        CTRL_EXT_SWDPIO(x)      (1U << (CTRL_SWDPIO_SHIFT + (x) - 4))
+#define        CTRL_EXT_SWDPIO(x)      (1U << (CTRL_EXT_SWDPIO_SHIFT + (x) - 4))
 #define        CTRL_EXT_ASDCHK         (1U << 12) /* ASD check */
 #define        CTRL_EXT_EE_RST         (1U << 13) /* EEPROM reset */
 #define        CTRL_EXT_IPS            (1U << 14) /* invert power state bit 0 */