Commit c531c785 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: move struct rt_firmware_hdr to rtw_fw.h 



The structure rt_firmware_hdr is firmware related. Move it to the
rtw_fw.h header.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220202075051.21266-1-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ef976e0

drivers/staging/r8188eu/include/rtl8188e_hal.h

+0 −35
Original line number Diff line number Diff line
@@ -34,41 +34,6 @@ 
#define DRVINFO_SZ	4 /*  unit is 8bytes */

#define PageNum_128(_Len)	(u32)(((_Len)>>7) + ((_Len) & 0x7F ? 1 : 0))



/*  This structure must be careful with byte-ordering */



struct rt_firmware_hdr {

	/*  8-byte alinment required */

	/*  LONG WORD 0 ---- */

	__le16		Signature;	/* 92C0: test chip; 92C,

					 * 88C0: test chip; 88C1: MP A-cut;

					 * 92C1: MP A-cut */

	u8		Category;	/*  AP/NIC and USB/PCI */

	u8		Function;	/*  Reserved for different FW function

					 *  indcation, for further use when

					 *  driver needs to download different

					 *  FW for different conditions */

	__le16		Version;	/*  FW Version */

	u8		Subversion;	/*  FW Subversion, default 0x00 */

	u16		Rsvd1;



	/*  LONG WORD 1 ---- */

	u8		Month;	/*  Release time Month field */

	u8		Date;	/*  Release time Date field */

	u8		Hour;	/*  Release time Hour field */

	u8		Minute;	/*  Release time Minute field */

	__le16		RamCodeSize;	/*  The size of RAM code */

	u8		Foundry;

	u8		Rsvd2;



	/*  LONG WORD 2 ---- */

	__le32		SvnIdx;	/*  The SVN entry index */

	u32		Rsvd3;



	/*  LONG WORD 3 ---- */

	u32		Rsvd4;

	u32		Rsvd5;

};



#define DRIVER_EARLY_INT_TIME		0x05

#define BCN_DMA_ATIME_INT_TIME		0x02

drivers/staging/r8188eu/include/rtw_fw.h

+35 −0
Original line number Diff line number Diff line
@@ -16,6 +16,41 @@ 
	(le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x2300 ||	\

	(le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x88E0)



/*  This structure must be careful with byte-ordering */



struct rt_firmware_hdr {

	/*  8-byte alinment required */

	/*  LONG WORD 0 ---- */

	__le16		Signature;	/* 92C0: test chip; 92C,

					 * 88C0: test chip; 88C1: MP A-cut;

					 * 92C1: MP A-cut */

	u8		Category;	/*  AP/NIC and USB/PCI */

	u8		Function;	/*  Reserved for different FW function

					 *  indcation, for further use when

					 *  driver needs to download different

					 *  FW for different conditions */

	__le16		Version;	/*  FW Version */

	u8		Subversion;	/*  FW Subversion, default 0x00 */

	u16		Rsvd1;



	/*  LONG WORD 1 ---- */

	u8		Month;	/*  Release time Month field */

	u8		Date;	/*  Release time Date field */

	u8		Hour;	/*  Release time Hour field */

	u8		Minute;	/*  Release time Minute field */

	__le16		RamCodeSize;	/*  The size of RAM code */

	u8		Foundry;

	u8		Rsvd2;



	/*  LONG WORD 2 ---- */

	__le32		SvnIdx;	/*  The SVN entry index */

	u32		Rsvd3;



	/*  LONG WORD 3 ---- */

	u32		Rsvd4;

	u32		Rsvd5;

};



int rtl8188e_firmware_download(struct adapter *padapter);

void rtw_reset_8051(struct adapter *padapter);