X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tools%2Fsrc%2Ffwinfo.c;h=b2441f7cce837b83fdaa595d9181d25553d4d91c;hb=6ad7dd18fb9a1c674708e32fce3f4e89c8f1d83d;hp=18ca8be67bf21f9cc779f178e0e132d304fea0fe;hpb=6476369c2c6d4ba487408cb5daff8df0480d6b4a;p=carl9170fw.git

diff --git a/tools/src/fwinfo.c b/tools/src/fwinfo.c
index 18ca8be..b2441f7 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 {
@@ -65,6 +66,10 @@ static const struct feature_list known_otus_features_v1[] = {
 	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_RADAR_PATTERN_GENERATOR),
 };
 
 static void check_feature_list(const struct carl9170fw_desc_head *head,
@@ -165,8 +170,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;
 
@@ -176,6 +208,25 @@ static void show_chk_desc(const struct carl9170fw_desc_head *head,
 		le32_to_cpu(chk->fw_crc32));
 }
 
+static void show_radar_desc(const struct carl9170fw_desc_head *head,
+			  struct carlfw *fw __unused)
+{
+	const struct carl9170fw_radar_desc *radar = (const void *) head;
+	const struct carl9170fw_radar_map_entry *map = radar->radars;
+	int map_entries = (head->length - sizeof(*radar)) / sizeof(*map);
+	int i;
+
+	fprintf(stdout, "\tRadar index register: %08x\n",
+		le32_to_cpu(radar->soft_radar));
+	fprintf(stdout, "\tNumber of supported radar patterns: %08x\n",
+		le32_to_cpu(radar->num_radars));
+
+	for (i = 0; i < map_entries; i++) {
+		fprintf(stdout, "\t\tindex:0x%x, description:%s\n",
+			map[i].index, map[i].name);
+	}
+}
+
 static void show_last_desc(const struct carl9170fw_desc_head *head,
 			   struct carlfw *fw __unused)
 
@@ -200,10 +251,13 @@ 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(RADAR, show_radar_desc),
 	ADD_HANDLER(LAST, show_last_desc),
 };