[src/netbsd-2]: src/sys/dev/pci Pull up following revision(s) (requested by r...

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

details:   https://anonhg.NetBSD.org/src/rev/b4e0a3afd690
branches:  netbsd-2
changeset: 564487:b4e0a3afd690
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Jun 04 14:06:34 2006 +0000

description:
Pull up following revision(s) (requested by riz in ticket #10636):
        sys/dev/pci/if_skreg.h: revision 1.7
        sys/dev/pci/if_sk.c: revision 1.26
Add support for the DLink DGE-530T revision B1 (Tested by Tillman
Hodgson) and the DGE-560T (untested).

diffstat:

 sys/dev/pci/if_sk.c    |  9 ++++++++-
 sys/dev/pci/if_skreg.h |  3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 125bbe1906a6 -r b4e0a3afd690 sys/dev/pci/if_sk.c
--- a/sys/dev/pci/if_sk.c       Sun Jun 04 14:04:29 2006 +0000
+++ b/sys/dev/pci/if_sk.c       Sun Jun 04 14:06:34 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sk.c,v 1.7.2.3.2.8 2006/03/29 21:36:22 tron Exp $   */
+/*     $NetBSD: if_sk.c,v 1.7.2.3.2.9 2006/06/04 14:06:34 tron Exp $   */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -260,6 +260,8 @@
 } sk_products[] = {
        { PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C940, },
        { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE530T, },
+       { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T, },
+       { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T_2, },
        { PCI_VENDOR_LINKSYS, PCI_PRODUCT_LINKSYS_EG1064, },
        { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SKNET_GE, },
        { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2, },
@@ -1548,6 +1550,7 @@
                sc->sk_pmd = IFM_1000_CX;
                break;
        case SK_PMD_1000BASETX:
+       case SK_PMD_1000BASETX_ALT:
                sc->sk_pmd = IFM_1000_T;
                break;
        default:
@@ -1565,12 +1568,16 @@
        case PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2:
        case PCI_PRODUCT_3COM_3C940:
        case PCI_PRODUCT_DLINK_DGE530T:
+       case PCI_PRODUCT_DLINK_DGE560T:
+       case PCI_PRODUCT_DLINK_DGE560T_2:
        case PCI_PRODUCT_LINKSYS_EG1032:
        case PCI_PRODUCT_LINKSYS_EG1064:
        case PCI_ID_CODE(PCI_VENDOR_SCHNEIDERKOCH,
                         PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2):
        case PCI_ID_CODE(PCI_VENDOR_3COM,PCI_PRODUCT_3COM_3C940):
        case PCI_ID_CODE(PCI_VENDOR_DLINK,PCI_PRODUCT_DLINK_DGE530T):
+       case PCI_ID_CODE(PCI_VENDOR_DLINK,PCI_PRODUCT_DLINK_DGE560T):
+       case PCI_ID_CODE(PCI_VENDOR_DLINK,PCI_PRODUCT_DLINK_DGE560T_2):
        case PCI_ID_CODE(PCI_VENDOR_LINKSYS,PCI_PRODUCT_LINKSYS_EG1032):
        case PCI_ID_CODE(PCI_VENDOR_LINKSYS,PCI_PRODUCT_LINKSYS_EG1064):
                sc->sk_name = sc->sk_vpd_prodname;
diff -r 125bbe1906a6 -r b4e0a3afd690 sys/dev/pci/if_skreg.h
--- a/sys/dev/pci/if_skreg.h    Sun Jun 04 14:04:29 2006 +0000
+++ b/sys/dev/pci/if_skreg.h    Sun Jun 04 14:06:34 2006 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skreg.h,v 1.2.6.2 2006/03/29 21:38:34 tron Exp $ */
+/* $NetBSD: if_skreg.h,v 1.2.6.3 2006/06/04 14:06:34 tron Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -421,6 +421,7 @@
 #define SK_CONFIG_SINGLEMAC    0x01
 #define SK_CONFIG_DIS_DSL_CLK  0x02
 
+#define SK_PMD_1000BASETX_ALT  0x31
 #define SK_PMD_1000BASELX      0x4C
 #define SK_PMD_1000BASESX      0x53
 #define SK_PMD_1000BASECX      0x43