Commit 0a8692b5 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

rtl8192u_usb: Remove built-in firmware images 



These firmware images are already unused.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 31d5bbf3

drivers/staging/rtl8192u/r8192U.h

+0 −6
Original line number Diff line number Diff line
@@ -461,11 +461,6 @@ typedef enum _desc_packet_type_e{ 
	DESC_PACKET_TYPE_NORMAL = 1,

}desc_packet_type_e;



typedef enum _firmware_source{

	FW_SOURCE_IMG_FILE = 0,

	FW_SOURCE_HEADER_FILE = 1,		//from header file

}firmware_source_e, *pfirmware_source_e;



typedef enum _firmware_status{

	FW_STATUS_0_INIT = 0,

	FW_STATUS_1_MOVE_BOOT_CODE = 1,
@@ -1026,7 +1021,6 @@ typedef struct r8192_priv 
	u8 Rf_Mode; //add for Firmware RF -R/W switch

	prt_firmware		pFirmware;

	rtl819xUsb_loopback_e	LoopbackMode;

	firmware_source_e	firmware_source;

	u16 EEPROMTxPowerDiff;

	u8 EEPROMThermalMeter;

	u8 EEPROMPwDiff;

drivers/staging/rtl8192u/r819xU_firmware.c

+25 −51
Original line number Diff line number Diff line
@@ -244,13 +244,6 @@ bool init_firmware(struct net_device *dev) 
	struct r8192_priv 	*priv = ieee80211_priv(dev);

	bool			rt_status = TRUE;



	u8			*firmware_img_buf[3] = { &rtl8190_fwboot_array[0],

							 &rtl8190_fwmain_array[0],

							 &rtl8190_fwdata_array[0]};



	u32			firmware_img_len[3] = { sizeof(rtl8190_fwboot_array),

							sizeof(rtl8190_fwmain_array),

							sizeof(rtl8190_fwdata_array)};

	u32			file_length = 0;

	u8			*mapped_file = NULL;

	u32			init_step = 0;
@@ -284,15 +277,12 @@ bool init_firmware(struct net_device *dev) 
	 * Download boot, main, and data image for System reset.

	 * Download data image for firmware reseta

	 */

	priv->firmware_source = FW_SOURCE_IMG_FILE;

	for(init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) {

		/*

		 * Open Image file, and map file to contineous memory if open file success.

		 * or read image file from array. Default load from IMG file

		 */

		if(rst_opt == OPT_SYSTEM_RESET) {

			switch(priv->firmware_source) {

				case FW_SOURCE_IMG_FILE:

			rc = request_firmware(&fw_entry, fw_name[init_step],&priv->udev->dev);

			if(rc < 0 ) {

				RT_TRACE(COMP_ERR, "request firmware fail!\n");
@@ -321,22 +311,6 @@ bool init_firmware(struct net_device *dev) 
#endif

			}

			pfirmware->firmware_buf_size = file_length;

					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, mapped_file, file_length);

						pfirmware->firmware_buf_size = file_length;

					}

					break;



				default:

					break;

			}





		}else if(rst_opt == OPT_FIRMWARE_RESET ) {

			/* we only need to download data.img here */

			mapped_file = pfirmware->firmware_buf;

drivers/staging/rtl8192u/r819xU_firmware_img.c

+0 −2900

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8192u/r819xU_firmware_img.h

+0 −7
Original line number Diff line number Diff line 
#ifndef IMG_H

#define IMG_H



#define BOOT_ARR_LEN 344

#define MAIN_ARR_LEN 45136

#define DATA_ARR_LEN 796

#define MACPHY_Array_PGLength 30

#define PHY_REG_1T2RArrayLength 296

#define AGCTAB_ArrayLength 384
@@ -16,10 +13,6 @@ 
#define PHY_REGArrayLength 1





extern u8 rtl8190_fwboot_array[BOOT_ARR_LEN];

extern u8 rtl8190_fwmain_array[MAIN_ARR_LEN];

extern u8 rtl8190_fwdata_array[DATA_ARR_LEN];



extern u32 Rtl8192UsbPHY_REGArray[];

extern u32 Rtl8192UsbPHY_REG_1T2RArray[];

extern u32 Rtl8192UsbRadioA_Array[];