From owner-p4-projects@FreeBSD.ORG Fri Nov 28 23:26:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85ACF1065680; Fri, 28 Nov 2008 23:26:20 +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 49F0D106567E for ; Fri, 28 Nov 2008 23:26:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 32E548FC21 for ; Fri, 28 Nov 2008 23:26:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASNQKhs011476 for ; Fri, 28 Nov 2008 23:26:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASNQKoL011474 for perforce@freebsd.org; Fri, 28 Nov 2008 23:26:20 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 23:26:20 GMT Message-Id: <200811282326.mASNQKoL011474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 153723 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: Fri, 28 Nov 2008 23:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=153723 Change 153723 by sam@sam_ebb on 2008/11/28 23:25:39 move hal from contrib/dev/ath to dev/ath/ath_hal; if you're playing along move the symlink to projects/ath_hal Affected files ... .. //depot/projects/vap/sys/conf/files#56 edit .. //depot/projects/vap/sys/conf/kern.pre.mk#12 edit Differences ... ==== //depot/projects/vap/sys/conf/files#56 (text+ko) ==== @@ -503,170 +503,170 @@ dev/ata/atapi-cam.c optional atapicam # contrib/dev/ath/ah.c optional ath \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ah_eeprom_v1.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ah_eeprom_v3.c optional ath_ar5211 | ath_ar5212 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ah_eeprom_v14.c optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ah_regdomain.c optional ath \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_attach.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_beacon.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_interrupts.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_keycache.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_misc.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_phy.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_power.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_recv.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_reset.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_xmit.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_attach.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_beacon.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_interrupts.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_keycache.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_misc.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_phy.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_power.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_recv.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_reset.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_xmit.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_ani.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_attach.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_beacon.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_eeprom.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_gpio.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_interrupts.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_keycache.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_misc.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_phy.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_power.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_recv.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_reset.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_rfgain.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_xmit.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar2316.c optional ath_rf2316 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar2317.c optional ath_rf2317 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar2413.c optional ath_rf2413 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar2425.c optional ath_rf2425 | ath_rf2417 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5111.c optional ath_rf5111 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5112.c optional ath_rf5112 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5413.c optional ath_rf5413 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar2133.c optional ath_ar5416 | ath_ar9160 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_ani.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_attach.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_beacon.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_cal.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_iq.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_adcgain.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_adcdc.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_eeprom.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_gpio.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_interrupts.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_keycache.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_misc.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_phy.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_power.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_recv.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_reset.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_xmit.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar9160_attach.c optional ath_ar5416 | ath_ar9160 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar9280.c optional ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar9280_attach.c optional ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ah_osdep.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \ ==== //depot/projects/vap/sys/conf/kern.pre.mk#12 (text+ko) ==== @@ -66,8 +66,8 @@ # ... and the same for pf INCLUDES+= -I$S/contrib/pf -# ... and the same for Atheros HAL -INCLUDES+= -I$S/dev/ath -I$S/contrib/dev/ath +# ... and the same for ath +INCLUDES+= -I$S/dev/ath -I$S/dev/ath/ath_hal # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm