From owner-svn-src-stable@FreeBSD.ORG Fri Feb 4 20:47:46 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB9F6106564A; Fri, 4 Feb 2011 20:47:46 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CF4258FC0A; Fri, 4 Feb 2011 20:47:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p14Klkeu097516; Fri, 4 Feb 2011 20:47:46 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p14KlkIJ097509; Fri, 4 Feb 2011 20:47:46 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102042047.p14KlkIJ097509@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 4 Feb 2011 20:47:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218297 - in stable/7/sys: boot/forth conf dev/vte i386/conf modules modules/vte X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Feb 2011 20:47:47 -0000 Author: yongari Date: Fri Feb 4 20:47:46 2011 New Revision: 218297 URL: http://svn.freebsd.org/changeset/base/218297 Log: MFC r216829,216833: rr216829: Add driver for DM&P Vortex86 RDC R6040 Fast Ethernet. The controller is commonly found on DM&P Vortex86 x86 SoC. The driver supports all hardware features except flow control. The flow control was intentionally disabled due to silicon bug. DM&P Electronics, Inc. provided all necessary information including sample board to write driver and answered many questions I had. Many thanks for their support of FreeBSD. H/W donated by: DM&P Electronics, Inc. r216833: Remove debugging leftovers. Added: stable/7/sys/dev/vte/ - copied from r216829, head/sys/dev/vte/ stable/7/sys/modules/vte/ - copied from r216829, head/sys/modules/vte/ Modified: stable/7/sys/boot/forth/loader.conf stable/7/sys/conf/NOTES stable/7/sys/conf/files stable/7/sys/dev/vte/if_vte.c stable/7/sys/i386/conf/GENERIC stable/7/sys/modules/Makefile Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/boot/forth/loader.conf ============================================================================== --- stable/7/sys/boot/forth/loader.conf Fri Feb 4 20:32:52 2011 (r218296) +++ stable/7/sys/boot/forth/loader.conf Fri Feb 4 20:47:46 2011 (r218297) @@ -274,6 +274,7 @@ if_tl_load="NO" # Texas Instruments TN if_tx_load="NO" # SMC 83c17x Fast Ethernet if_txp_load="NO" # 3Com 3XP Typhoon/Sidewinder (3CR990) if_vge_load="NO" # VIA VT6122 PCI Gigabit Ethernet +if_vte_load="NO" # DM&P Vortex86 RDC R6040 Fast Ethernet if_udav_load="NO" # Davicom DM9601 USB Ethernet if_vr_load="NO" # VIA Rhine I and Rhine II if_vx_load="NO" # 3Com 3C590 family Modified: stable/7/sys/conf/NOTES ============================================================================== --- stable/7/sys/conf/NOTES Fri Feb 4 20:32:52 2011 (r218296) +++ stable/7/sys/conf/NOTES Fri Feb 4 20:47:46 2011 (r218297) @@ -1866,6 +1866,7 @@ device xmphy # XaQti XMAC II # Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips, # including the D-Link DFE530TX (see 'rl' for DFE530TX+), the Hawking # Technologies PN102TX, and the AOpen/Acer ALN-320. +# vte: DM&P Vortex86 RDC R6040 Fast Ethernet # vx: 3Com 3C590 and 3C595 # wb: Support for fast ethernet adapters based on the Winbond W89C840F chip. # Note: this is not the same as the Winbond W89C940F, which is a @@ -1941,6 +1942,7 @@ device ti # Alteon Networks Tigon I/II device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II +device vte # DM&P Vortex86 RDC R6040 Fast Ethernet device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') Modified: stable/7/sys/conf/files ============================================================================== --- stable/7/sys/conf/files Fri Feb 4 20:32:52 2011 (r218296) +++ stable/7/sys/conf/files Fri Feb 4 20:47:46 2011 (r218297) @@ -1344,6 +1344,7 @@ dev/utopia/utopia.c optional utopia dev/vge/if_vge.c optional vge dev/vkbd/vkbd.c optional vkbd dev/vr/if_vr.c optional vr pci +dev/vte/if_vte.c optional vte pci dev/vx/if_vx.c optional vx dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci Modified: stable/7/sys/dev/vte/if_vte.c ============================================================================== --- head/sys/dev/vte/if_vte.c Fri Dec 31 00:21:41 2010 (r216829) +++ stable/7/sys/dev/vte/if_vte.c Fri Feb 4 20:47:46 2011 (r218297) @@ -66,13 +66,8 @@ __FBSDID("$FreeBSD$"); #include -#if 0 -#include "if_vtereg.h" -#include "if_vtevar.h" -#else #include #include -#endif /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" Modified: stable/7/sys/i386/conf/GENERIC ============================================================================== --- stable/7/sys/i386/conf/GENERIC Fri Feb 4 20:32:52 2011 (r218296) +++ stable/7/sys/i386/conf/GENERIC Fri Feb 4 20:47:46 2011 (r218297) @@ -234,6 +234,7 @@ device tl # Texas Instruments ThunderL device tx # SMC EtherPower II (83c170 ``EPIC'') device vge # VIA VT612x gigabit Ethernet device vr # VIA Rhine, Rhine II +device vte # DM&P Vortex86 RDC R6040 Fast Ethernet device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') Modified: stable/7/sys/modules/Makefile ============================================================================== --- stable/7/sys/modules/Makefile Fri Feb 4 20:32:52 2011 (r218296) +++ stable/7/sys/modules/Makefile Fri Feb 4 20:47:46 2011 (r218297) @@ -323,6 +323,7 @@ SUBDIR= ${_3dfx} \ vkbd \ ${_vpo} \ vr \ + vte \ vx \ wb \ ${_wi} \