Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bf30d96 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: rtl8192e: remove another firmware header file not being used 



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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8bfd185b

drivers/staging/rtl8192e/r819xE_firmware.c

+14 −19
Original line number Diff line number Diff line
@@ -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);
@@ -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;
@@ -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;

			}

drivers/staging/rtl8192e/r819xE_firmware.h

deleted100644 → 0
+0 −68
Original line number Diff line number Diff line 
#ifndef __INC_FIRMWARE_H

#define __INC_FIRMWARE_H



#define RTL8190_CPU_START_OFFSET	0x80

/* TODO: this definition is TBD */

//#define USB_HWDESC_HEADER_LEN	0



/* It should be double word alignment */

//#if DEV_BUS_TYPE==PCI_INTERFACE

//#define GET_COMMAND_PACKET_FRAG_THRESHOLD(v)	4*(v/4) - 8

//#else

#define GET_COMMAND_PACKET_FRAG_THRESHOLD(v)	(4*(v/4) - 8 )

//#endif



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;



#if 0

/* CPU related */

RT_STATUS

CPUCheckMainCodeOKAndTurnOnCPU(

	IN	PADAPTER			Adapter

	);



RT_STATUS

CPUCheckFirmwareReady(

	IN	PADAPTER			Adapter

	);



/* Firmware related */

VOID

FWInitializeParameters(

	IN	PADAPTER		Adapter

	);



RT_STATUS

FWSendDownloadCode(

	IN	PADAPTER		Adapter,

	IN	pu1Byte			CodeVirtualAddrress,

	IN	u4Byte			BufferLen

	);



RT_STATUS

FWSendNullPacket(

	IN	PADAPTER		Adapter,

	IN	u4Byte			Length

	);



RT_STATUS

CmdSendPacket(

	PADAPTER				Adapter,

	PRT_TCB					pTcb,

	PRT_TX_LOCAL_BUFFER 	pBuf,

	u4Byte					BufferLen,

	u4Byte					PacketType,

	BOOLEAN					bLastInitPacket

	);

#endif

#endif

drivers/staging/rtl8192e/r819xE_firmware_img.h

deleted100644 → 0
+0 −2778

File deleted.

Preview size limit exceeded, changes collapsed.