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

diff --git a/tools/src/fwinfo.c b/tools/src/fwinfo.c
index 3a1a583..b42852d 100644
--- a/tools/src/fwinfo.c
+++ b/tools/src/fwinfo.c
@@ -56,7 +56,6 @@ static const struct feature_list known_otus_features_v1[] = {
 	CHECK_FOR_FEATURE(CARL9170FW_USB_RESP_EP2),
 	CHECK_FOR_FEATURE(CARL9170FW_USB_DOWN_STREAM),
 	CHECK_FOR_FEATURE(CARL9170FW_USB_UP_STREAM),
-	CHECK_FOR_FEATURE(CARL9170FW_USB_WATCHDOG),
 	CHECK_FOR_FEATURE(CARL9170FW_UNUSABLE),
 	CHECK_FOR_FEATURE(CARL9170FW_COMMAND_PHY),
 	CHECK_FOR_FEATURE(CARL9170FW_COMMAND_CAM),
@@ -64,6 +63,7 @@ static const struct feature_list known_otus_features_v1[] = {
 	CHECK_FOR_FEATURE(CARL9170FW_HANDLE_BACK_REQ),
 	CHECK_FOR_FEATURE(CARL9170FW_GPIO_INTERRUPT),
 	CHECK_FOR_FEATURE(CARL9170FW_PSM),
+	CHECK_FOR_FEATURE(CARL9170FW_RX_FILTER),
 };
 
 static void check_feature_list(const struct carl9170fw_desc_head *head,
@@ -150,16 +150,18 @@ static void show_dbg_desc(const struct carl9170fw_desc_head *head,
 {
 	const struct carl9170fw_dbg_desc *dbg = (const void *) head;
 
+#define DBG_ADDR(_name, _reg) do {					\
+	unsigned int __tmp = le32_to_cpu(dbg->_reg);			\
+	if (__tmp)							\
+		fprintf(stdout, "\t\t" _name " = 0x%.8x\n", __tmp);	\
+	} while (0);
+
 	fprintf(stdout, "\tFirmware Debug Registers/Counters\n");
-	fprintf(stdout, "\t\tbogoclock    = 0x%.8x\n",
-		le32_to_cpu(dbg->bogoclock_addr));
-	fprintf(stdout, "\t\tcounter      = 0x%.8x\n",
-		le32_to_cpu(dbg->counter_addr));
-	fprintf(stdout, "\t\trx total     = 0x%.8x\n",
-		le32_to_cpu(dbg->rx_total_addr));
-	fprintf(stdout, "\t\trx overrun   = 0x%.8x\n",
-		le32_to_cpu(dbg->rx_overrun_addr));
-	/* Nothing interesting here */
+	DBG_ADDR("bogoclock    ", bogoclock_addr);
+	DBG_ADDR("counter      ", counter_addr);
+	DBG_ADDR("rx total     ", rx_total_addr);
+	DBG_ADDR("rx overrun   ", rx_overrun_addr);
+	DBG_ADDR("rx filer     ", rx_filter);
 }
 
 static void show_chk_desc(const struct carl9170fw_desc_head *head,
@@ -245,14 +247,15 @@ int main(int argc, char *args[])
 
 	fw = carlfw_load(args[1]);
 	if (IS_ERR_OR_NULL(fw)) {
+		err = PTR_ERR(fw);
 		fprintf(stderr, "Failed to open firmware \"%s\" (%d).\n",
-			args[1], (int)PTR_ERR(fw));
+			args[1], err);
 		goto out;
 	}
 
 	carlfw_get_fw(fw, &len);
 	fprintf(stdout, "General Firmware Statistics:\n");
-	fprintf(stdout, "\tFirmware file size: %u Bytes\n", len);
+	fprintf(stdout, "\tFirmware file size: %u Bytes\n", (unsigned int)len);
 	fprintf(stdout, "\t%d Descriptors in %d Bytes\n",
 		carlfw_get_descs_num(fw), carlfw_get_descs_size(fw));