hazza/rtl8189ES_linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace file_path with rtw_file_path

Browse Source 
file_path is a too generic name for a global variable.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Jean-Francois Moine
2016-03-18 12:04:22 +01:00
committed by Hans de Goede
parent e6ee1ad72c
commit 0967b53ca2
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/hal_btcoex.c
View File

@@ -3397,11 +3397,11 @@ hal_btcoex_AntIsolationConfig_ParaFile(
_rtw_memset(pHalData->para_file_buf , 0 , MAX_PARA_FILE_BUF_LEN); _rtw_memset(pHalData->para_file_buf , 0 , MAX_PARA_FILE_BUF_LEN);
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(rtw_file_path) == _TRUE)
{ {
rlen = rtw_retrieve_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrieve_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;

2
hal/hal_com.c
View File

@@ -27,7 +27,7 @@
//#define CONFIG_GTK_OL_DBG //#define CONFIG_GTK_OL_DBG
#ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE #ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE
char file_path[PATH_LENGTH_MAX]; char rtw_file_path[PATH_LENGTH_MAX];
#endif #endif
void dump_chip_info(HAL_VERSION ChipVersion) void dump_chip_info(HAL_VERSION ChipVersion)

42
hal/hal_com_phycfg.c
View File

@@ -2620,11 +2620,11 @@ phy_ConfigMACWithParaFile(
if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL)) if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(rtw_file_path) == _TRUE)
{ {
rlen = rtw_retrieve_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrieve_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@@ -2719,11 +2719,11 @@ phy_ConfigBBWithParaFile(
if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(rtw_file_path) == _TRUE)
{ {
rlen = rtw_retrieve_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrieve_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@@ -3172,11 +3172,11 @@ phy_ConfigBBWithPgParaFile(
if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL)) if ((pHalData->bb_phy_reg_pg_len == 0) && (pHalData->bb_phy_reg_pg == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(rtw_file_path) == _TRUE)
{ {
rlen = rtw_retrieve_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrieve_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@@ -3235,11 +3235,11 @@ phy_ConfigBBWithMpParaFile(
if ((pHalData->bb_phy_reg_mp_len == 0) && (pHalData->bb_phy_reg_mp == NULL)) if ((pHalData->bb_phy_reg_mp_len == 0) && (pHalData->bb_phy_reg_mp == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(rtw_file_path) == _TRUE)
{ {
rlen = rtw_retrieve_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrieve_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@@ -3371,11 +3371,11 @@ PHY_ConfigRFWithParaFile(
if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(rtw_file_path) == _TRUE)
{ {
rlen = rtw_retrieve_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrieve_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@@ -3649,11 +3649,11 @@ PHY_ConfigRFWithTxPwrTrackParaFile(
if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL)) if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(rtw_file_path) == _TRUE)
{ {
rlen = rtw_retrieve_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrieve_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
@@ -4019,11 +4019,11 @@ PHY_ConfigRFWithPowerLimitTableParaFile(
if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL)) if ((pHalData->rf_tx_pwr_lmt_len == 0) && (pHalData->rf_tx_pwr_lmt == NULL))
{ {
rtw_merge_string(file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName); rtw_merge_string(rtw_file_path, PATH_LENGTH_MAX, rtw_phy_file_path, pFileName);
if (rtw_is_file_readable(file_path) == _TRUE) if (rtw_is_file_readable(rtw_file_path) == _TRUE)
{ {
rlen = rtw_retrieve_from_file(file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN); rlen = rtw_retrieve_from_file(rtw_file_path, pHalData->para_file_buf, MAX_PARA_FILE_BUF_LEN);
if (rlen > 0) if (rlen > 0)
{ {
rtStatus = _SUCCESS; rtStatus = _SUCCESS;

2
include/hal_com.h
View File

@@ -452,7 +452,7 @@ static inline u32 rtw_phydm_ability_get(_adapter *adapter)
#ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE #ifdef CONFIG_LOAD_PHY_PARA_FROM_FILE
extern char *rtw_phy_file_path; extern char *rtw_phy_file_path;
extern char file_path[PATH_LENGTH_MAX]; extern char rtw_file_path[PATH_LENGTH_MAX];
#define GetLineFromBuffer(buffer) strsep(&buffer, "\n") #define GetLineFromBuffer(buffer) strsep(&buffer, "\n")
#endif #endif