Module Name: src
Committed By: uebayasi
Date: Fri Oct 10 17:09:18 UTC 2014
Modified Files:
src/sys/external/isc/atheros_hal/conf: files.ath_hal
Log Message:
Sanitize athhal definitions. Depend on ath.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/isc/atheros_hal/conf/files.ath_hal
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/conf/files.ath_hal
diff -u src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.4 src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.5
--- src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.4 Sat Mar 5 14:42:11 2011
+++ src/sys/external/isc/atheros_hal/conf/files.ath_hal Fri Oct 10 17:09:18 2014
@@ -1,18 +1,18 @@
-# $NetBSD: files.ath_hal,v 1.4 2011/03/05 14:42:11 cegger Exp $
+# $NetBSD: files.ath_hal,v 1.5 2014/10/10 17:09:18 uebayasi Exp $
defflag opt_athhal.h ATHHAL_ASSERT ATHHAL_DEBUG ATHHAL_DEBUG_ALQ
defflag opt_athhal.h ATHHAL_WRITE_EEPROM ATHHAL_WRITE_REGDOMAIN
-define athhal_eeprom_v1
-define athhal_eeprom_v3
-define athhal_eeprom_v14
-define athhal_eeprom_v4k
+define athhal_eeprom_v1: ath
+define athhal_eeprom_v3: ath
+define athhal_eeprom_v14: ath
+define athhal_eeprom_v4k: ath
file external/isc/atheros_hal/dist/ah.c ath
-file external/isc/atheros_hal/dist/ah_eeprom_v1.c ath & athhal_eeprom_v1
-file external/isc/atheros_hal/dist/ah_eeprom_v3.c ath & athhal_eeprom_v3
-file external/isc/atheros_hal/dist/ah_eeprom_v14.c ath & athhal_eeprom_v14
-file external/isc/atheros_hal/dist/ah_eeprom_v4k.c ath & athhal_eeprom_v4k
+file external/isc/atheros_hal/dist/ah_eeprom_v1.c athhal_eeprom_v1
+file external/isc/atheros_hal/dist/ah_eeprom_v3.c athhal_eeprom_v3
+file external/isc/atheros_hal/dist/ah_eeprom_v14.c athhal_eeprom_v14
+file external/isc/atheros_hal/dist/ah_eeprom_v4k.c athhal_eeprom_v4k
file external/isc/atheros_hal/dist/ah_regdomain.c ath
# Atheros HAL's OS dependant code
@@ -24,31 +24,33 @@ file external/isc/atheros_hal/ic/ah_osde
#
defflag opt_athhal.h ATHHAL_AR5210: athhal_eeprom_v1
-file external/isc/atheros_hal/dist/ar5210/ar5210_attach.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_beacon.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_interrupts.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_keycache.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_misc.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_phy.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_power.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_recv.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_reset.c ath & athhal_ar5210
-file external/isc/atheros_hal/dist/ar5210/ar5210_xmit.c ath & athhal_ar5210
+define athhal_ar5210: ath
+file external/isc/atheros_hal/dist/ar5210/ar5210_attach.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_beacon.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_interrupts.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_keycache.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_misc.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_phy.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_power.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_recv.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_reset.c athhal_ar5210
+file external/isc/atheros_hal/dist/ar5210/ar5210_xmit.c athhal_ar5210
# Atheros AR5211 family
#
defflag opt_athhal.h ATHHAL_AR5211: athhal_eeprom_v3
-file external/isc/atheros_hal/dist/ar5211/ar5211_attach.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_beacon.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_interrupts.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_keycache.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_misc.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_phy.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_power.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_recv.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_reset.c ath & athhal_ar5211
-file external/isc/atheros_hal/dist/ar5211/ar5211_xmit.c ath & athhal_ar5211
+define athhal_ar5211: ath
+file external/isc/atheros_hal/dist/ar5211/ar5211_attach.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_beacon.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_interrupts.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_keycache.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_misc.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_phy.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_power.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_recv.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_reset.c athhal_ar5211
+file external/isc/atheros_hal/dist/ar5211/ar5211_xmit.c athhal_ar5211
# Atheros AR5212/AR5312 RF support
#
@@ -60,38 +62,46 @@ defflag opt_athhal.h ATHHAL_RF5111
defflag opt_athhal.h ATHHAL_RF5112
defflag opt_athhal.h ATHHAL_RF5413
-file external/isc/atheros_hal/dist/ar5212/ar2316.c ath & athhal_rf2316
-file external/isc/atheros_hal/dist/ar5212/ar2317.c ath & athhal_rf2317
-file external/isc/atheros_hal/dist/ar5212/ar2413.c ath & athhal_rf2413
-file external/isc/atheros_hal/dist/ar5212/ar2425.c ath & athhal_rf2425
-file external/isc/atheros_hal/dist/ar5212/ar5111.c ath & athhal_rf5111
-file external/isc/atheros_hal/dist/ar5212/ar5112.c ath & athhal_rf5112
-file external/isc/atheros_hal/dist/ar5212/ar5413.c ath & athhal_rf5413
+define athhal_rf2316: ath
+define athhal_rf2317: ath
+define athhal_rf2413: ath
+define athhal_rf2425: ath
+define athhal_rf5111: ath
+define athhal_rf5112: ath
+define athhal_rf5413: ath
+
+file external/isc/atheros_hal/dist/ar5212/ar2316.c athhal_rf2316
+file external/isc/atheros_hal/dist/ar5212/ar2317.c athhal_rf2317
+file external/isc/atheros_hal/dist/ar5212/ar2413.c athhal_rf2413
+file external/isc/atheros_hal/dist/ar5212/ar2425.c athhal_rf2425
+file external/isc/atheros_hal/dist/ar5212/ar5111.c athhal_rf5111
+file external/isc/atheros_hal/dist/ar5212/ar5112.c athhal_rf5112
+file external/isc/atheros_hal/dist/ar5212/ar5413.c athhal_rf5413
# Atheros AR5212 family
#
-define athhal_ar5212_attach
-define athhal_ar5212_subr
+define athhal_ar5212_attach: ath
+define athhal_ar5212_subr: ath
defflag opt_athhal.h ATHHAL_AR5212: athhal_eeprom_v3,
athhal_ar5212_attach, athhal_ar5212_subr
defflag opt_athhal.h ATHHAL_AR5311: ATHHAL_AR5212
-file external/isc/atheros_hal/dist/ar5212/ar5212_ani.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_attach.c ath & athhal_ar5212_attach
-file external/isc/atheros_hal/dist/ar5212/ar5212_beacon.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_eeprom.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_gpio.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_interrupts.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_keycache.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_misc.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_phy.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_power.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_recv.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_reset.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_rfgain.c ath & athhal_ar5212_subr
-file external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c ath & athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_ani.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_attach.c athhal_ar5212_attach
+file external/isc/atheros_hal/dist/ar5212/ar5212_beacon.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_eeprom.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_gpio.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_interrupts.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_keycache.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_misc.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_phy.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_power.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_recv.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_reset.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_rfgain.c athhal_ar5212_subr
+file external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c athhal_ar5212_subr
# Atheros AR5312 family
#
@@ -100,14 +110,15 @@ defflag opt_athhal.h ATHHAL_AR5312: athh
defflag opt_athhal.h ATHHAL_AR2316: ATHHAL_AR5312
defflag opt_athhal.h ATHHAL_AR2317: ATHHAL_AR5312
-file external/isc/atheros_hal/dist/ar5312/ar5312_attach.c ath & athhal_ar5312
-file external/isc/atheros_hal/dist/ar5312/ar5312_eeprom.c ath & athhal_ar5312
-file external/isc/atheros_hal/dist/ar5312/ar5312_gpio.c ath & athhal_ar5312
-file external/isc/atheros_hal/dist/ar5312/ar5312_interrupts.c ath & athhal_ar5312
-file external/isc/atheros_hal/dist/ar5312/ar5312_misc.c ath & athhal_ar5312
-file external/isc/atheros_hal/dist/ar5312/ar5312_power.c ath & athhal_ar5312
-file external/isc/atheros_hal/dist/ar5312/ar5312_reset.c ath & athhal_ar5312
-file external/isc/atheros_hal/dist/ar5312/ar5315_gpio.c ath & (athhal_ar2316 | athhal_ar2317)
+define athhal_ar5312: ath
+file external/isc/atheros_hal/dist/ar5312/ar5312_attach.c athhal_ar5312
+file external/isc/atheros_hal/dist/ar5312/ar5312_eeprom.c athhal_ar5312
+file external/isc/atheros_hal/dist/ar5312/ar5312_gpio.c athhal_ar5312
+file external/isc/atheros_hal/dist/ar5312/ar5312_interrupts.c athhal_ar5312
+file external/isc/atheros_hal/dist/ar5312/ar5312_misc.c athhal_ar5312
+file external/isc/atheros_hal/dist/ar5312/ar5312_power.c athhal_ar5312
+file external/isc/atheros_hal/dist/ar5312/ar5312_reset.c athhal_ar5312
+file external/isc/atheros_hal/dist/ar5312/ar5315_gpio.c (athhal_ar2316 | athhal_ar2317)
# Atheros AR5416 family
#
@@ -115,30 +126,31 @@ defflag opt_athhal.h ATHHAL_AR5416: athh
defflag opt_athhal.h ATHHAL_AR9280: ATHHAL_AR5416
defflag opt_athhal.h ATHHAL_AR9285: ATHHAL_AR5416
-file external/isc/atheros_hal/dist/ar5416/ar2133.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_ani.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_attach.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_cal.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_cal_adcdc.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_cal_adcgain.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_cal_iq.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_gpio.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_keycache.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_misc.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_phy.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_power.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_recv.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_reset.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar5416_xmit.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar9160_attach.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar9280.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar9280_attach.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar9285.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar9285_attach.c ath & athhal_ar5416
-file external/isc/atheros_hal/dist/ar5416/ar9285_reset.c ath & athhal_ar5416
+define athhal_ar5416: ath
+file external/isc/atheros_hal/dist/ar5416/ar2133.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_ani.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_attach.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_cal.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_cal_adcdc.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_cal_adcgain.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_cal_iq.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_eeprom.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_gpio.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_interrupts.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_keycache.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_misc.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_phy.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_power.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_recv.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_reset.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar5416_xmit.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar9160_attach.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar9280.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar9280_attach.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar9285.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar9285_attach.c athhal_ar5416
+file external/isc/atheros_hal/dist/ar5416/ar9285_reset.c athhal_ar5416
#
#
