From owner-p4-projects@FreeBSD.ORG Sun Feb 4 06:41:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 292F116A406; Sun, 4 Feb 2007 06:41:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE61416A400 for ; Sun, 4 Feb 2007 06:41:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CE2D013C48E for ; Sun, 4 Feb 2007 06:41:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l146fHQv007331 for ; Sun, 4 Feb 2007 06:41:17 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l146fHaC007320 for perforce@freebsd.org; Sun, 4 Feb 2007 06:41:17 GMT (envelope-from sam@freebsd.org) Date: Sun, 4 Feb 2007 06:41:17 GMT Message-Id: <200702040641.l146fHaC007320@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 113979 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, 04 Feb 2007 06:41:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=113979 Change 113979 by sam@sam_ebb on 2007/02/04 06:40:34 IFC Affected files ... .. //depot/projects/wifi/sys/modules/ath/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/ath_rate_sample/Makefile#4 integrate Differences ... ==== //depot/projects/wifi/sys/modules/ath/Makefile#5 (text+ko) ==== @@ -33,14 +33,14 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGES. # -# $FreeBSD: src/sys/modules/ath/Makefile,v 1.4 2006/09/18 16:49:15 sam Exp $ +# $FreeBSD: src/sys/modules/ath/Makefile,v 1.5 2007/01/28 04:38:35 sam Exp $ # .PATH: ${.CURDIR}/../../dev/ath KMOD= if_ath SRCS= if_ath.c if_ath_pci.c -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h HAL= ${.CURDIR}/../../contrib/dev/ath CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} @@ -48,4 +48,18 @@ opt_ath.h: echo > $@ +# patch for hal naming difference +.if ${MACHINE_ARCH} == "amd64" +ATH_MODULE_ARCH=x86_64 +.elif ${MACHINE_ARCH} == "sparc64" +ATH_MODULE_ARCH=sparc64-be +.elif ${MACHINE_ARCH} == "powerpc" +ATH_MODULE_ARCH=powerpc-be +.else +ATH_MODULE_ARCH=${MACHINE_ARCH} +.endif + +opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h + cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} + .include ==== //depot/projects/wifi/sys/modules/ath_rate_sample/Makefile#4 (text+ko) ==== @@ -33,16 +33,30 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF # THE POSSIBILITY OF SUCH DAMAGES. # -# $FreeBSD: src/sys/modules/ath_rate_sample/Makefile,v 1.3 2006/09/18 16:49:15 sam Exp $ +# $FreeBSD: src/sys/modules/ath_rate_sample/Makefile,v 1.4 2007/01/28 04:36:05 sam Exp $ # .PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample KMOD= ath_rate SRCS= sample.c -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h HAL= ${.CURDIR}/../../contrib/dev/ath CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} +# patch for hal naming difference +.if ${MACHINE_ARCH} == "amd64" +ATH_MODULE_ARCH=x86_64 +.elif ${MACHINE_ARCH} == "sparc64" +ATH_MODULE_ARCH=sparc64-be +.elif ${MACHINE_ARCH} == "powerpc" +ATH_MODULE_ARCH=powerpc-be +.else +ATH_MODULE_ARCH=${MACHINE_ARCH} +.endif + +opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h + cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} + .include