X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Ffw.c;h=c91914113e7f290ef345dd39091c4d4524ceb002;hb=8dc065b3012754fb34dcb04b7ce295cca4be0627;hp=b621813c1e1be339c4ee275dc652bd39e083ddc6;hpb=35cac8dcfa9d01fff0c929f0e2b9cc38fc919589;p=carl9170fw.git

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index b621813..c919141 100644
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -37,18 +37,18 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 					BIT(CARL9170FW_USB_RESP_EP2) |
 					BIT(CARL9170FW_HANDLE_BACK_REQ) |
 					BIT(CARL9170FW_RX_FILTER) |
-#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
+					BIT(CARL9170FW_HW_COUNTERS) |
 					BIT(CARL9170FW_USB_INIT_FIRMWARE) |
-# ifdef CONFIG_CARL9170FW_USB_UP_STREAM
+#ifdef CONFIG_CARL9170FW_USB_UP_STREAM
 					BIT(CARL9170FW_USB_UP_STREAM) |
-# endif /* CONFIG_CARL9170FW_USB_UP_STREAM */
-# ifdef CONFIG_CARL9170FW_USB_DOWN_STREAM
+#endif /* CONFIG_CARL9170FW_USB_UP_STREAM */
+#ifdef CONFIG_CARL9170FW_USB_DOWN_STREAM
 					BIT(CARL9170FW_USB_DOWN_STREAM) |
-# endif /* CONFIG_CARL9170FW_USB_DOWN_STREAM */
-#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
+#endif /* CONFIG_CARL9170FW_USB_DOWN_STREAM */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
 					BIT(CARL9170FW_COMMAND_PHY) |
 					BIT(CARL9170FW_PSM) |
+					BIT(CARL9170FW_FIXED_5GHZ_PSM) |
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 #ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
 					BIT(CARL9170FW_COMMAND_CAM) |
@@ -65,6 +65,9 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 #ifdef CONFIG_CARL9170FW_WOL
 					BIT(CARL9170FW_WOL) |
 #endif /* CONFIG_CARL9170FW_WOL */
+#ifdef CONFIG_CARL9170FW_RADAR
+					BIT(CARL9170FW_RADAR_PATTERN_GENERATOR) |
+#endif /* CONFIG_CARL9170FW_RADAR */
 					(0)),
 
 	     .miniboot_size = cpu_to_le16(0),
@@ -90,7 +93,6 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 	),
 #endif /* CONFIG_CARL9170FW_WOL */
 
-
 	FILL(motd, MOTD,
 	     .fw_year_month_day = cpu_to_le32(
 			CARL9170FW_SET_DAY(CARL9170FW_VERSION_DAY) +
@@ -99,11 +101,20 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 	     .desc = "Community AR9170 Linux",
 	     .release = CARL9170FW_VERSION_GIT),
 
+
+#ifdef CONFIG_CARL9170FW_RADAR
+	FILL(radar, RADAR,
+	     .soft_radar = cpu_to_le32(&fw.wlan.soft_radar),
+	     .num_radars = __CARL9170FW_NUM_RADARS,
+	     .radars = { /* filled by the fwprepare tool */ },
+	),
+#endif /* CONFIG_CARL9170FW_RADAR */
+
 	FILL(dbg, DBG,
 	     .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_total_addr = cpu_to_le32(0),
+	     .rx_overrun_addr = cpu_to_le32(0),
 	     .rx_filter = cpu_to_le32(&fw.wlan.rx_filter),
 	),