Skip to content

Commit

Permalink
Staging: rtl8192e: remove another firmware header file not being used
Browse files Browse the repository at this point in the history
The built-in firmware images are never used, the firmware files
are downloaded to the device through the standard firmware interface.

This removes the firmware header file as it's not ever used.
It also removes a .h file as it is not needed.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent 8bfd185 commit 5bf30d9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2,865 deletions.
33 changes: 14 additions & 19 deletions drivers/staging/rtl8192e/r819xE_firmware.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,22 @@
//#include "ieee80211.h"
#include "r8192E.h"
#include "r8192E_hw.h"
//#include "r819xE_firmware_img.h"
#include "r819xE_firmware.h"
#include <linux/firmware.h>

/* It should be double word alignment */
#define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4*(v/4) - 8 )

typedef enum _firmware_init_step{
FW_INIT_STEP0_BOOT = 0,
FW_INIT_STEP1_MAIN = 1,
FW_INIT_STEP2_DATA = 2,
}firmware_init_step_e;

typedef enum _opt_rst_type{
OPT_SYSTEM_RESET = 0,
OPT_FIRMWARE_RESET = 1,
}opt_rst_type_e;

void firmware_init_param(struct net_device *dev)
{
struct r8192_priv *priv = ieee80211_priv(dev);
Expand Down Expand Up @@ -190,14 +202,6 @@ bool init_firmware(struct net_device *dev)
{
struct r8192_priv *priv = ieee80211_priv(dev);
bool rt_status = TRUE;

u8 *firmware_img_buf[3] = { &rtl8192e_fwboot_array[0],
&rtl8192e_fwmain_array[0],
&rtl8192e_fwdata_array[0]};

u32 firmware_img_len[3] = { sizeof(rtl8192e_fwboot_array),
sizeof(rtl8192e_fwmain_array),
sizeof(rtl8192e_fwdata_array)};
u32 file_length = 0;
u8 *mapped_file = NULL;
u32 init_step = 0;
Expand Down Expand Up @@ -274,15 +278,6 @@ bool init_firmware(struct net_device *dev)
file_length = pfirmware->firmware_buf_size[init_step];
break;
}
case FW_SOURCE_HEADER_FILE:
mapped_file = firmware_img_buf[init_step];
file_length = firmware_img_len[init_step];
if(init_step == FW_INIT_STEP2_DATA) {
memcpy(pfirmware->firmware_buf[init_step], mapped_file, file_length);
pfirmware->firmware_buf_size[init_step] = file_length;
}
break;

default:
break;
}
Expand Down
68 changes: 0 additions & 68 deletions drivers/staging/rtl8192e/r819xE_firmware.h

This file was deleted.

Loading

0 comments on commit 5bf30d9

Please sign in to comment.