PERFORCE change 153748 for review
Sam Leffler
sam at FreeBSD.org
Fri Nov 28 23:30:21 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=153748
Change 153748 by sam at sam_ebb on 2008/11/29 07:29:48
fixup for hal source; also fix some copyrights while were're at it
Affected files ...
.. //depot/projects/vap/sys/modules/ath/Makefile#5 edit
.. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#9 edit
.. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#9 edit
.. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#10 edit
Differences ...
==== //depot/projects/vap/sys/modules/ath/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
+# Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -12,13 +12,6 @@
# similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
# redistribution must be conditioned upon including a substantially
# similar Disclaimer requirement for further binary redistribution.
-# 3. Neither the names of the above-listed copyright holders nor the names
-# of any contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# Alternatively, this software may be distributed under the terms of the
-# GNU General Public License ("GPL") version 2 as published by the Free
-# Software Foundation.
#
# NO WARRANTY
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -36,30 +29,50 @@
# $FreeBSD: src/sys/modules/ath/Makefile,v 1.5 2007/01/28 04:38:35 sam Exp $
#
-.PATH: ${.CURDIR}/../../dev/ath
+.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
+
+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_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_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 \
+ 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
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
-HAL= ${.CURDIR}/../../contrib/dev/ath
-CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL}
+CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
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}
+ :> $@
+opt_ah.h:
+ echo '#define AH_SUPPORT_AR5416 1' > $@
.include <bsd.kmod.mk>
==== //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#9 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
+# Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -12,13 +12,6 @@
# similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
# redistribution must be conditioned upon including a substantially
# similar Disclaimer requirement for further binary redistribution.
-# 3. Neither the names of the above-listed copyright holders nor the names
-# of any contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# Alternatively, this software may be distributed under the terms of the
-# GNU General Public License ("GPL") version 2 as published by the Free
-# Software Foundation.
#
# NO WARRANTY
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -42,24 +35,11 @@
SRCS= amrr.c
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.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
+CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h
- cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET}
-
.if !defined(KERNBUILDDIR)
+opt_ah.h:
+ echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET}
opt_wlan.h:
# echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
echo > ${.TARGET}
==== //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#9 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
+# Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -12,13 +12,6 @@
# similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
# redistribution must be conditioned upon including a substantially
# similar Disclaimer requirement for further binary redistribution.
-# 3. Neither the names of the above-listed copyright holders nor the names
-# of any contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# Alternatively, this software may be distributed under the terms of the
-# GNU General Public License ("GPL") version 2 as published by the Free
-# Software Foundation.
#
# NO WARRANTY
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -42,24 +35,11 @@
SRCS= onoe.c
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.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
+CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h
- cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET}
-
.if !defined(KERNBUILDDIR)
+opt_ah.h:
+ echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET}
opt_wlan.h:
echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
# echo > ${.TARGET}
==== //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004 Sam Leffler, Errno Consulting
+# Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -12,14 +12,7 @@
# similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
# redistribution must be conditioned upon including a substantially
# similar Disclaimer requirement for further binary redistribution.
-# 3. Neither the names of the above-listed copyright holders nor the names
-# of any contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
#
-# Alternatively, this software may be distributed under the terms of the
-# GNU General Public License ("GPL") version 2 as published by the Free
-# Software Foundation.
-#
# NO WARRANTY
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -42,27 +35,14 @@
SRCS= sample.c
SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.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
+CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h
- cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET}
-
.if !defined(KERNBUILDDIR)
+opt_ah.h:
+ echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET}
opt_wlan.h:
# echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
- echo > ${.TARGET}
+ :> ${.TARGET}
.endif
.include <bsd.kmod.mk>
More information about the p4-projects
mailing list