svn commit: r250266 - head/tools/tools/ath/athalq

[Adrian Chadd]

Author: adrian
Date: Sun May  5 09:38:25 2013
New Revision: 250266
URL: http://svnweb.freebsd.org/changeset/base/250266

Log:
  Add the AR9300 descriptor decoding code.

Modified:
  head/tools/tools/ath/athalq/Makefile
  head/tools/tools/ath/athalq/ar9300_ds.c
  head/tools/tools/ath/athalq/main.c

Modified: head/tools/tools/ath/athalq/Makefile
==============================================================================
--- head/tools/tools/ath/athalq/Makefile	Sun May  5 09:38:02 2013	(r250265)
+++ head/tools/tools/ath/athalq/Makefile	Sun May  5 09:38:25 2013	(r250266)
@@ -3,8 +3,10 @@
 PROG=	athalq
 NOMAN=	yes
 
+CFLAGS+=	-I../../../../sys/contrib
+
 SRCS=	main.c ar5210_ds.c ar5211_ds.c ar5212_ds.c ar5416_ds.c tdma.c
-# SRCS+=	ar9300_ds.c
+SRCS+=	ar9300_ds.c
 
 .include <../Makefile.inc>
 

Modified: head/tools/tools/ath/athalq/ar9300_ds.c
==============================================================================
--- head/tools/tools/ath/athalq/ar9300_ds.c	Sun May  5 09:38:02 2013	(r250265)
+++ head/tools/tools/ath/athalq/ar9300_ds.c	Sun May  5 09:38:25 2013	(r250266)
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 
 #include <dev/ath/if_ath_alq.h>
-#include <dev/ath/ath_hal/ar9003/ar9300desc.h>
+#include <dev/ath/ath_hal/ar9300/ar9300desc.h>
 
 #include "ar9300_ds.h"
 

Modified: head/tools/tools/ath/athalq/main.c
==============================================================================
--- head/tools/tools/ath/athalq/main.c	Sun May  5 09:38:02 2013	(r250265)
+++ head/tools/tools/ath/athalq/main.c	Sun May  5 09:38:25 2013	(r250266)
@@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/ath/if_ath_alq.h>
 
-#if 0
+#if 1
 #include "ar9300_ds.h"
 #endif
 #include "ar5210_ds.h"
@@ -156,7 +156,7 @@ main(int argc, const char *argv[])
 					ar5212_alq_payload(a);
 				else if (be32toh(hdr.sc_hal_magic) == AR5416_MAGIC)
 					ar5416_alq_payload(a);
-#if 0
+#if 1
 				else if (be32toh(hdr.sc_hal_magic) == AR9300_MAGIC)
 					ar9300_alq_payload(a);
 #endif