1
From b1f1970ea2fb1788af17c8841a5bbf8a8c94c412 Mon Sep 17 00:00:00 2001
2
From: Ben Hutchings <ben@decadent.org.uk>
3
Date: Fri, 18 Jun 2010 01:41:56 +0100
4
Subject: [PATCH 2/2] rtl8192u_usb: Remove code for using built-in firmware images
6
This code is already unused and will fail to link since we removed
9
drivers/staging/rtl8192u/r8192U.h | 6 --
10
drivers/staging/rtl8192u/r819xU_firmware.c | 76 ++++++++----------------
11
drivers/staging/rtl8192u/r819xU_firmware_img.h | 7 --
12
3 files changed, 25 insertions(+), 64 deletions(-)
14
diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
15
index 69a2721..e04fe7b 100644
16
--- a/drivers/staging/rtl8192u/r8192U.h
17
+++ b/drivers/staging/rtl8192u/r8192U.h
18
@@ -461,11 +461,6 @@ typedef enum _desc_packet_type_e{
19
DESC_PACKET_TYPE_NORMAL = 1,
22
-typedef enum _firmware_source{
23
- FW_SOURCE_IMG_FILE = 0,
24
- FW_SOURCE_HEADER_FILE = 1, //from header file
25
-}firmware_source_e, *pfirmware_source_e;
27
typedef enum _firmware_status{
29
FW_STATUS_1_MOVE_BOOT_CODE = 1,
30
@@ -1026,7 +1021,6 @@ typedef struct r8192_priv
31
u8 Rf_Mode; //add for Firmware RF -R/W switch
32
prt_firmware pFirmware;
33
rtl819xUsb_loopback_e LoopbackMode;
34
- firmware_source_e firmware_source;
35
u16 EEPROMTxPowerDiff;
36
u8 EEPROMThermalMeter;
38
diff --git a/drivers/staging/rtl8192u/r819xU_firmware.c b/drivers/staging/rtl8192u/r819xU_firmware.c
39
index 3cc2d57..3b14d11 100644
40
--- a/drivers/staging/rtl8192u/r819xU_firmware.c
41
+++ b/drivers/staging/rtl8192u/r819xU_firmware.c
42
@@ -244,13 +244,6 @@ bool init_firmware(struct net_device *dev)
43
struct r8192_priv *priv = ieee80211_priv(dev);
44
bool rt_status = TRUE;
46
- u8 *firmware_img_buf[3] = { &rtl8190_fwboot_array[0],
47
- &rtl8190_fwmain_array[0],
48
- &rtl8190_fwdata_array[0]};
50
- u32 firmware_img_len[3] = { sizeof(rtl8190_fwboot_array),
51
- sizeof(rtl8190_fwmain_array),
52
- sizeof(rtl8190_fwdata_array)};
54
u8 *mapped_file = NULL;
56
@@ -284,59 +277,40 @@ bool init_firmware(struct net_device *dev)
57
* Download boot, main, and data image for System reset.
58
* Download data image for firmware reseta
60
- priv->firmware_source = FW_SOURCE_IMG_FILE;
61
for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) {
63
* Open Image file, and map file to contineous memory if open file success.
64
* or read image file from array. Default load from IMG file
66
if(rst_opt == OPT_SYSTEM_RESET) {
67
- switch(priv->firmware_source) {
68
- case FW_SOURCE_IMG_FILE:
69
- rc = request_firmware(&fw_entry, fw_name[init_step],&priv->udev->dev);
71
- RT_TRACE(COMP_ERR, "request firmware fail!\n");
72
- goto download_firmware_fail;
75
- if(fw_entry->size > sizeof(pfirmware->firmware_buf)) {
76
- RT_TRACE(COMP_ERR, "img file size exceed the container buffer fail!\n");
77
- goto download_firmware_fail;
80
- if(init_step != FW_INIT_STEP1_MAIN) {
81
- memcpy(pfirmware->firmware_buf,fw_entry->data,fw_entry->size);
82
- mapped_file = pfirmware->firmware_buf;
83
- file_length = fw_entry->size;
86
- memcpy(pfirmware->firmware_buf,fw_entry->data,fw_entry->size);
87
- mapped_file = pfirmware->firmware_buf;
88
- file_length = fw_entry->size;
90
- memset(pfirmware->firmware_buf,0,128);
91
- memcpy(&pfirmware->firmware_buf[128],fw_entry->data,fw_entry->size);
92
- mapped_file = pfirmware->firmware_buf;
93
- file_length = fw_entry->size + 128;
96
- pfirmware->firmware_buf_size = file_length;
99
- case FW_SOURCE_HEADER_FILE:
100
- mapped_file = firmware_img_buf[init_step];
101
- file_length = firmware_img_len[init_step];
102
- if(init_step == FW_INIT_STEP2_DATA) {
103
- memcpy(pfirmware->firmware_buf, mapped_file, file_length);
104
- pfirmware->firmware_buf_size = file_length;
110
+ rc = request_firmware(&fw_entry, fw_name[init_step],&priv->udev->dev);
112
+ RT_TRACE(COMP_ERR, "request firmware fail!\n");
113
+ goto download_firmware_fail;
116
+ if(fw_entry->size > sizeof(pfirmware->firmware_buf)) {
117
+ RT_TRACE(COMP_ERR, "img file size exceed the container buffer fail!\n");
118
+ goto download_firmware_fail;
121
+ if(init_step != FW_INIT_STEP1_MAIN) {
122
+ memcpy(pfirmware->firmware_buf,fw_entry->data,fw_entry->size);
123
+ mapped_file = pfirmware->firmware_buf;
124
+ file_length = fw_entry->size;
127
+ memcpy(pfirmware->firmware_buf,fw_entry->data,fw_entry->size);
128
+ mapped_file = pfirmware->firmware_buf;
129
+ file_length = fw_entry->size;
131
+ memset(pfirmware->firmware_buf,0,128);
132
+ memcpy(&pfirmware->firmware_buf[128],fw_entry->data,fw_entry->size);
133
+ mapped_file = pfirmware->firmware_buf;
134
+ file_length = fw_entry->size + 128;
137
+ pfirmware->firmware_buf_size = file_length;
138
}else if(rst_opt == OPT_FIRMWARE_RESET ) {
139
/* we only need to download data.img here */
140
mapped_file = pfirmware->firmware_buf;
141
diff --git a/drivers/staging/rtl8192u/r819xU_firmware_img.h b/drivers/staging/rtl8192u/r819xU_firmware_img.h
142
index d9d9515..18d0a6b 100644
143
--- a/drivers/staging/rtl8192u/r819xU_firmware_img.h
144
+++ b/drivers/staging/rtl8192u/r819xU_firmware_img.h
149
-#define BOOT_ARR_LEN 344
150
-#define MAIN_ARR_LEN 45136
151
-#define DATA_ARR_LEN 796
152
#define MACPHY_Array_PGLength 30
153
#define PHY_REG_1T2RArrayLength 296
154
#define AGCTAB_ArrayLength 384
156
#define PHY_REGArrayLength 1
159
-extern u8 rtl8190_fwboot_array[BOOT_ARR_LEN];
160
-extern u8 rtl8190_fwmain_array[MAIN_ARR_LEN];
161
-extern u8 rtl8190_fwdata_array[DATA_ARR_LEN];
163
extern u32 Rtl8192UsbPHY_REGArray[];
164
extern u32 Rtl8192UsbPHY_REG_1T2RArray[];
165
extern u32 Rtl8192UsbRadioA_Array[];