diff options
author | David Spinadel <david.spinadel@intel.com> | 2012-03-10 13:00:12 -0800 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-12 14:22:06 -0400 |
commit | 0cedacc5797bbae5b07e5e861fbe7b8e33f2ef78 (patch) | |
tree | 46958e660f25227ddef25c2c47da293b3aeb74ba /drivers/net/wireless/iwlwifi/iwl-fw.h | |
parent | b5ea1624833b816184aa262c190f2774b8d2ea63 (diff) | |
download | linux-0cedacc5797bbae5b07e5e861fbe7b8e33f2ef78.tar.gz linux-0cedacc5797bbae5b07e5e861fbe7b8e33f2ef78.tar.bz2 linux-0cedacc5797bbae5b07e5e861fbe7b8e33f2ef78.zip |
iwlwifi: more modularity in fw images and sections
Changed iwl_firmware_pieces structure to support an array of
separate images, and an array of sections for each image.
In fw_sec and fw_desc structures, added a field for
offset from the HW address, to support 16.0 uCode that
provides an offset instead of any other data about the section.
This field is filled with default values when parsing instruction
or data section.
Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-fw.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fw.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h index 453812a21176..253f7e501d46 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw.h @@ -91,11 +91,12 @@ struct iwl_ucode_capabilities { u32 flags; }; -/* one for each uCode image (inst/data, boot/init/runtime) */ +/* one for each uCode image (inst/data, init/runtime/wowlan) */ struct fw_desc { dma_addr_t p_addr; /* hardware address */ void *v_addr; /* software address */ u32 len; /* size in bytes */ + u32 offset; /* offset in the device */ }; struct fw_img { |