projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into radar
[carl9170fw.git]
/
carlfw
/
src
/
fw.c
diff --git
a/carlfw/src/fw.c
b/carlfw/src/fw.c
index 74faf79c5e3ba906f336610e6c6c17d9b0e0b712..bebb39e73d84e3bf6f1d4b2f560eda6f3eb8de30 100644
(file)
--- a/
carlfw/src/fw.c
+++ b/
carlfw/src/fw.c
@@
-38,15
+38,14
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
BIT(CARL9170FW_HANDLE_BACK_REQ) |
BIT(CARL9170FW_RX_FILTER) |
BIT(CARL9170FW_HW_COUNTERS) |
BIT(CARL9170FW_HANDLE_BACK_REQ) |
BIT(CARL9170FW_RX_FILTER) |
BIT(CARL9170FW_HW_COUNTERS) |
-#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
+ BIT(CARL9170FW_RX_BA_FILTER) |
BIT(CARL9170FW_USB_INIT_FIRMWARE) |
BIT(CARL9170FW_USB_INIT_FIRMWARE) |
-#
ifdef CONFIG_CARL9170FW_USB_UP_STREAM
+#ifdef CONFIG_CARL9170FW_USB_UP_STREAM
BIT(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) |
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) |
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
BIT(CARL9170FW_COMMAND_PHY) |
BIT(CARL9170FW_PSM) |
@@
-67,6
+66,9
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
#ifdef CONFIG_CARL9170FW_WOL
BIT(CARL9170FW_WOL) |
#endif /* CONFIG_CARL9170FW_WOL */
#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),
(0)),
.miniboot_size = cpu_to_le16(0),
@@
-92,7
+94,6
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
),
#endif /* CONFIG_CARL9170FW_WOL */
),
#endif /* CONFIG_CARL9170FW_WOL */
-
FILL(motd, MOTD,
.fw_year_month_day = cpu_to_le32(
CARL9170FW_SET_DAY(CARL9170FW_VERSION_DAY) +
FILL(motd, MOTD,
.fw_year_month_day = cpu_to_le32(
CARL9170FW_SET_DAY(CARL9170FW_VERSION_DAY) +
@@
-101,6
+102,15
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
.desc = "Community AR9170 Linux",
.release = CARL9170FW_VERSION_GIT),
.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),
FILL(dbg, DBG,
.bogoclock_addr = cpu_to_le32(0),
.counter_addr = cpu_to_le32(&fw.counter),