projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge carl9170fw
[carl9170fw.git]
/
carlfw
/
src
/
fw.c
diff --git
a/carlfw/src/fw.c
b/carlfw/src/fw.c
index aed674fb1b41bbde42f360d9cac1fb2176c0d53d..a934687a9feaf1a10d87474e66e086732fa64c2b 100644
(file)
--- a/
carlfw/src/fw.c
+++ b/
carlfw/src/fw.c
@@
-35,7
+35,6
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
FILL(otus, OTUS,
.feature_set = cpu_to_le32(BIT(CARL9170FW_DUMMY_FEATURE) |
BIT(CARL9170FW_USB_RESP_EP2) |
FILL(otus, OTUS,
.feature_set = cpu_to_le32(BIT(CARL9170FW_DUMMY_FEATURE) |
BIT(CARL9170FW_USB_RESP_EP2) |
- BIT(CARL9170FW_PSM) |
BIT(CARL9170FW_RX_FILTER) |
#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
BIT(CARL9170FW_USB_INIT_FIRMWARE) |
BIT(CARL9170FW_RX_FILTER) |
#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
BIT(CARL9170FW_USB_INIT_FIRMWARE) |
@@
-48,6
+47,7
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
BIT(CARL9170FW_COMMAND_PHY) |
#endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
BIT(CARL9170FW_COMMAND_PHY) |
+ BIT(CARL9170FW_PSM) |
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
#ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
BIT(CARL9170FW_COMMAND_CAM) |
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
#ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
BIT(CARL9170FW_COMMAND_CAM) |