Commit 9dec254a authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Rename rtl8188e_EFUSE_GetEfuseDefinition() 



Rename rtl8188e_EFUSE_GetEfuseDefinition() to EFUSE_GetEfuseDefinition()
and remove original EFUSE_GetEfuseDefinition() function,
so that driver can call rtl8188e_EFUSE_GetEfuseDefinition() directly
without going through EFUSE_GetEfuseDefinition().

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fcb24cda

drivers/staging/rtl8188eu/core/rtw_efuse.c

+10 −16
Original line number Diff line number Diff line
@@ -220,12 +220,6 @@ static void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset, 
	Adapter->HalFunc.ReadEFuse(Adapter, efuseType, _offset, _size_byte, pbuf, pseudo);

}



void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, bool pseudo

	)

{

	pAdapter->HalFunc.EFUSEGetEfuseDefinition(pAdapter, efuseType, type, pOut);

}



/*-----------------------------------------------------------------------------

 * Function:	EFUSE_Read1Byte

 *
@@ -250,7 +244,7 @@ u8 EFUSE_Read1Byte(struct adapter *Adapter, u16 Address) 
	u32 k = 0;

	u16 contentLen = 0;



	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen, false);

	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI , TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&contentLen);



	if (Address < contentLen) {	/* E-fuse 512Byte */

		/* Write E-fuse Register address bit0~7 */
@@ -440,8 +434,8 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 write, u16 start_addr, u16 cnts 
	u8 res = _FAIL;

	u8 (*rw8)(struct adapter *, u16, u8*);



	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);



	if (start_addr > real_content_len)

		return _FAIL;
@@ -476,7 +470,7 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 write, u16 start_addr, u16 cnts 
u16 efuse_GetMaxSize(struct adapter *padapter)

{

	u16 max_size;

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, false);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size);

	return max_size;

}

/*  */
@@ -493,7 +487,7 @@ u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 
{

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);



	if ((addr + cnts) > mapLen)

		return _FAIL;
@@ -511,7 +505,7 @@ u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 
{

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);



	if ((addr + cnts) > mapLen)

		return _FAIL;
@@ -534,7 +528,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 
	u8 ret = _SUCCESS;

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);



	if ((addr + cnts) > mapLen)

		return _FAIL;
@@ -626,7 +620,7 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data 
	u8 ret = _SUCCESS;

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, false);

	EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);



	if ((addr + cnts) > mapLen)

		return _FAIL;
@@ -795,7 +789,7 @@ static void Efuse_ReadAllMap(struct adapter *pAdapter, u8 efuseType, u8 *Efuse, 


	Efuse_PowerSwitch(pAdapter, false, true);



	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);

	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);



	efuse_ReadEFuse(pAdapter, efuseType, 0, mapLen, Efuse, pseudo);
@@ -826,7 +820,7 @@ void EFUSE_ShadowMapUpdate( 
	struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);

	u16 mapLen = 0;



	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, pseudo);

	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);



	if (pEEPROM->bautoload_fail_flag)

		_rtw_memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen);

drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c

+3 −3
Original line number Diff line number Diff line
@@ -1099,7 +1099,7 @@ int rtl8188eu_oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv) 
		 ("+rtl8188eu_oid_rt_pro_read_efuse_hd: buf_len=%d addr=%d cnts=%d\n",

		  poid_par_priv->information_buf_len, addr, cnts));



	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);

	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);



	if ((addr + cnts) > max_available_size) {

		RT_TRACE(_module_mp_, _drv_err_, ("!rtl8188eu_oid_rt_pro_read_efuse_hdl: parameter error!\n"));
@@ -1141,7 +1141,7 @@ int rtl8188eu_oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv) 
		 ("+rtl8188eu_oid_rt_pro_write_efuse_hdl: buf_len=%d addr=0x%04x cnts=%d\n",

		  poid_par_priv->information_buf_len, addr, cnts));



	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);

	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size);



	if ((addr + cnts) > max_available_size) {

		RT_TRACE(_module_mp_, _drv_err_, ("!rtl8188eu_oid_rt_pro_write_efuse_hdl: parameter error"));
@@ -1284,7 +1284,7 @@ int rtl8188eu_oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv) 


	RT_TRACE(_module_mp_, _drv_notice_, ("+rtl8188eu_oid_rt_pro_efuse_map_hdl\n"));



	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&maplen, false);

	EFUSE_GetEfuseDefinition(Adapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&maplen);



	*poid_par_priv->bytes_rw = 0;

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+6 −7
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ static void ReadEFuseByIC(struct adapter *Adapter, u8 efuseType, u16 _offset, u1 
}



