X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tools%2Fsrc%2Ffwinfo.c;h=cd5466cb3e958ad518366fd55d7a3cfd6d577c35;hb=8a51deb2c6cd4e3a8e172c9ffab1e42b23ad3703;hp=b2441f7cce837b83fdaa595d9181d25553d4d91c;hpb=abe638e30cc642fb4e80d805fc1372eb49e900b4;p=carl9170fw.git

diff --git a/tools/src/fwinfo.c b/tools/src/fwinfo.c
index b2441f7..cd5466c 100644
--- a/tools/src/fwinfo.c
+++ b/tools/src/fwinfo.c
@@ -69,7 +69,8 @@ static const struct feature_list known_otus_features_v1[] = {
 	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),
+	CHECK_FOR_FEATURE(CARL9170FW_HAS_WREGB_CMD),
+	CHECK_FOR_FEATURE(CARL9170FW_PATTERN_GENERATOR),
 };
 
 static void check_feature_list(const struct carl9170fw_desc_head *head,
@@ -208,18 +209,18 @@ 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,
+static void show_pattern_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);
+	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, "\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));
+	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",
@@ -257,7 +258,7 @@ static const struct {
 	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(PATTERN, show_pattern_desc),
 	ADD_HANDLER(LAST, show_last_desc),
 };