16 files changed, 27 insertions, 21 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 916fe3f..8d5cd24 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -737,16 +737,16 @@ dev/ath/ath_hal/ar5416/ar5416_xmit.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar9160 (depends on ar5416)
-dev/ath/ath_hal/ar5416/ar9160_attach.c optional ath_hal | ath_ar9160 \
+dev/ath/ath_hal/ar9001/ar9160_attach.c optional ath_hal | ath_ar9160 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar9280 (depends on ar5416)
-dev/ath/ath_hal/ar5416/ar9280_attach.c optional ath_hal | ath_ar9280 | \
+dev/ath/ath_hal/ar9002/ar9280_attach.c optional ath_hal | ath_ar9280 | \
 	ath_ar9285 \ 
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ar9285 (depends on ar5416 and ar9280)
-dev/ath/ath_hal/ar5416/ar9285_attach.c optional ath_hal | ath_ar9285 \ 
+dev/ath/ath_hal/ar9002/ar9285_attach.c optional ath_hal | ath_ar9285 \ 
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
-dev/ath/ath_hal/ar5416/ar9285_reset.c optional ath_hal | ath_ar9285 \ 
+dev/ath/ath_hal/ar9002/ar9285_reset.c optional ath_hal | ath_ar9285 \ 
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # rf backends
 dev/ath/ath_hal/ar5212/ar2316.c	optional ath_rf2316 \
@@ -765,9 +765,9 @@ dev/ath/ath_hal/ar5212/ar5413.c	optional ath_hal | ath_rf5413 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar2133.c optional ath_hal | ath_ar5416 | ath_ar9160 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
-dev/ath/ath_hal/ar5416/ar9280.c optional ath_hal | ath_ar9280 | ath_ar9285 \
+dev/ath/ath_hal/ar9002/ar9280.c optional ath_hal | ath_ar9280 | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
-dev/ath/ath_hal/ar5416/ar9285.c optional ath_hal | ath_ar9285 \
+dev/ath/ath_hal/ar9002/ar9285.c optional ath_hal | ath_ar9285 \
 	compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal"
 # ath rate control algorithms
 dev/ath/ath_rate/amrr/amrr.c	optional ath_rate_amrr \
diff --git a/sys/conf/options b/sys/conf/options
index 440f89f..13f1d22 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -650,6 +650,7 @@ UKBD_DFLT_KEYMAP	opt_ukbd.h
 UPLCOM_INTR_INTERVAL	opt_uplcom.h
 UVSCOM_DEFAULT_OPKTSIZE	opt_uvscom.h
 UVSCOM_INTR_INTERVAL	opt_uvscom.h
+USB_HOST_ALIGN		opt_usb.h
 
 # Embedded system options
 INIT_PATH
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9160.ini b/sys/dev/ath/ath_hal/ar9001/ar9160.ini
index 1b81bc3..1b81bc3 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9160.ini
+++ b/sys/dev/ath/ath_hal/ar9001/ar9160.ini
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c b/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
index a8f8316..bae956b 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c
+++ b/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c
@@ -26,7 +26,7 @@
 #include "ar5416/ar5416reg.h"
 #include "ar5416/ar5416phy.h"
 
