X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tools%2Fsrc%2Ffwinfo.c;h=28b6e7d1bbf633087705856a7b55718d308f7720;hb=e017a914b2679d669e201cc76f812b641aa7eea3;hp=b42852d519f85dbba432b52b30b5a81c37fec0bd;hpb=1b87ea4a51988adea4d112ada0cb749c8059353c;p=carl9170fw.git

diff --git a/tools/src/fwinfo.c b/tools/src/fwinfo.c
index b42852d..28b6e7d 100644
--- a/tools/src/fwinfo.c
+++ b/tools/src/fwinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010, Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2010-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 
 #include "carlfw.h"
 
+#include "fwcmd.h"
 #include "compiler.h"
 
 struct feature_list {
@@ -64,6 +65,12 @@ static const struct feature_list known_otus_features_v1[] = {
 	CHECK_FOR_FEATURE(CARL9170FW_GPIO_INTERRUPT),
 	CHECK_FOR_FEATURE(CARL9170FW_PSM),
 	CHECK_FOR_FEATURE(CARL9170FW_RX_FILTER),
+	CHECK_FOR_FEATURE(CARL9170FW_WOL),
+	CHECK_FOR_FEATURE(CARL9170FW_FIXED_5GHZ_PSM),
+	CHECK_FOR_FEATURE(CARL9170FW_HW_COUNTERS),
+	CHECK_FOR_FEATURE(CARL9170FW_RX_BA_FILTER),
+	CHECK_FOR_FEATURE(CARL9170FW_HAS_WREGB_CMD),
+	CHECK_FOR_FEATURE(CARL9170FW_PATTERN_GENERATOR),
 };
 
 static void check_feature_list(const struct carl9170fw_desc_head *head,
@@ -164,8 +171,35 @@ static void show_dbg_desc(const struct carl9170fw_desc_head *head,
 	DBG_ADDR("rx filer     ", rx_filter);
 }
 
+static void show_txsq_desc(const struct carl9170fw_desc_head *head,
+			   struct carlfw *fw __unused)
+{
+	const struct carl9170fw_txsq_desc *txsq = (const void *) head;
+
+	fprintf(stdout, "\t\ttx-seq table addr: 0x%x\n",
+		le32_to_cpu(txsq->seq_table_addr));
+}
+
+
+static const struct feature_list wol_triggers_v1[] = {
+	CHECK_FOR_FEATURE(CARL9170_WOL_DISCONNECT),
+	CHECK_FOR_FEATURE(CARL9170_WOL_MAGIC_PKT),
+};
+
+static void show_wol_desc(const struct carl9170fw_desc_head *head,
+			  struct carlfw *fw __unused)
+{
+	const struct carl9170fw_wol_desc *wol = (const void *) head;
+
+	fprintf(stdout, "\tSupported WOWLAN triggers: (raw:%.08x)\n",
+		le32_to_cpu(wol->supported_triggers));
+
+	check_feature_list(head, wol->supported_triggers, wol_triggers_v1,
+			   ARRAY_SIZE(wol_triggers_v1), fw);
+}
+
 static void show_chk_desc(const struct carl9170fw_desc_head *head,
-			    struct carlfw *fw __unused)
+			  struct carlfw *fw __unused)
 {
 	const struct carl9170fw_chk_desc *chk = (const void *) head;
 
@@ -199,15 +233,15 @@ static const struct {
 	uint16_t size;
 } known_magics[] = {
 	ADD_HANDLER(OTUS, show_otus_desc),
+	ADD_HANDLER(TXSQ, show_txsq_desc),
 	ADD_HANDLER(MOTD, show_motd_desc),
 	ADD_HANDLER(DBG, show_dbg_desc),
 	ADD_HANDLER(FIX, show_fix_desc),
 	ADD_HANDLER(CHK, show_chk_desc),
+	ADD_HANDLER(WOL, show_wol_desc),
 	ADD_HANDLER(LAST, show_last_desc),
 };
 
-static const uint8_t otus_magic[4] = { OTUS_MAGIC };
-
 static void show_desc_head(struct carl9170fw_desc_head *head)
 {
 #define P(c) (isprint(c) ? c :  ' ')