rtl8188eu: Fix checkfile errors in hal/HalHWImg8188E_RF.c

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-08-04 17:34:48 -05:00
parent 4e6e85f466
commit e0542cf999

View file

@ -157,7 +157,9 @@ static u4Byte Array_RadioA_1T_8188E[] = {
enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm) enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct *pDM_Odm)
{ {
#define READ_NEXT_PAIR(v1, v2, i) do { i += 2; v1 = Array[i]; v2 = Array[i+1]; } while (0) #define READ_NEXT_PAIR(v1, v2, i) do \
{ i += 2; v1 = Array[i]; \
v2 = Array[i+1]; } while (0)
u4Byte hex = 0; u4Byte hex = 0;
u4Byte i = 0; u4Byte i = 0;
@ -181,105 +183,74 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm
biol = rtw_IOL_applied(Adapter); biol = rtw_IOL_applied(Adapter);
if (biol) { if (biol) {
if ((pxmit_frame=rtw_IOL_accquire_xmit_frame(Adapter)) == NULL) pxmit_frame = rtw_IOL_accquire_xmit_frame(Adapter);
{ if (pxmit_frame== NULL) {
printk("rtw_IOL_accquire_xmit_frame failed\n"); pr_info("rtw_IOL_accquire_xmit_frame failed\n");
return HAL_STATUS_FAILURE; return HAL_STATUS_FAILURE;
} }
} }
for (i = 0; i < ArrayLen; i += 2 ) for (i = 0; i < ArrayLen; i += 2) {
{
u4Byte v1 = Array[i]; u4Byte v1 = Array[i];
u4Byte v2 = Array[i+1]; u4Byte v2 = Array[i+1];
/* This (offset, data) pair meets the condition. */ /* This (offset, data) pair meets the condition. */
if ( v1 < 0xCDCDCDCD ) if (v1 < 0xCDCDCDCD) {
{
if (biol) { if (biol) {
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
if (v1 == 0xffe) if (v1 == 0xffe)
{
rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 50); rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 50);
} else if (v1 == 0xfd)
else if (v1 == 0xfd){
rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 5); rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 5);
} else if (v1 == 0xfc)
else if (v1 == 0xfc){
rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 1); rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 1);
} else if (v1 == 0xfb)
else if (v1 == 0xfb){
rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 50); rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 50);
} else if (v1 == 0xfa)
else if (v1 == 0xfa){
rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 5); rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 5);
} else if (v1 == 0xf9)
else if (v1 == 0xf9){
rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1); rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1);
}
else{
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u2Byte)v1, v2,bRFRegOffsetMask) ;
}
}
else else
{ rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A, (u2Byte)v1, v2, bRFRegOffsetMask);
} else {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
} }
continue; continue;
} } else { /* This line is the start line of branch. */
else if (!CheckCondition(Array[i], hex)) {
{ /* This line is the start line of branch. */ /* Discard the following (offset, data) pairs. */
if ( !CheckCondition(Array[i], hex) )
{ /* Discard the following (offset, data) pairs. */
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
while (v2 != 0xDEAD && while (v2 != 0xDEAD &&
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen - 2) v2 != 0xCDCD && i < ArrayLen - 2)
{
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
}
i -= 2; /* prevent from for-loop += 2 */ i -= 2; /* prevent from for-loop += 2 */
} } else { /* Configure matched pairs and skip to end of if-else. */
else /* Configure matched pairs and skip to end of if-else. */
{
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
while (v2 != 0xDEAD && while (v2 != 0xDEAD &&
v2 != 0xCDEF && v2 != 0xCDEF &&
v2 != 0xCDCD && i < ArrayLen -2) v2 != 0xCDCD && i < ArrayLen - 2) {
{
if (biol) { if (biol) {
if (rtw_IOL_cmd_boundary_handle(pxmit_frame)) if (rtw_IOL_cmd_boundary_handle(pxmit_frame))
bndy_cnt++; bndy_cnt++;
if (v1 == 0xffe) if (v1 == 0xffe)
{
rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 50); rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 50);
} else if (v1 == 0xfd)
else if (v1 == 0xfd){
rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 5); rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 5);
} else if (v1 == 0xfc)
else if (v1 == 0xfc){
rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 1); rtw_IOL_append_DELAY_MS_cmd(pxmit_frame, 1);
} else if (v1 == 0xfb)
else if (v1 == 0xfb){
rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 50); rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 50);
} else if (v1 == 0xfa)
else if (v1 == 0xfa){
rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 5); rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 5);
} else if (v1 == 0xf9)
else if (v1 == 0xf9){
rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1); rtw_IOL_append_DELAY_US_cmd(pxmit_frame, 1);
}
else{
rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A,(u2Byte)v1, v2,bRFRegOffsetMask) ;
}
}
else else
{ rtw_IOL_append_WRF_cmd(pxmit_frame, ODM_RF_PATH_A, (u2Byte)v1, v2, bRFRegOffsetMask);
} else {
odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2); odm_ConfigRF_RadioA_8188E(pDM_Odm, v1, v2);
} }
READ_NEXT_PAIR(v1, v2, i); READ_NEXT_PAIR(v1, v2, i);
@ -293,7 +264,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm
if (biol) { if (biol) {
if (!rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) { if (!rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) {
rst = HAL_STATUS_FAILURE; rst = HAL_STATUS_FAILURE;
printk("~~~ IOL Config %s Failed !!!\n",__func__); pr_info("~~~ IOL Config %s Failed !!!\n", __func__);
} }
} }
return rst; return rst;