svn commit: r250011 - user/adrian/net80211_tx/sys/modules/ath

[Adrian Chadd]

Author: adrian
Date: Sun Apr 28 02:04:33 2013
New Revision: 250011
URL: http://svnweb.freebsd.org/changeset/base/250011

Log:
  * Flip on ar9300 HAL building by default.
  * Update the directory locations to point to where it is now living
    in -HEAD.

Modified:
  user/adrian/net80211_tx/sys/modules/ath/Makefile

Modified: user/adrian/net80211_tx/sys/modules/ath/Makefile
==============================================================================
--- user/adrian/net80211_tx/sys/modules/ath/Makefile	Sun Apr 28 01:59:20 2013	(r250010)
+++ user/adrian/net80211_tx/sys/modules/ath/Makefile	Sun Apr 28 02:04:33 2013	(r250011)
@@ -124,13 +124,13 @@ SRCS+=  ah_eeprom_9287.c
 SRCS+=  ar9287.c ar9287_reset.c ar9287_attach.c ar9287_cal.c ar9287_olc.c
 
 # + AR9300 HAL
-# .PATH:  ${.CURDIR}/../../contrib/sys/dev/ath/ath_hal/ar9300
-#SRCS+= ar9300_interrupts.c ar9300_radar.c ar9300_ani.c ar9300_keycache.c
-#SRCS+= ar9300_radio.c ar9300_xmit.c ar9300_attach.c ar9300_mci.c ar9300_stub.c
-#SRCS+= ar9300_xmit_ds.c ar9300_beacon.c ar9300_misc.c ar9300_recv.c
-#SRCS+= ar9300_stub_funcs.c ar9300_eeprom.c ar9300_paprd.c ar9300_recv_ds.c
-#SRCS+= ar9300_freebsd.c ar9300_phy.c ar9300_reset.c ar9300_gpio.c
-#SRCS+= ar9300_power.c ar9300_timer.c
+.PATH:  ${.CURDIR}/../../contrib/dev/ath/ath_hal/ar9300
+SRCS+= ar9300_interrupts.c ar9300_radar.c ar9300_ani.c ar9300_keycache.c
+SRCS+= ar9300_radio.c ar9300_xmit.c ar9300_attach.c ar9300_mci.c ar9300_stub.c
+SRCS+= ar9300_xmit_ds.c ar9300_beacon.c ar9300_misc.c ar9300_recv.c
+SRCS+= ar9300_stub_funcs.c ar9300_eeprom.c ar9300_paprd.c ar9300_recv_ds.c
+SRCS+= ar9300_freebsd.c ar9300_phy.c ar9300_reset.c ar9300_gpio.c
+SRCS+= ar9300_power.c ar9300_timer.c
 
 # NB: rate control is bound to the driver by symbol names so only pick one
 .if ${ATH_RATE} == "sample"
@@ -149,7 +149,7 @@ SRCS+=	amrr.c
 SRCS+=	dfs_null.c
 
 CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal
-# CFLAGS+=  -I. -I${.CURDIR}/../../contrib/sys/dev/ath/ath_hal/
+CFLAGS+=  -I. -I${.CURDIR}/../../contrib/dev/ath/ath_hal/
 
 .if !defined(KERNBUILDDIR)
 opt_ah.h:
@@ -164,5 +164,5 @@ CWARNFLAGS.if_ath.c=		${NO_WSOMETIMES_UN
 CWARNFLAGS+=			${CWARNFLAGS.${.IMPSRC:T}}
 
 # AR9300 HAL build overrides, as there's still some code to tidy up
-#CWARNFLAGS.ar9300_eeprom.c=	${NO_WCONSTANT_CONVERSION}
-#CWARNFLAGS.ar9300_reset.c=	${NO_WSOMETIMES_UNINITIALIZED}
+CWARNFLAGS.ar9300_eeprom.c=	${NO_WCONSTANT_CONVERSION}
+CWARNFLAGS.ar9300_reset.c=	${NO_WSOMETIMES_UNINITIALIZED}