X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Ffw.c;h=a98b735086bfaeeab18e8b43f48e19992098dda1;hb=1739e9d7c5d581c15d1ae331d83352f8998a6a83;hp=be9001a099b751cfa6629501d06175611559209f;hpb=d3dc8751ff73ea50016a19bb7940c894fc3539aa;p=carl9170fw.git diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c index be9001a..a98b735 100644 --- a/carlfw/src/fw.c +++ b/carlfw/src/fw.c @@ -21,6 +21,7 @@ */ #include "carl9170.h" #include "fwdsc.h" +#include "pattern_generator.h" #define FILL(small, big, more...) \ .small = { \ @@ -64,9 +65,9 @@ const struct carl9170_firmware_descriptor __section(fwdsc) __visible carl9170fw_ #ifdef CONFIG_CARL9170FW_WOL BIT(CARL9170FW_WOL) | #endif /* CONFIG_CARL9170FW_WOL */ -#ifdef CONFIG_CARL9170FW_RADAR - BIT(CARL9170FW_RADAR_PATTERN_GENERATOR) | -#endif /* CONFIG_CARL9170FW_RADAR */ +#if defined(CONFIG_CARL9170FW_PATTERN_GENERATOR) + BIT(CARL9170FW_PATTERN_GENERATOR) | +#endif /* CONFIG_CARL9170FW_PATTERN_GENERATOR */ (0)), .miniboot_size = cpu_to_le16(0), @@ -100,12 +101,11 @@ const struct carl9170_firmware_descriptor __section(fwdsc) __visible carl9170fw_ .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 */ }, +#if defined(CONFIG_CARL9170FW_PATTERN_GENERATOR) + FILL(pattern, PATTERN, + .soft_pattern = cpu_to_le32(&fw.wlan.soft_pattern), + .num_patterns = __CARL9170FW_NUM_PATTERNS, + .patterns = { /* filled by the fwprepare tool */ }, ), #endif /* CONFIG_CARL9170FW_RADAR */