summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2013-05-05 09:38:25 +0000
committeradrian <adrian@FreeBSD.org>2013-05-05 09:38:25 +0000
commit42b8c0012b80efc0b1d1bacb9d5c45afd8a51301 (patch)
tree63d7b9fefd896773eeb42a15090c38b45566a909
parentb39866a58247217436763acd68e49cd81594d017 (diff)
downloadFreeBSD-src-42b8c0012b80efc0b1d1bacb9d5c45afd8a51301.zip
FreeBSD-src-42b8c0012b80efc0b1d1bacb9d5c45afd8a51301.tar.gz
Add the AR9300 descriptor decoding code.
-rw-r--r--tools/tools/ath/athalq/Makefile4
-rw-r--r--tools/tools/ath/athalq/ar9300_ds.c2
-rw-r--r--tools/tools/ath/athalq/main.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/tools/tools/ath/athalq/Makefile b/tools/tools/ath/athalq/Makefile
index 60c9bf8..a7eb394 100644
--- a/tools/tools/ath/athalq/Makefile
+++ b/tools/tools/ath/athalq/Makefile
@@ -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>
diff --git a/tools/tools/ath/athalq/ar9300_ds.c b/tools/tools/ath/athalq/ar9300_ds.c
index 5ab55ca..04455d3 100644
--- a/tools/tools/ath/athalq/ar9300_ds.c
+++ b/tools/tools/ath/athalq/ar9300_ds.c
@@ -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"
diff --git a/tools/tools/ath/athalq/main.c b/tools/tools/ath/athalq/main.c
index 1d5447d..e0f4ad6 100644
--- a/tools/tools/ath/athalq/main.c
+++ b/tools/tools/ath/athalq/main.c
@@ -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
OpenPOWER on IntegriCloud