Staging: rtl8192su: Remove Firmware from r8192SU_HWImg.c (2f225608) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/staging/rtl8192su/r8192SU_HWImg.c

+0 −4276

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8192su/r8192SU_HWImg.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,8 +5,6 @@

	/Created on 2009/ 3/ 6, 5:29/		/Created on 2009/ 3/ 6, 5:29/

	#define ImgArrayLength 68368
	extern u8 Rtl8192SUFwImgArray[ImgArrayLength];
	#define MainArrayLength 1		#define MainArrayLength 1
	extern u8 Rtl8192SUFwMainArray[MainArrayLength];		extern u8 Rtl8192SUFwMainArray[MainArrayLength];
	#define DataArrayLength 1		#define DataArrayLength 1

drivers/staging/rtl8192su/r8192S_firmware.c

+33 −92

Original line number	Original line	Diff line number	Diff line
	@@ -360,26 +360,18 @@ bool FirmwareDownload92S(struct net_device *dev)

	RT_TRACE(COMP_FIRMWARE, " --->FirmwareDownload92S()\n");		RT_TRACE(COMP_FIRMWARE, " --->FirmwareDownload92S()\n");

	//3//		/*
	//3 //<1> Open Image file, and map file to contineous memory if open file success.		* Load the firmware from RTL8192SU/rtl8192sfw.bin
	//3 // or read image file from array. Default load from BIN file		*/
	//3//
	priv->firmware_source = FW_SOURCE_IMG_FILE;// We should decided by Reg.

	switch( priv->firmware_source )
	{
	case FW_SOURCE_IMG_FILE:
	if(pFirmware->szFwTmpBufferLen == 0)		if(pFirmware->szFwTmpBufferLen == 0)
	{		{
			rc = request_firmware(&fw_entry, pFwImageFileName[ulInitStep],&priv->udev->dev);
	rc = request_firmware(&fw_entry, pFwImageFileName[ulInitStep],&priv->udev->dev);//===>1
	if(rc < 0 ) {		if(rc < 0 ) {
	RT_TRACE(COMP_ERR, "request firmware fail!\n");		RT_TRACE(COMP_ERR, "request firmware fail!\n");
	goto DownloadFirmware_Fail;		goto DownloadFirmware_Fail;
	}		}

	if(fw_entry->size > sizeof(pFirmware->szFwTmpBuffer))		if(fw_entry->size > sizeof(pFirmware->szFwTmpBuffer)) {
	{
	RT_TRACE(COMP_ERR, "img file size exceed the container buffer fail!\n");		RT_TRACE(COMP_ERR, "img file size exceed the container buffer fail!\n");
	release_firmware(fw_entry);		release_firmware(fw_entry);
	goto DownloadFirmware_Fail;		goto DownloadFirmware_Fail;
	@@ -392,85 +384,34 @@ bool FirmwareDownload92S(struct net_device *dev)
	pucMappedFile = pFirmware->szFwTmpBuffer;		pucMappedFile = pFirmware->szFwTmpBuffer;
	file_length = pFirmware->szFwTmpBufferLen;		file_length = pFirmware->szFwTmpBufferLen;

	//Retrieve FW header.		/* Retrieve FW header. */
	pFirmware->pFwHeader = (PRT_8192S_FIRMWARE_HDR) pucMappedFile;		pFirmware->pFwHeader = (PRT_8192S_FIRMWARE_HDR) pucMappedFile;
	pFwHdr = pFirmware->pFwHeader;		pFwHdr = pFirmware->pFwHeader;
	RT_TRACE(COMP_FIRMWARE,"signature:%x, version:%x, size:%x, imemsize:%x, sram size:%x\n", \		RT_TRACE(COMP_FIRMWARE,"signature:%x, version:%x, size:%x, imemsize:%x, sram size:%x\n", \
	pFwHdr->Signature, pFwHdr->Version, pFwHdr->DMEMSize, \		pFwHdr->Signature, pFwHdr->Version, pFwHdr->DMEMSize, \
	pFwHdr->IMG_IMEM_SIZE, pFwHdr->IMG_SRAM_SIZE);		pFwHdr->IMG_IMEM_SIZE, pFwHdr->IMG_SRAM_SIZE);
	pFirmware->FirmwareVersion = byte(pFwHdr->Version ,0);		pFirmware->FirmwareVersion = byte(pFwHdr->Version ,0);
	if ((pFwHdr->IMG_IMEM_SIZE==0) \|\| (pFwHdr->IMG_IMEM_SIZE > sizeof(pFirmware->FwIMEM)))		if ((pFwHdr->IMG_IMEM_SIZE==0) \|\| (pFwHdr->IMG_IMEM_SIZE > sizeof(pFirmware->FwIMEM))) {
	{
	RT_TRACE(COMP_ERR, "%s: memory for data image is less than IMEM required\n",\		RT_TRACE(COMP_ERR, "%s: memory for data image is less than IMEM required\n",\
	__FUNCTION__);		__FUNCTION__);
	goto DownloadFirmware_Fail;		goto DownloadFirmware_Fail;
	} else {		} else {
	pucMappedFile+=FwHdrSize;		pucMappedFile+=FwHdrSize;
			/* Retrieve IMEM image. */
	//Retrieve IMEM image.
	memcpy(pFirmware->FwIMEM, pucMappedFile, pFwHdr->IMG_IMEM_SIZE);		memcpy(pFirmware->FwIMEM, pucMappedFile, pFwHdr->IMG_IMEM_SIZE);
	pFirmware->FwIMEMLen = pFwHdr->IMG_IMEM_SIZE;		pFirmware->FwIMEMLen = pFwHdr->IMG_IMEM_SIZE;
	}		}

	if (pFwHdr->IMG_SRAM_SIZE > sizeof(pFirmware->FwEMEM))		if (pFwHdr->IMG_SRAM_SIZE > sizeof(pFirmware->FwEMEM)) {
	{
	RT_TRACE(COMP_ERR, "%s: memory for data image is less than EMEM required\n",\		RT_TRACE(COMP_ERR, "%s: memory for data image is less than EMEM required\n",\
	__FUNCTION__);		__FUNCTION__);
	goto DownloadFirmware_Fail;		goto DownloadFirmware_Fail;
	} else {		} else {
	pucMappedFile += pFirmware->FwIMEMLen;		pucMappedFile += pFirmware->FwIMEMLen;

	/* Retriecve EMEM image */		/* Retriecve EMEM image */
	memcpy(pFirmware->FwEMEM, pucMappedFile, pFwHdr->IMG_SRAM_SIZE);//===>6		memcpy(pFirmware->FwEMEM, pucMappedFile, pFwHdr->IMG_SRAM_SIZE);//===>6
	pFirmware->FwEMEMLen = pFwHdr->IMG_SRAM_SIZE;		pFirmware->FwEMEMLen = pFwHdr->IMG_SRAM_SIZE;
	}		}


	}
	break;

	case FW_SOURCE_HEADER_FILE:
	#if 1
	#define Rtl819XFwImageArray Rtl8192SUFwImgArray
	//2008.11.10 Add by tynli.
	pucMappedFile = Rtl819XFwImageArray;
	ulFileLength = ImgArrayLength;

	RT_TRACE(COMP_INIT,"Fw download from header.\n");
	/* Retrieve FW header*/
	pFirmware->pFwHeader = (PRT_8192S_FIRMWARE_HDR) pucMappedFile;
	pFwHdr = pFirmware->pFwHeader;
	RT_TRACE(COMP_FIRMWARE,"signature:%x, version:%x, size:%x, imemsize:%x, sram size:%x\n", \
	pFwHdr->Signature, pFwHdr->Version, pFwHdr->DMEMSize, \
	pFwHdr->IMG_IMEM_SIZE, pFwHdr->IMG_SRAM_SIZE);
	pFirmware->FirmwareVersion = byte(pFwHdr->Version ,0);

	if ((pFwHdr->IMG_IMEM_SIZE==0) \|\| (pFwHdr->IMG_IMEM_SIZE > sizeof(pFirmware->FwIMEM)))
	{
	printk("FirmwareDownload92S(): memory for data image is less than IMEM required\n");
	goto DownloadFirmware_Fail;
	} else {
	pucMappedFile+=FwHdrSize;
	//Retrieve IMEM image.
	memcpy(pFirmware->FwIMEM, pucMappedFile, pFwHdr->IMG_IMEM_SIZE);
	pFirmware->FwIMEMLen = pFwHdr->IMG_IMEM_SIZE;
	}

	if (pFwHdr->IMG_SRAM_SIZE > sizeof(pFirmware->FwEMEM))
	{
	printk(" FirmwareDownload92S(): memory for data image is less than EMEM required\n");
	goto DownloadFirmware_Fail;
	} else {
	pucMappedFile+= pFirmware->FwIMEMLen;

	//Retriecve EMEM image.
	memcpy(pFirmware->FwEMEM, pucMappedFile, pFwHdr->IMG_SRAM_SIZE);
	pFirmware->FwEMEMLen = pFwHdr->IMG_SRAM_SIZE;
	}
	#endif
	break;
	default:
	break;
	}		}

	FwStatus = FirmwareGetNextStatus(pFirmware->FWStatus);		FwStatus = FirmwareGetNextStatus(pFirmware->FWStatus);

drivers/staging/rtl8192su/r8192S_firmware.h

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -59,12 +59,6 @@ typedef enum _desc_packet_type_e{
	DESC_PACKET_TYPE_NORMAL = 1,		DESC_PACKET_TYPE_NORMAL = 1,
	}desc_packet_type_e;		}desc_packet_type_e;

	typedef enum _firmware_source{
	FW_SOURCE_IMG_FILE = 0,
	FW_SOURCE_HEADER_FILE = 1,
	}firmware_source_e, *pfirmware_source_e;


	typedef enum _opt_rst_type{		typedef enum _opt_rst_type{
	OPT_SYSTEM_RESET = 0,		OPT_SYSTEM_RESET = 0,
	OPT_FIRMWARE_RESET = 1,		OPT_FIRMWARE_RESET = 1,
	@@ -185,7 +179,6 @@ typedef enum _FIRMWARE_8192S_STATUS{
	#define RTL8190_MAX_FIRMWARE_CODE_SIZE 64000 //64k		#define RTL8190_MAX_FIRMWARE_CODE_SIZE 64000 //64k

	typedef struct _rt_firmware{		typedef struct _rt_firmware{
	firmware_source_e eFWSource;
	PRT_8192S_FIRMWARE_HDR pFwHeader;		PRT_8192S_FIRMWARE_HDR pFwHeader;
	FIRMWARE_8192S_STATUS FWStatus;		FIRMWARE_8192S_STATUS FWStatus;
	u16 FirmwareVersion;		u16 FirmwareVersion;

drivers/staging/rtl8192su/r8192U.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1258,7 +1258,6 @@ typedef struct r8192_priv
	u8 Rf_Mode; //add for Firmware RF -R/W switch		u8 Rf_Mode; //add for Firmware RF -R/W switch
	prt_firmware pFirmware;		prt_firmware pFirmware;
	rtl819xUsb_loopback_e LoopbackMode;		rtl819xUsb_loopback_e LoopbackMode;
	firmware_source_e firmware_source;
	bool usb_error;		bool usb_error;

	u16 EEPROMTxPowerDiff;		u16 EEPROMTxPowerDiff;