Famous_Longwing/88x2bu-20210702
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert if-else chains to function lookup

Browse Source
This commit is contained in:
Martin D Kealey 2022-09-24 01:54:01 +10:00
parent be21cfa354
commit 6f804959fe
1 changed files with 127 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

288
os_dep/linux/usb_intf.c
View File

@ -448,89 +448,68 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
return rst; return rst;
} }
static void rtw_decide_chip_type_by_usb_info(struct dvobj_priv *pdvobjpriv, const struct usb_device_id *pdid) static void rtw_decide_chip_type_by_usb_info(struct dvobj_priv *pdvobjpriv, const struct usb_device_id *pdid)
{ {
pdvobjpriv->chip_type = pdid->driver_info; static void (*map[MAX_CHIP_TYPE])(struct dvobj_priv *pdvobj) = {
#ifdef CONFIG_RTL8188E
#ifdef CONFIG_RTL8188E [RTL8188E] = rtl8188eu_set_hw_type,
if (pdvobjpriv->chip_type == RTL8188E) #endif
rtl8188eu_set_hw_type(pdvobjpriv); #ifdef CONFIG_RTL8188F
#endif [RTL8188F] = rtl8188fu_set_hw_type,
#endif
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) #ifdef CONFIG_RTL8188GTV
if (pdvobjpriv->chip_type == RTL8812 || pdvobjpriv->chip_type == RTL8821) [RTL8188GTV] = rtl8188gtvu_set_hw_type,
rtl8812au_set_hw_type(pdvobjpriv); #endif
#endif #ifdef CONFIG_RTL8192E
[RTL8192E] = rtl8192eu_set_hw_type,
#ifdef CONFIG_RTL8192E #endif
if (pdvobjpriv->chip_type == RTL8192E) #ifdef CONFIG_RTL8192F
rtl8192eu_set_hw_type(pdvobjpriv); [RTL8192F] = rtl8192fu_set_hw_type,
#endif #endif
#ifdef CONFIG_RTL8703B
#ifdef CONFIG_RTL8723B [RTL8703B] = rtl8703bu_set_hw_type,
if (pdvobjpriv->chip_type == RTL8723B) #endif
rtl8723bu_set_hw_type(pdvobjpriv); #ifdef CONFIG_RTL8710B
#endif [RTL8710B] = rtl8710bu_set_hw_type,
#endif
#ifdef CONFIG_RTL8814A #ifdef CONFIG_RTL8723B
if (pdvobjpriv->chip_type == RTL8814A) [RTL8723B] = rtl8723bu_set_hw_type,
rtl8814au_set_hw_type(pdvobjpriv); #endif
#endif /* CONFIG_RTL8814A */ #ifdef CONFIG_RTL8723D
[RTL8723D] = rtl8723du_set_hw_type,
#ifdef CONFIG_RTL8188F #endif
if (pdvobjpriv->chip_type == RTL8188F) #ifdef CONFIG_RTL8723F
rtl8188fu_set_hw_type(pdvobjpriv); [RTL8723F] = rtl8723fu_set_hw_type,
#endif #endif
#ifdef CONFIG_RTL8814A
#ifdef CONFIG_RTL8188GTV [RTL8814A] = rtl8814au_set_hw_type,
if (pdvobjpriv->chip_type == RTL8188GTV) #endif
rtl8188gtvu_set_hw_type(pdvobjpriv); #ifdef CONFIG_RTL8814B
#endif [RTL8814B] = rtl8814bu_set_hw_type,
#endif
#ifdef CONFIG_RTL8703B #if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
if (pdvobjpriv->chip_type == RTL8703B) [RTL8812] = rtl8812au_set_hw_type,
rtl8703bu_set_hw_type(pdvobjpriv); [RTL8821] = rtl8812au_set_hw_type,
#endif /* CONFIG_RTL8703B */ #endif
#ifdef CONFIG_RTL8821C
#ifdef CONFIG_RTL8822B [RTL8821C] = rtl8821cu_set_hw_type,
if (pdvobjpriv->chip_type == RTL8822B) #endif
rtl8822bu_set_hw_type(pdvobjpriv); #ifdef CONFIG_RTL8822B
#endif /* CONFIG_RTL8822B */ [RTL8822B] = rtl8822bu_set_hw_type,
#endif
#ifdef CONFIG_RTL8723D #ifdef CONFIG_RTL8822C
if (pdvobjpriv->chip_type == RTL8723D) [RTL8822C] = rtl8822cu_set_hw_type,
rtl8723du_set_hw_type(pdvobjpriv); #endif
#endif /* CONFIG_RTL8723D */ [NULL_CHIP_TYPE] = NULL /* so that we have at least one initialiser */
};
#ifdef CONFIG_RTL8821C u8 chiptype = pdvobjpriv->chip_type = pdid->driver_info;
if (pdvobjpriv->chip_type == RTL8821C) if (chiptype < MAX_CHIP_TYPE)
rtl8821cu_set_hw_type(pdvobjpriv); {
#endif /* CONFIG_RTL8821C */ void (*fn)(struct dvobj_priv *pdvobj) = map[pdvobjpriv->chip_type];
if (fn)
#ifdef CONFIG_RTL8710B fn(pdvobjpriv);
if (pdvobjpriv->chip_type == RTL8710B) }
rtl8710bu_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8710B */
#ifdef CONFIG_RTL8192F
if (pdvobjpriv->chip_type == RTL8192F)
rtl8192fu_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8192F */
#ifdef CONFIG_RTL8822C
if (pdvobjpriv->chip_type == RTL8822C)
rtl8822cu_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8822C */
#ifdef CONFIG_RTL8814B
if (pdvobjpriv->chip_type == RTL8814B)
rtl8814bu_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8814B */
#ifdef CONFIG_RTL8723F
if (pdvobjpriv->chip_type == RTL8723F)
rtl8723fu_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8723F */
} }
static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf, const struct usb_device_id *pdid) static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf, const struct usb_device_id *pdid)
@ -731,87 +710,74 @@ u8 rtw_set_hal_ops(_adapter *padapter)
if (rtw_hal_data_init(padapter) == _FAIL) if (rtw_hal_data_init(padapter) == _FAIL)
return _FAIL; return _FAIL;
#ifdef CONFIG_RTL8188E {
if (rtw_get_chip_type(padapter) == RTL8188E) static void (*map[])(_adapter *padapter) = {
rtl8188eu_set_hal_ops(padapter); #ifdef CONFIG_RTL8188E
#endif [RTL8188E] = rtl8188eu_set_hal_ops,
#endif
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) #ifdef CONFIG_RTL8188F
if (rtw_get_chip_type(padapter) == RTL8812 || rtw_get_chip_type(padapter) == RTL8821) [RTL8188F] = rtl8188fu_set_hal_ops,
rtl8812au_set_hal_ops(padapter); #endif
#endif #ifdef CONFIG_RTL8188GTV
[RTL8188GTV] = rtl8188gtvu_set_hal_ops,
#ifdef CONFIG_RTL8192E #endif
if (rtw_get_chip_type(padapter) == RTL8192E) #ifdef CONFIG_RTL8192E
rtl8192eu_set_hal_ops(padapter); [RTL8192E] = rtl8192eu_set_hal_ops,
#endif #endif
#ifdef CONFIG_RTL8723B #ifdef CONFIG_RTL8192F
if (rtw_get_chip_type(padapter) == RTL8723B) [RTL8192F] = rtl8192fu_set_hal_ops,
rtl8723bu_set_hal_ops(padapter); #endif
#endif #ifdef CONFIG_RTL8703B
#ifdef CONFIG_RTL8814A [RTL8703B] = rtl8703bu_set_hal_ops,
if (rtw_get_chip_type(padapter) == RTL8814A) #endif
rtl8814au_set_hal_ops(padapter); #ifdef CONFIG_RTL8710B
#endif /* CONFIG_RTL8814A */ [RTL8710B] = rtl8710bu_set_hal_ops,
#endif
#ifdef CONFIG_RTL8188F #ifdef CONFIG_RTL8723F
if (rtw_get_chip_type(padapter) == RTL8188F) [RTL8723F] = rtl8723fu_set_hal_ops,
rtl8188fu_set_hal_ops(padapter); #endif
#endif #ifdef CONFIG_RTL8814B
[RTL8814B] = rtl8814bu_set_hal_ops,
#ifdef CONFIG_RTL8188GTV #endif
if (rtw_get_chip_type(padapter) == RTL8188GTV) #ifdef CONFIG_RTL8723B
rtl8188gtvu_set_hal_ops(padapter); [RTL8723B] = rtl8723bu_set_hal_ops,
#endif #endif
#ifdef CONFIG_RTL8723D
#ifdef CONFIG_RTL8703B [RTL8723D] = rtl8723du_set_hal_ops,
if (rtw_get_chip_type(padapter) == RTL8703B) #endif
rtl8703bu_set_hal_ops(padapter); #ifdef CONFIG_RTL8814A
#endif /* CONFIG_RTL8703B */ [RTL8814A] = rtl8814au_set_hal_ops,
#endif
#ifdef CONFIG_RTL8822B #if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
if (rtw_get_chip_type(padapter) == RTL8822B) [RTL8812] = rtl8812au_set_hal_ops,
rtl8822bu_set_hal_ops(padapter); [RTL8821] = rtl8812au_set_hal_ops,
#endif /* CONFIG_RTL8822B */ #endif
#ifdef CONFIG_RTL8822B
#ifdef CONFIG_RTL8723D [RTL8822B] = rtl8822bu_set_hal_ops,
if (rtw_get_chip_type(padapter) == RTL8723D) #endif
rtl8723du_set_hal_ops(padapter); #ifdef CONFIG_RTL8822C
#endif /* CONFIG_RTL8723D */ [RTL8822C] = rtl8822cu_set_hal_ops,
#endif
[NULL_CHIP_TYPE] = NULL /* so that we have at least one initialiser */
#ifdef CONFIG_RTL8821C };
if (rtw_get_chip_type(padapter) == RTL8821C) { static u8 (*mapf[])(PADAPTER) = {
if (rtl8821cu_set_hal_ops(padapter) == _FAIL) #ifdef CONFIG_RTL8821C
return _FAIL; [RTL8821C] = rtl8821cu_set_hal_ops,
#endif
[NULL_CHIP_TYPE] = NULL /* so that we have at least one initialiser */
};
u8 chiptype = rtw_get_chip_type(padapter);
if (chiptype < MAX_CHIP_TYPE)
{
void (*fn)(_adapter *pad) = map[chiptype];
u8 (*fnf)(_adapter *pad) = mapf[chiptype];
if (fn)
fn(padapter);
else if (fnf)
if (fnf(padapter) == _FAIL)
return _FAIL;
}
} }
#endif
#ifdef CONFIG_RTL8710B
if (rtw_get_chip_type(padapter) == RTL8710B)
rtl8710bu_set_hal_ops(padapter);
#endif /* CONFIG_RTL8710B */
#ifdef CONFIG_RTL8192F
if (rtw_get_chip_type(padapter) == RTL8192F)
rtl8192fu_set_hal_ops(padapter);
#endif
#ifdef CONFIG_RTL8822C
if (rtw_get_chip_type(padapter) == RTL8822C)
rtl8822cu_set_hal_ops(padapter);
#endif /* CONFIG_RTL8822C */
#ifdef CONFIG_RTL8814B
if (rtw_get_chip_type(padapter) == RTL8814B)
rtl8814bu_set_hal_ops(padapter);
#endif /* CONFIG_RTL8814B */
#ifdef CONFIG_RTL8723F
if (rtw_get_chip_type(padapter) == RTL8723F)
rtl8723fu_set_hal_ops(padapter);
#endif /* CONFIG_RTL8723F */
if (_FAIL == rtw_hal_ops_check(padapter)) if (_FAIL == rtw_hal_ops_check(padapter))
return _FAIL; return _FAIL;