These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8192e / rtl8192e / r8192E_firmware.h

diff --git a/kernel/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h b/kernel/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
index 94fa16b..b48ec94 100644 (file)
--- a/kernel/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
+++ b/kernel/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
@@ -6,10 +6,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the 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, USA
- *
  * The full GNU General Public License is included in this distribution in the
  * file called LICENSE.
  *
@@ -19,10 +15,6 @@
 #ifndef __INC_FIRMWARE_H
 #define __INC_FIRMWARE_H
 
-#define RTL8190_CPU_START_OFFSET       0x80
-
-#define GET_COMMAND_PACKET_FRAG_THRESHOLD(v)   (4*(v/4) - 8)
-
 #define RTL8192E_BOOT_IMG_FW   "RTL8192E/boot.img"
 #define RTL8192E_MAIN_IMG_FW   "RTL8192E/main.img"
 #define RTL8192E_DATA_IMG_FW   "RTL8192E/data.img"
@@ -52,21 +44,17 @@ enum firmware_status {
        FW_STATUS_5_READY = 5,
 };
 
-struct fw_seg_container {
-       u16     seg_size;
-       u8      *seg_ptr;
+#define MAX_FW_SIZE 64000
+struct rt_fw_blob {
+       u16 size;
+       u8 data[MAX_FW_SIZE];
 };
 
+#define FW_BLOBS 3
 struct rt_firmware {
-       enum firmware_status firmware_status;
-       u16               cmdpacket_frag_thresold;
-#define RTL8190_MAX_FIRMWARE_CODE_SIZE 64000
-#define MAX_FW_INIT_STEP               3
-       u8 firmware_buf[MAX_FW_INIT_STEP][RTL8190_MAX_FIRMWARE_CODE_SIZE];
-       u16               firmware_buf_size[MAX_FW_INIT_STEP];
+       enum firmware_status status;
+       struct rt_fw_blob blobs[FW_BLOBS];
 };
 
-bool init_firmware(struct net_device *dev);
-extern void firmware_init_param(struct net_device *dev);
-
+bool rtl92e_init_fw(struct net_device *dev);
 #endif