Merge branch 'master' into halfandquarter

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

diff --git a/include/shared/fwcmd.h b/include/shared/fwcmd.h
index 9443c802b25b8578f6afd2b2cb66243ab47f34f1..9f06a05b9fa11fc9f46641fb0e9d169b63a4258e 100644 (file)
--- a/include/shared/fwcmd.h
+++ b/include/shared/fwcmd.h
@@ -127,10 +127,15 @@ struct carl9170_write_reg {
 #define        CARL9170FW_PHY_HT_DYN2040               0x8
 #define        CARL9170FW_PHY_HT_EXT_CHAN_OFF          0x3
 #define        CARL9170FW_PHY_HT_EXT_CHAN_OFF_S        2
+#define CARL9170FW_PHY_RF_DIV                  (BIT(4) | BIT(5))
+#define CARL9170FW_PHY_RF_BW_10MHZ             BIT(4)
+#define CARL9170FW_PHY_RF_BW_5MHZ              BIT(5)
+#define CARL9170FW_PHY_RF_DIV_S                        4
+
 
 struct carl9170_rf_init {
        __le32          freq;
-       u8              ht_settings;
+       u8              settings;
        u8              padding2[3];
        __le32          delta_slope_coeff_exp;
        __le32          delta_slope_coeff_man;
@@ -156,6 +161,14 @@ struct carl9170_psm {
 } __packed;
 #define CARL9170_PSM_SIZE              4
 
+/*
+ * Note: If a bit in rx_filter is set, then it
+ * means that the particular frames which matches
+ * the condition are FILTERED/REMOVED/DISCARDED!
+ * (This is can be a bit confusing, especially
+ * because someone people think it's the exact
+ * opposite way, so watch out!)
+ */
 struct carl9170_rx_filter_cmd {
        __le32          rx_filter;
 } __packed;