/* Do not support BT */

static void rtl8188e_EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut)

void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut)

{

	switch (type) {

	case TYPE_EFUSE_MAX_SECTION:
@@ -1131,7 +1131,7 @@ static int hal_EfusePgPacketRead_8188e(struct adapter *pAdapter, u8 offset, u8 * 
	u8 max_section = 0;

	u8 tmp_header = 0;



	EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (void *)&max_section, bPseudoTest);

	EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAX_SECTION, (void *)&max_section);



	if (data == NULL)

		return false;
@@ -1240,7 +1240,7 @@ static bool hal_EfusePgPacketWrite2ByteHeader(struct adapter *pAdapter, u8 efuse 
	u8 pg_header = 0, tmp_header = 0, pg_header_temp = 0;

	u8 repeatcnt = 0;



	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len, bPseudoTest);

	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len);



	while (efuse_addr < efuse_max_available_len) {

		pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F;
@@ -1420,8 +1420,8 @@ static bool hal_EfusePartialWriteCheck(struct adapter *pAdapter, u8 efuseType, u 
	u16	startAddr = 0, efuse_max_available_len = 0, efuse_max = 0;

	struct pgpkt curPkt;



	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len, bPseudoTest);

	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&efuse_max, bPseudoTest);

	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, (void *)&efuse_max_available_len);

	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&efuse_max);



	if (efuseType == EFUSE_WIFI) {

		if (bPseudoTest) {
@@ -1509,7 +1509,7 @@ hal_EfusePgCheckAvailableAddr( 
	u16	efuse_max_available_len = 0;



	/* Change to check TYPE_EFUSE_MAP_LEN , because 8188E raw 256, logic map over 256. */

	EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&efuse_max_available_len, false);

	EFUSE_GetEfuseDefinition(pAdapter, EFUSE_WIFI, TYPE_EFUSE_MAP_LEN, (void *)&efuse_max_available_len);



	if (Efuse_GetCurrentSize(pAdapter, bPseudoTest) >= efuse_max_available_len)

		return false;
@@ -1673,7 +1673,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	/*  Efuse related function */

	pHalFunc->EfusePowerSwitch = &rtl8188e_EfusePowerSwitch;

	pHalFunc->ReadEFuse = &ReadEFuseByIC;

	pHalFunc->EFUSEGetEfuseDefinition = &rtl8188e_EFUSE_GetEfuseDefinition;

	pHalFunc->EfuseGetCurrentSize = &hal_EfuseGetCurrentSize_8188e;

	pHalFunc->Efuse_PgPacketRead = &hal_EfusePgPacketRead_8188e;

	pHalFunc->Efuse_PgPacketWrite = &hal_EfusePgPacketWrite_8188e;

drivers/staging/rtl8188eu/include/hal_intf.h

+0 −2
Original line number Diff line number Diff line
@@ -237,8 +237,6 @@ struct hal_ops { 
				 u8 PwrState);

	void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset,

			  u16 _size_byte, u8 *pbuf, bool bPseudoTest);

	void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType,

					u8 type, void *pOut);

	u16	(*EfuseGetCurrentSize)(struct adapter *padapter,

				       bool bPseudoTest);

	int	(*Efuse_PgPacketRead)(struct adapter *adapter, u8 offset,

drivers/staging/rtl8188eu/include/rtw_efuse.h

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ u16 Efuse_GetCurrentSize(struct adapter *adapter, bool test); 
u8 Efuse_CalculateWordCnts(u8 word_en);

void ReadEFuseByte(struct adapter *adapter, u16 _offset, u8 *pbuf, bool test);

void EFUSE_GetEfuseDefinition(struct adapter *adapt, u8 type, u8 type1,

			      void *out, bool bPseudoTest);

			      void *out);

u8 efuse_OneByteRead(struct adapter *adapter, u16 addr, u8 *data, bool test);

u8 efuse_OneByteWrite(struct adapter *adapter, u16 addr, u8 data, bool	test);