iwlwifi: Move ucode pointers to iwl_fw

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / iwl-ucode.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.h b/drivers/net/wireless/iwlwifi/iwl-ucode.h
index 18c77e9bb9b06298f93f2390f4d6fc936d13f56d..5e4b88e05c62c959387f133e57e9fe33753bf2aa 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.h
@@ -63,8 +63,6 @@
 #ifndef __iwl_ucode_h__
 #define __iwl_ucode_h__
 
-#include "iwl-trans.h"
-
 #include <linux/netdevice.h>
 
 /* v1/v2 uCode file layout */
@@ -181,6 +179,18 @@ struct iwl_ucode_capabilities {
        u32 flags;
 };
 
+/* one for each uCode image (inst/data, boot/init/runtime) */
+struct fw_desc {
+       dma_addr_t p_addr;      /* hardware address */
+       void *v_addr;           /* software address */
+       u32 len;                /* size in bytes */
+};
+
+struct fw_img {
+       struct fw_desc code;    /* firmware code image */
+       struct fw_desc data;    /* firmware data image */
+};
+
 /**
  * struct iwl_fw - variables associated with the firmware
  *