From owner-svn-src-all@freebsd.org Tue May 17 07:15:26 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EB80B3EF4E; Tue, 17 May 2016 07:15:26 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2459E1A35; Tue, 17 May 2016 07:15:26 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4H7FPpr031245; Tue, 17 May 2016 07:15:25 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4H7FPHd031243; Tue, 17 May 2016 07:15:25 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201605170715.u4H7FPHd031243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Tue, 17 May 2016 07:15:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300020 - in head/sys: conf modules/bwn X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2016 07:15:26 -0000 Author: adrian Date: Tue May 17 07:15:25 2016 New Revision: 300020 URL: https://svnweb.freebsd.org/changeset/base/300020 Log: [bwn] add in bwn n-phy linking. * The default kernel and options won't build the GPL PHY bits; * bwn(4) defaults to building as a module anyway!; * If BWN_GPL_PHY is specified in the config file, and you uncomment the GPL PHY bits in the module Makefile, you'll get a working N-PHY. This is specifically designed to be obtuse for now, as I don't want to flip it on by default. It's easy enough for people to flip on and build, and it's a module so the default GENERIC kernel won't be GPL tainted. I'll have to add an actual HAL layer that allows the GPL PHY to be loaded before if_bwn so it can be "magic", but that'll come later. Tested: * BCM4321 11abg NIC, STA mode Modified: head/sys/conf/files head/sys/modules/bwn/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue May 17 07:12:00 2016 (r300019) +++ head/sys/conf/files Tue May 17 07:15:25 2016 (r300020) @@ -1179,6 +1179,7 @@ dev/bwn/if_bwn_phy_g.c optional bwn sib compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}" dev/bwn/if_bwn_phy_lp.c optional bwn siba_bwn \ compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}" +dev/bwn/if_bwn_phy_n.c optional bwn siba_bwn dev/bwn/if_bwn_util.c optional bwn siba_bwn dev/bwn/bwn_mac.c optional bwn bhnd | bwn bhndbus dev/cardbus/cardbus.c optional cardbus Modified: head/sys/modules/bwn/Makefile ============================================================================== --- head/sys/modules/bwn/Makefile Tue May 17 07:12:00 2016 (r300019) +++ head/sys/modules/bwn/Makefile Tue May 17 07:15:25 2016 (r300020) @@ -9,10 +9,23 @@ SRCS+= if_bwn_util.c # PHY SRCS+= if_bwn_phy_common.c SRCS+= if_bwn_phy_g.c if_bwn_phy_lp.c +SRCS+= if_bwn_phy_n.c # Other SRCS+= device_if.h bus_if.h pci_if.h +# Uncomment this for the GPL PHY code; this requires the +# module be built with BWN_GPL_PHY set in the kernel +# configuration. + +#.PATH: ${.CURDIR}/../../gnu/dev/bwn/phy_n +#SRCS+= if_bwn_radio_2055.c +#SRCS+= if_bwn_radio_2056.c +#SRCS+= if_bwn_radio_2057.c +#SRCS+= if_bwn_phy_n_tables.c +#SRCS+= if_bwn_phy_n_ppr.c +#SRCS+= if_bwn_phy_n_core.c + .include # XXX Work around clang warning, until maintainer approves fix.