carl9170 firmware: Support multiple CAB queues

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

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index 6c19c32d742ca333d6830216a3a6e9e721f2e10c..6b19303cb15142ff58b1abb517016fb0a8518112 100644 (file)
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -75,6 +75,7 @@ struct firmware_context_struct {
 
        /* misc */
        unsigned int watchdog_enable;
+       unsigned int reboot;
 
        struct {
                /* Host Interface DMA queues */
@@ -102,9 +103,9 @@ struct firmware_context_struct {
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
                /* CAB */
-               struct dma_queue cab_queue;
-               unsigned int cab_queue_len,
-                            cab_flush_time;
+               struct dma_queue cab_queue[CARL9170_INTF_NUM];
+               unsigned int cab_queue_len[CARL9170_INTF_NUM];
+               unsigned int cab_flush_time, cab_flush_vif;
                enum carl9170_cab_trigger cab_flush_trigger;
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
@@ -156,9 +157,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 {