[src/trunk]: src/sys/external/isc/atheros_hal/conf Revert troublesome ath_hal...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a326df4f83d6
branches:  trunk
changeset: 333008:a326df4f83d6
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Tue Oct 14 08:17:27 2014 +0000

description:
Revert troublesome ath_hal config definitions back to the original.

This means that, under the new config(1) modular build, if the option
ATHHAL_AR5210, that extends the ath driver to support AR5210, is selected,
the relevant 10 ar5210_*.c files end up being embedded into the "netbsd.ko"
module, which is pretty much opposite of modularity.

diffstat:

 sys/external/isc/atheros_hal/conf/files.ath_hal |  180 +++++++++++------------
 1 files changed, 84 insertions(+), 96 deletions(-)

diffs (235 lines):

diff -r 6108e062210d -r a326df4f83d6 sys/external/isc/atheros_hal/conf/files.ath_hal
--- a/sys/external/isc/atheros_hal/conf/files.ath_hal   Tue Oct 14 08:03:13 2014 +0000
+++ b/sys/external/isc/atheros_hal/conf/files.ath_hal   Tue Oct 14 08:17:27 2014 +0000
@@ -1,18 +1,18 @@
-#      $NetBSD: files.ath_hal,v 1.5 2014/10/10 17:09:18 uebayasi Exp $
+#      $NetBSD: files.ath_hal,v 1.6 2014/10/14 08:17:27 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: ath
-define athhal_eeprom_v3: ath
-define athhal_eeprom_v14: ath
-define athhal_eeprom_v4k: ath
+define athhal_eeprom_v1
+define athhal_eeprom_v3
+define athhal_eeprom_v14
+define athhal_eeprom_v4k
 
 file   external/isc/atheros_hal/dist/ah.c              ath
-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_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_regdomain.c    ath
 
 # Atheros HAL's OS dependant code
@@ -24,33 +24,31 @@
 #
 defflag opt_athhal.h   ATHHAL_AR5210: athhal_eeprom_v1
 
-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
+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
 
 # Atheros AR5211 family
 #
 defflag opt_athhal.h   ATHHAL_AR5211: athhal_eeprom_v3
 
-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
+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
 
 # Atheros AR5212/AR5312 RF support
 #
@@ -62,46 +60,38 @@
 defflag opt_athhal.h   ATHHAL_RF5112
 defflag opt_athhal.h   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
+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
 
 # Atheros AR5212 family
 #
-define athhal_ar5212_attach: ath
-define athhal_ar5212_subr: ath
+define athhal_ar5212_attach
+define athhal_ar5212_subr
 
 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       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
+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
 
 # Atheros AR5312 family
 #
@@ -110,15 +100,14 @@
 defflag opt_athhal.h   ATHHAL_AR2316: ATHHAL_AR5312
 defflag opt_athhal.h   ATHHAL_AR2317: ATHHAL_AR5312
 
-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)
+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)
 
 # Atheros AR5416 family
 #
@@ -126,31 +115,30 @@
 defflag opt_athhal.h   ATHHAL_AR9280: ATHHAL_AR5416
 defflag opt_athhal.h   ATHHAL_AR9285: 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
+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
 
 #
 #