carl9170 firmware: toolchain binutils 2.20.51

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index c85a4f31c529ce737e7da8fdefe284ae5196b65e..2b890fbe2343f1bdddc0bc8ceda4d396fdc3da1d 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -100,13 +100,14 @@ struct firmware_context_struct {
                unsigned int rx_total;
                unsigned int rx_overruns;
                unsigned int mac_reset;
+               unsigned int soft_int;
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
                /* CAB */
-               struct dma_queue cab_queue;
-               unsigned int cab_queue_len,
-                            cab_flush_time;
-               enum carl9170_cab_trigger cab_flush_trigger;
+               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 */
@@ -157,9 +158,6 @@ struct firmware_context_struct {
                uint8_t put_buffer[CARL9170_MAX_CMD_PAYLOAD_LEN];
 #endif /* CONFIG_CARL9170FW_DEBUG_USB */
 
-#ifdef CONFIG_CARL9170FW_USB_WATCHDOG
-               struct carl9170_watchdog_cmd watchdog;
-#endif /* CONFIG CARL9170FW_USB_WATCHDOG */
        } usb;
 
        struct {