carl9170 toolchain: update to gcc 6.2.0 and binutils 2.27

[carl9170fw.git] / carlfw / include / carl9170.h

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index cb16415c5adbeed7a0350f99f680ccda3f19b453..d17b8963a4f01a24d7f474310146940e21ca28d3 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __CARL9170FW_CARL9170_H
@@ -41,13 +40,11 @@ struct carl9170_bar_ctx {
        __le16 control;
 };
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
 enum carl9170_cab_trigger {
        CARL9170_CAB_TRIGGER_EMPTY      = 0,
        CARL9170_CAB_TRIGGER_ARMED      = BIT(0),
        CARL9170_CAB_TRIGGER_DEFER      = BIT(1),
 };
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 enum carl9170_ep0_action {
        CARL9170_EP0_NO_ACTION          = 0,
@@ -117,13 +114,11 @@ struct firmware_context_struct {
                /* tx sequence control counters */
                unsigned int sequence[CARL9170_INTF_NUM];
 
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
                /* CAB */
                struct dma_queue cab_queue[CARL9170_INTF_NUM];
                unsigned int cab_queue_len[CARL9170_INTF_NUM];
                unsigned int cab_flush_time;
                enum carl9170_cab_trigger cab_flush_trigger[CARL9170_INTF_NUM];
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
                /* tx status */
                unsigned int tx_status_pending,
@@ -144,6 +139,12 @@ struct firmware_context_struct {
                             queued_ba;
 
                unsigned int queued_bar;
+
+#if defined(CONFIG_CARL9170FW_PATTERN_GENERATOR)
+               unsigned int soft_pattern,
+                            pattern_last,
+                            pattern_index;
+#endif /* CONFIG_CARL9170FW_PATTERN_GENERATOR */
        } wlan;
 
        struct {