Merge branch 'master' into radar

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

diff --git a/include/shared/fwdesc.h b/include/shared/fwdesc.h
index 66848d47c88e993c2c04d328699e94249c5bad61..f73373eca25cc42b4d68035a394240f959d2b489 100644 (file)
--- a/include/shared/fwdesc.h
+++ b/include/shared/fwdesc.h
@@ -78,6 +78,9 @@ 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,
 
@@ -92,6 +95,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 LAST_MAGIC     "LAST"
 
 #define CARL9170FW_SET_DAY(d) (((d) - 1) % 31)
@@ -176,6 +180,25 @@ 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 {
+       u8 index;
+       char name[CARL9170FW_RADAR_MAP_NAME_LEN];
+} __packed;
+
+#define CARL9170FW_RADAR_DESC_MIN_VER                  1
+#define CARL9170FW_RADAR_DESC_CUR_VER                  1
+struct carl9170fw_radar_desc {
+       struct carl9170fw_desc_head head;
+
+       __le32 soft_radar;
+       __le32 num_radars;
+       struct carl9170fw_radar_map_entry radars[0];
+       /* Put your debugging definitions here */
+} __packed;
+#define CARL9170FW_RADAR_DESC_SIZE                     \
+       (sizeof(struct carl9170fw_radar_desc))
+
 #define CARL9170FW_CHK_DESC_MIN_VER                    1
 #define CARL9170FW_CHK_DESC_CUR_VER                    2
 struct carl9170fw_chk_desc {