From owner-p4-projects@FreeBSD.ORG Sun Dec 14 21:30:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECEFC1065672; Sun, 14 Dec 2008 21:30:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9884F1065670; Sun, 14 Dec 2008 21:30:32 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 4667B8FC14; Sun, 14 Dec 2008 21:30:32 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBELTiO3021915; Sun, 14 Dec 2008 14:29:44 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sun, 14 Dec 2008 14:29:45 -0700 (MST) Message-Id: <20081214.142945.-861028970.imp@bsdimp.com> To: sam@freebsd.org From: "M. Warner Losh" In-Reply-To: <200812090452.mB94qbdB066779@repoman.freebsd.org> References: <200812090452.mB94qbdB066779@repoman.freebsd.org> X-Mailer: Mew version 5.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 154383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2008 21:30:33 -0000 In message: <200812090452.mB94qbdB066779@repoman.freebsd.org> Sam Leffler writes: : http://perforce.freebsd.org/chv.cgi?CH=154383 : : Change 154383 by sam@sam_ebb on 2008/12/09 04:51:47 : : one possible solution to the ath_rate/sample symbol dependency : problem; bundle rate control code into the driver : : Affected files ... : : .. //depot/projects/vap/sys/modules/ath/Makefile#9 edit : : Differences ... : : ==== //depot/projects/vap/sys/modules/ath/Makefile#9 (text+ko) ==== : : @@ -29,44 +29,80 @@ : # $FreeBSD: src/sys/modules/ath/Makefile,v 1.7 2008/12/02 21:37:28 bz Exp $ : # : : -.PATH: ${.CURDIR}/../../dev/ath \ : - ${.CURDIR}/../../dev/ath/ath_hal \ : - ${.CURDIR}/../../dev/ath/ath_hal/ar5210 \ : - ${.CURDIR}/../../dev/ath/ath_hal/ar5211 \ : - ${.CURDIR}/../../dev/ath/ath_hal/ar5212 \ : - ${.CURDIR}/../../dev/ath/ath_hal/ar5416 : +ATH_RATE= sample # tx rate control algorithm Maybe ATH_RATE ?= sample here? Apart from that, I like the rest of these changes (and the companion commit to remove the other, now-obsolete Makefiles). Warner : + : +.PATH: ${.CURDIR}/../../dev/ath : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal : + : +KMOD= if_ath : +SRCS= if_ath.c if_ath_pci.c : +# NB: v3 eeprom support used by both AR5211 and AR5212; just include it : +SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c : +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h : : -AR5210_SRCS=ah_eeprom_v1.c \ : +# : +# AR5210 support; these are first generation 11a-only devices. : +# : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5210 : +SRCS+= ah_eeprom_v1.c \ : ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \ : ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \ : ar5210_recv.c ar5210_reset.c ar5210_xmit.c : -AR5211_SRCS=ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ : + : +# : +# AR5211 support; these are second generation 11b/g/a devices : +# (but 11g was OFDM only and is not supported). : +# : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5211 : +SRCS+= ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ : ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \ : ar5211_recv.c ar5211_reset.c ar5211_xmit.c : -AR5212_SRCS=ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ : + : +# : +# AR5212 support; this covers all other pci/cardbus legacy parts. : +# : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5212 : +SRCS+= ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ : ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \ : ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \ : - ar5212_rfgain.c ar5212_xmit.c \ : - ar2413.c ar2425.c ar5111.c ar5112.c ar5413.c : -AR5416_SRCS=ah_eeprom_v14.c \ : + ar5212_rfgain.c ar5212_xmit.c : +# RF backends : +SRCS+= ar5111.c : +SRCS+= ar5112.c : +SRCS+= ar2413.c : +SRCS+= ar2425.c : +SRCS+= ar5413.c : + : +# : +# AR5416, AR9160 support; these are 11n parts but only really : +# supported (right now) operating in legacy mode. Note enabling : +# this support requires defining AH_SUPPORT_AR5416 in opt_ah.h : +# so the 11n tx/rx descriptor format is handled. : +# : +# NB: 9160 depends on 5416 but 5416 does not require 9160 : +# : +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5416 : +SRCS+= ah_eeprom_v14.c \ : ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \ : ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \ : ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \ : ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \ : - ar5416_reset.c ar5416_xmit.c \ : - ar2133.c : -AR9160_SRCS=ar9160_attach.c : + ar5416_reset.c ar5416_xmit.c : +SRCS+= ar9160_attach.c : +# RF backend for 5416 and 9160 : +SRCS+= ar2133.c : : -KMOD= if_ath : -SRCS= if_ath.c if_ath_pci.c : -# NB: v3 eeprom support used by both AR5211 and AR5212; just include it : -SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c : -SRCS+= ${AR5210_SRCS} : -SRCS+= ${AR5211_SRCS} : -SRCS+= ${AR5212_SRCS} : -SRCS+= ${AR5416_SRCS} : -SRCS+= ${AR9160_SRCS} : -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h : +# NB: rate control is bound to the driver by symbol names so only pick one : +.if ${ATH_RATE} == "sample" : +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample : +SRCS+= sample.c opt_wlan.h : +.elif ${ATH_RATE} == "onoe" : +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe : +SRCS+= onoe.c : +.elif ${ATH_RATE} == "amrr" : +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr : +SRCS+= amrr.c : +.endif : : CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal : :