carl9170 firmware tools: wol stop after inject error

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

diff --git a/tools/src/fwinfo.c b/tools/src/fwinfo.c
index f0b63a85983b5fb08feb850a7e3745cd2bcad07d..18ca8be67bf21f9cc779f178e0e132d304fea0fe 100644 (file)
--- a/tools/src/fwinfo.c
+++ b/tools/src/fwinfo.c
@@ -64,6 +64,7 @@ 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),
 };
 
 static void check_feature_list(const struct carl9170fw_desc_head *head,
@@ -150,18 +151,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));
-       fprintf(stdout, "\t\trx filter    = 0x%.8x\n",
-               le32_to_cpu(dbg->rx_filter));
-       /* 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,
@@ -255,7 +256,7 @@ int main(int argc, char *args[])
 
        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));