Module Name:    src
Committed By:   tsutsui
Date:           Mon Apr 13 12:28:46 UTC 2009

Modified Files:
        src/sys/dev/ic: rtl8169.c rtl81x9reg.h

Log Message:
Add HWREV values of RTL8168CP and RTL8168D.  From FreeBSD.

XXX: needs more quirk handling after wakeup for newer chips.


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/rtl81x9reg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.113 src/sys/dev/ic/rtl8169.c:1.114
--- src/sys/dev/ic/rtl8169.c:1.113	Sat Mar 28 22:16:08 2009
+++ src/sys/dev/ic/rtl8169.c	Mon Apr 13 12:28:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl8169.c,v 1.113 2009/03/28 22:16:08 tsutsui Exp $	*/
+/*	$NetBSD: rtl8169.c,v 1.114 2009/04/13 12:28:46 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.113 2009/03/28 22:16:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.114 2009/04/13 12:28:46 tsutsui Exp $");
 /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
 
 /*
@@ -602,6 +602,8 @@
 			break;
 		case RTK_HWREV_8168C:
 		case RTK_HWREV_8168C_SPIN2:
+		case RTK_HWREV_8168CP:
+		case RTK_HWREV_8168D:
 			sc->sc_rev = 24;
 			sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD;
 			/*

Index: src/sys/dev/ic/rtl81x9reg.h
diff -u src/sys/dev/ic/rtl81x9reg.h:1.35 src/sys/dev/ic/rtl81x9reg.h:1.36
--- src/sys/dev/ic/rtl81x9reg.h:1.35	Fri Mar 27 12:19:17 2009
+++ src/sys/dev/ic/rtl81x9reg.h	Mon Apr 13 12:28:46 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl81x9reg.h,v 1.35 2009/03/27 12:19:17 tsutsui Exp $	*/
+/*	$NetBSD: rtl81x9reg.h,v 1.36 2009/04/13 12:28:46 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -158,6 +158,7 @@
 #define RTK_HWREV_8169_8110SB	0x10000000
 #define RTK_HWREV_8169_8110SC	0x18000000
 #define RTK_HWREV_8102EL	0x24800000
+#define RTK_HWREV_8168D		0x28000000
 #define RTK_HWREV_8168_SPIN1	0x30000000
 #define RTK_HWREV_8100E		0x30800000
 #define RTK_HWREV_8101E		0x34000000
@@ -167,6 +168,7 @@
 #define RTK_HWREV_8100E_SPIN2	0x38800000
 #define RTK_HWREV_8168C		0x3C000000
 #define RTK_HWREV_8168C_SPIN2	0x3C400000
+#define RTK_HWREV_8168CP	0x3C800000
 #define RTK_HWREV_8139		0x60000000
 #define RTK_HWREV_8139A		0x70000000
 #define RTK_HWREV_8139AG	0x70800000

Reply via email to