Merge branch 'master' into radar

[carl9170fw.git] / include / shared / fwdesc.h

diff --git a/include/shared/fwdesc.h b/include/shared/fwdesc.h
index 903a346bebd54061785f2909eb24fb254abdf584..d542b01eb0409d8677c212e2f13838c9394ab4c9 100644 (file)
--- a/include/shared/fwdesc.h
+++ b/include/shared/fwdesc.h
@@ -78,8 +78,14 @@ enum carl9170fw_feature_list {
        /* HW (ANI, CCA, MIB) tally counters */
        CARL9170FW_HW_COUNTERS,
 
-       /* Radar pattern generator */
-       CARL9170FW_RADAR_PATTERN_GENERATOR,
+       /* Firmware will pass BA when BARs are queued */
+       CARL9170FW_RX_BA_FILTER,
+
+       /* Firmware has support to write a byte at a time  */
+       CARL9170FW_HAS_WREGB_CMD,
+
+       /* Pattern generator */
+       CARL9170FW_PATTERN_GENERATOR,
 
        /* KEEP LAST */
        __CARL9170FW_FEATURE_NUM
@@ -92,7 +98,7 @@ enum carl9170fw_feature_list {
 #define CHK_MAGIC      "CHK\0"
 #define TXSQ_MAGIC     "TXSQ"
 #define WOL_MAGIC      "WOL\0"
-#define RADAR_MAGIC    "RDR\0"
+#define PATTERN_MAGIC  "RDR\0"
 #define LAST_MAGIC     "LAST"
 
 #define CARL9170FW_SET_DAY(d) (((d) - 1) % 31)
@@ -177,24 +183,23 @@ struct carl9170fw_dbg_desc {
 #define CARL9170FW_DBG_DESC_SIZE                       \
        (sizeof(struct carl9170fw_dbg_desc))
 
-#define CARL9170FW_RADAR_MAP_NAME_LEN          15
-struct carl9170fw_radar_map_entry {
+#define CARL9170FW_PATTERN_MAP_NAME_LEN                        15
+struct carl9170fw_pattern_map_entry {
        u8 index;
-       char name[CARL9170FW_RADAR_MAP_NAME_LEN];
+       char name[CARL9170FW_PATTERN_MAP_NAME_LEN];
 } __packed;
 
-#define CARL9170FW_RADAR_DESC_MIN_VER                  1
-#define CARL9170FW_RADAR_DESC_CUR_VER                  1
-struct carl9170fw_radar_desc {
+#define CARL9170FW_PATTERN_DESC_MIN_VER                        1
+#define CARL9170FW_PATTERN_DESC_CUR_VER                        1
+struct carl9170fw_pattern_desc {
        struct carl9170fw_desc_head head;
 
-       __le32 soft_radar;
-       __le32 num_radars;
-       struct carl9170fw_radar_map_entry radars[0];
-       /* Put your debugging definitions here */
+       __le32 soft_pattern;
+       __le32 num_patterns;
+       struct carl9170fw_pattern_map_entry patterns[0];
 } __packed;
-#define CARL9170FW_RADAR_DESC_SIZE                     \
-       (sizeof(struct carl9170fw_radar_desc))
+#define CARL9170FW_PATTERN_DESC_SIZE                   \
+       (sizeof(struct carl9170fw_pattern_desc))
 
 #define CARL9170FW_CHK_DESC_MIN_VER                    1
 #define CARL9170FW_CHK_DESC_CUR_VER                    2