PERFORCE change 113979 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=113979

Change 113979 by sam at 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 <bsd.kmod.mk>

==== //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 <bsd.kmod.mk>