carl9170 toolchain: update to gcc 6.2.0 and binutils 2.27

[carl9170fw.git] / tools / src / fwinfo.c

diff --git a/tools/src/fwinfo.c b/tools/src/fwinfo.c
index b2f7e2d1238d1f333edc6be2cda673abec0ea86b..87fdf543a7b0758a1882f6b2da5eb33d3be74c09 100644 (file)
--- a/tools/src/fwinfo.c
+++ b/tools/src/fwinfo.c
@@ -27,6 +27,7 @@
 
 #include "carlfw.h"
 
+#include "fwcmd.h"
 #include "compiler.h"
 
 struct feature_list {
@@ -65,6 +66,11 @@ 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_HAS_WREGB_CMD),
+       CHECK_FOR_FEATURE(CARL9170FW_PATTERN_GENERATOR),
 };
 
 static void check_feature_list(const struct carl9170fw_desc_head *head,
@@ -166,7 +172,7 @@ static void show_dbg_desc(const struct carl9170fw_desc_head *head,
 }
 
 static void show_txsq_desc(const struct carl9170fw_desc_head *head,
-                           struct carlfw *fw __unused)
+                          struct carlfw *fw __unused)
 {
        const struct carl9170fw_txsq_desc *txsq = (const void *) head;
 
@@ -174,8 +180,26 @@ static void show_txsq_desc(const struct carl9170fw_desc_head *head,
                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;
 
@@ -185,6 +209,25 @@ static void show_chk_desc(const struct carl9170fw_desc_head *head,
                le32_to_cpu(chk->fw_crc32));
 }
 
+static void show_pattern_desc(const struct carl9170fw_desc_head *head,
+                         struct carlfw *fw __unused)
+{
+       const struct carl9170fw_pattern_desc *pattern = (const void *) head;
+       const struct carl9170fw_pattern_map_entry *map = pattern->patterns;
+       int map_entries = (head->length - sizeof(*pattern)) / sizeof(*map);
+       int i;
+
+       fprintf(stdout, "\tPattern index register: %08x\n",
+               le32_to_cpu(pattern->soft_pattern));
+       fprintf(stdout, "\tNumber of supported patterns: %08x\n",
+               le32_to_cpu(pattern->num_patterns));
+
+       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)
 
@@ -214,11 +257,11 @@ static const struct {
        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(PATTERN, show_pattern_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 :  ' ')