X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Ffw.c;h=1af4d90f595c3b445adf9cc64afd22d010aedf0c;hb=19e4d682fca010ef72e0a304335910f670c2268a;hp=fe59db56c6a148c701ee842164560f63b62e1c22;hpb=728210b58b90a703f7f00fc21f8abaef610208a7;p=carl9170fw.git

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index fe59db5..1af4d90 100644
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -44,9 +44,6 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 					BIT(CARL9170FW_USB_DOWN_STREAM) |
 # endif /* CONFIG_CARL9170FW_USB_DOWN_STREAM */
 #endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
-#ifdef CONFIG_CARL9170FW_USB_WATCHDOG
-					BIT(CARL9170FW_USB_WATCHDOG) |
-#endif /* CONFIG_CARL9170FW_USB_WATCHDOG */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
 					BIT(CARL9170FW_COMMAND_PHY) |
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
@@ -67,7 +64,11 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 #endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
 #ifdef CONFIG_CARL9170FW_PSM
 					BIT(CARL9170FW_PSM) |
-#endif
+#endif /* CONFIG_CARL9170FW_PSM */
+					BIT(CARL9170FW_RX_FILTER) |
+#ifdef CONFIG_CARL9170FW_WOL
+					BIT(CARL9170FW_WOL) |
+#endif /* CONFIG_CARL9170FW_WOL */
 					   (0)),
 
 	     .miniboot_size = cpu_to_le16(0),
@@ -82,6 +83,10 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 	     .api_ver = CONFIG_CARL9170FW_RELEASE_VERSION,
 	),
 
+	FILL(txsq, TXSQ,
+	     .seq_table_addr = cpu_to_le32(&fw.wlan.sequence),
+	),
+
 	FILL(motd, MOTD,
 	     .fw_year_month_day = cpu_to_le32(
 			CARL9170FW_SET_DAY(CARL9170FW_VERSION_DAY) +
@@ -91,10 +96,11 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 	     .release = CARL9170FW_VERSION_GIT),
 
 	FILL(dbg, DBG,
-	     .bogoclock_addr = cpu_to_le32(&fw.bogoclock),
+	     .bogoclock_addr = cpu_to_le32(0),
 	     .counter_addr = cpu_to_le32(&fw.counter),
 	     .rx_total_addr = cpu_to_le32(&fw.wlan.rx_total),
 	     .rx_overrun_addr = cpu_to_le32(&fw.wlan.rx_overruns),
+	     .rx_filter = cpu_to_le32(&fw.wlan.rx_filter),
 	),
 
 	FILL(last, LAST),