-#include "ar5416/ar9160.ini"
+#include "ar9001/ar9160.ini"
 
 static const HAL_PERCAL_DATA ar9160_iq_cal = {		/* multi sample */
 	.calName = "IQ", .calType = IQ_MISMATCH_CAL,
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9280.c b/sys/dev/ath/ath_hal/ar9002/ar9280.c
index 72720f7..6c7617a 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9280.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280.c
@@ -26,7 +26,7 @@
 
 #include "ah_eeprom_v14.h"
 
-#include "ar5416/ar9280.h"
+#include "ar9002/ar9280.h"
 #include "ar5416/ar5416reg.h"
 #include "ar5416/ar5416phy.h"
 
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9280.h b/sys/dev/ath/ath_hal/ar9002/ar9280.h
index 59039f0..59039f0 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9280.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280.h
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
index f33b555..475e989 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
@@ -24,12 +24,12 @@
 
 #include "ah_eeprom_v14.h"		/* XXX for tx/rx gain */
 
-#include "ar5416/ar9280.h"
+#include "ar9002/ar9280.h"
 #include "ar5416/ar5416reg.h"
 #include "ar5416/ar5416phy.h"
 
-#include "ar5416/ar9280v1.ini"
-#include "ar5416/ar9280v2.ini"
+#include "ar9002/ar9280v1.ini"
+#include "ar9002/ar9280v2.ini"
 
 static const HAL_PERCAL_DATA ar9280_iq_cal = {		/* single sample */
 	.calName = "IQ", .calType = IQ_MISMATCH_CAL,
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini b/sys/dev/ath/ath_hal/ar9002/ar9280v1.ini
index 96e0f44..96e0f44 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280v1.ini
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini b/sys/dev/ath/ath_hal/ar9002/ar9280v2.ini
index aa8e524..aa8e524 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini
+++ b/sys/dev/ath/ath_hal/ar9002/ar9280v2.ini
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9285.c b/sys/dev/ath/ath_hal/ar9002/ar9285.c
index 800c92f..9b7da66 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9285.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285.c
@@ -23,8 +23,8 @@
 
 #include "ah_eeprom_v14.h"
 
-#include "ar5416/ar9280.h"
-#include "ar5416/ar9285.h"
+#include "ar9002/ar9280.h"
+#include "ar9002/ar9285.h"
 #include "ar5416/ar5416reg.h"
 #include "ar5416/ar5416phy.h"
 
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9285.h b/sys/dev/ath/ath_hal/ar9002/ar9285.h
index 1ee058b..1ee058b 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9285.h
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285.h
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9285.ini b/sys/dev/ath/ath_hal/ar9002/ar9285.ini
index ef0ff2d..ef0ff2d 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9285.ini
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285.ini
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
index d06061e..2b85a7a 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
@@ -24,14 +24,14 @@
 
 #include "ah_eeprom_v4k.h"		/* XXX for tx/rx gain */
 
-#include "ar5416/ar9280.h"
-#include "ar5416/ar9285.h"
+#include "ar9002/ar9280.h"
+#include "ar9002/ar9285.h"
 #include "ar5416/ar5416reg.h"
 #include "ar5416/ar5416phy.h"
 
-#include "ar5416/ar9285.ini"
-#include "ar5416/ar9285v2.ini"
-#include "ar5416/ar9280v2.ini"		/* XXX ini for tx/rx gain */
+#include "ar9002/ar9285.ini"
+#include "ar9002/ar9285v2.ini"
+#include "ar9002/ar9280v2.ini"		/* XXX ini for tx/rx gain */
 
 static const HAL_PERCAL_DATA ar9280_iq_cal = {		/* single sample */
 	.calName = "IQ", .calType = IQ_MISMATCH_CAL,
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c b/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
index 1f75c92..c75a031 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c
@@ -31,7 +31,7 @@
 #include "ah_eeprom_v14.h"
 #include "ah_eeprom_v4k.h"
 
-#include "ar5416/ar9285.h"
+#include "ar9002/ar9285.h"
 #include "ar5416/ar5416.h"
 #include "ar5416/ar5416reg.h"
 #include "ar5416/ar5416phy.h"
diff --git a/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini b/sys/dev/ath/ath_hal/ar9002/ar9285v2.ini
index 2a9de1d..2a9de1d 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar9285v2.ini
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285v2.ini
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile
index 3c01fd0..808d56d 100644
--- a/sys/modules/ath/Makefile
+++ b/sys/modules/ath/Makefile
@@ -88,10 +88,15 @@ SRCS+=	ah_eeprom_v14.c ah_eeprom_v4k.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
-SRCS+=	ar9160_attach.c
-SRCS+=	ar9280.c ar9280_attach.c
+
 # RF backend for 5416 and 9160
 SRCS+=	ar2133.c
+
+.PATH:	${.CURDIR}/../../dev/ath/ath_hal/ar9001
+SRCS+=	ar9160_attach.c
+
+.PATH:	${.CURDIR}/../../dev/ath/ath_hal/ar9002
+SRCS+=	ar9280.c ar9280_attach.c
 SRCS+=	ar9285.c ar9285_reset.c ar9285_attach.c
 
 # NB: rate control is bound to the driver by symbol names so only pick one