staging: rtl8712: xmit_linux.c: Remove leading p from variable names
PATCH 1/3 staging: rtl8712: xmit_linux.c: Remove leading p from variable names
Remove leading p from the names of the following pointer variables:
- padapter
- pxmitpriv
- pnetdev
- pxmitframe.
Issue found with Coccinelle.
--- drivers/staging/rtl8712/xmit_linux.c | 50 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/staging/rtl8712/xmit_linux.c +25 -25
@@ -93,22 +93,22 @@ void r8712_set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)void r8712_SetFilter (struct work_struct *work) { - struct _adapter *padapter = container_of(work, struct _adapter, + struct _adapter *adapter = container_of(work, struct _adapter, wkFilterRxFF0);u8 oldvalue =0x00 , newvalue =0x00 ;unsigned long irqL; - oldvalue =r8712_read8 (padapter,0x117 ); + oldvalue =r8712_read8 (adapter,0x117 ); newvalue = oldvalue &0xfe ; -r8712_write8 (padapter,0x117 , newvalue); +r8712_write8 (adapter,0x117 , newvalue); -spin_lock_irqsave (&padapter->lockRxFF0Filter, irqL); - padapter->blnEnableRxFF0Filter =1 ; -spin_unlock_irqrestore (&padapter->lockRxFF0Filter, irqL); +spin_lock_irqsave (&adapter->lockRxFF0Filter, irqL); + adapter->blnEnableRxFF0Filter =1 ; +spin_unlock_irqrestore (&adapter->lockRxFF0Filter, irqL);do {msleep (100 ); - }while (padapter->blnEnableRxFF0Filter ==1 ); -r8712_write8 (padapter,0x117 , oldvalue); + }while (adapter->blnEnableRxFF0Filter ==1 ); +r8712_write8 (adapter,0x117 , oldvalue); } int r8712_xmit_resource_alloc(struct _adapter *padapter,
@@ -147,36 +147,36 @@ void r8712_xmit_complete(struct _adapter *padapter, struct xmit_frame *pxframe) pxframe->pkt =NULL ; } -int r8712_xmit_entry (_pkt *pkt,struct net_device *pnetdev) +int r8712_xmit_entry (_pkt *pkt,struct net_device *netdev) { -struct xmit_frame *pxmitframe =NULL ; -struct _adapter *padapter =netdev_priv (pnetdev); -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct xmit_frame *xmitframe =NULL ; +struct _adapter *adapter =netdev_priv (netdev); +struct xmit_priv *xmitpriv = &(adapter->xmitpriv); -if (!r8712_if_up (padapter)) +if (!r8712_if_up (adapter)) goto _xmit_entry_drop; - pxmitframe =r8712_alloc_xmitframe (pxmitpriv); -if (!pxmitframe) + xmitframe =r8712_alloc_xmitframe (xmitpriv); +if (!xmitframe) goto _xmit_entry_drop; -if ((!r8712_update_attrib (padapter, pkt, &pxmitframe->attrib))) +if ((!r8712_update_attrib (adapter, pkt, &xmitframe->attrib))) goto _xmit_entry_drop; - padapter->ledpriv.LedControlHandler (padapter,LED_CTL_TX ); - pxmitframe->pkt = pkt; -if (r8712_pre_xmit (padapter, pxmitframe)) { + adapter->ledpriv.LedControlHandler (adapter,LED_CTL_TX ); + xmitframe->pkt = pkt; +if (r8712_pre_xmit (adapter, xmitframe)) {/*dump xmitframe directly or drop xframe*/ dev_kfree_skb_any (pkt); - pxmitframe->pkt =NULL ; + xmitframe->pkt =NULL ; } - pxmitpriv->tx_pkts++; - pxmitpriv->tx_bytes += pxmitframe->attrib.last_txcmdsz; + xmitpriv->tx_pkts++; + xmitpriv->tx_bytes += xmitframe->attrib.last_txcmdsz;return 0 ; _xmit_entry_drop: -if (pxmitframe) -r8712_free_xmitframe (pxmitpriv, pxmitframe); - pxmitpriv->tx_drop++; +if (xmitframe) +r8712_free_xmitframe (xmitpriv, xmitframe); + xmitpriv->tx_drop++;dev_kfree_skb_any (pkt);return 0 ; }
Signature · 1 line
2.19.1
PATCH 2/3 staging: rtl8712: usb_ops.c: Remove leading p from variable names
Remove leading 'p' from the names of the following pointer variables:
- pintfhdl
- pintf_hdl (renamed to intfhdl in keeping with the convention in other functions)
- poption
- pops
- pintfpriv.
Issue found with Coccinelle.
--- drivers/staging/rtl8712/usb_ops.c | 84 +++++++++++++++---------------- 1 file changed, 42 insertions(+), 42 deletions(-)
drivers/staging/rtl8712/usb_ops.c +42 -42
@@ -22,7 +22,7 @@#include "usb_ops.h" #include "recv_osdep.h" -static u8 usb_read8 (struct intf_hdl *pintfhdl,u32 addr) +static u8 usb_read8 (struct intf_hdl *intfhdl,u32 addr) {u8 request;u8 requesttype;
@@ -30,19 +30,19 @@ static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)u16 index;u16 len;__le32 data; -struct intf_priv *pintfpriv = pintfhdl->pintfpriv; +struct intf_priv *intfpriv = intfhdl->pintfpriv; request =0x05 ; requesttype =0x01 ;/* read_in */ index =0 ; wvalue = (u16)(addr &0x0000ffff ); len =1 ; -r8712_usbctrl_vendorreq (pintfpriv, request, wvalue, index, &data, len, - requesttype); +r8712_usbctrl_vendorreq (intfpriv, request, wvalue, index, &data, len, + requesttype);return (u8)(le32_to_cpu (data) &0x0ff ); } -static u16 usb_read16 (struct intf_hdl *pintfhdl,u32 addr) +static u16 usb_read16 (struct intf_hdl *intfhdl,u32 addr) {u8 request;u8 requesttype;
@@ -50,19 +50,19 @@ static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr)u16 index;u16 len;__le32 data; -struct intf_priv *pintfpriv = pintfhdl->pintfpriv; +struct intf_priv *intfpriv = intfhdl->pintfpriv; request =0x05 ; requesttype =0x01 ;/* read_in */ index =0 ; wvalue = (u16)(addr &0x0000ffff ); len =2 ; -r8712_usbctrl_vendorreq (pintfpriv, request, wvalue, index, &data, len, - requesttype); +r8712_usbctrl_vendorreq (intfpriv, request, wvalue, index, &data, len, + requesttype);return (u16)(le32_to_cpu (data) &0xffff ); } -static u32 usb_read32 (struct intf_hdl *pintfhdl,u32 addr) +static u32 usb_read32 (struct intf_hdl *intfhdl,u32 addr) {u8 request;u8 requesttype;
@@ -70,19 +70,19 @@ static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)u16 index;u16 len;__le32 data; -struct intf_priv *pintfpriv = pintfhdl->pintfpriv; +struct intf_priv *intfpriv = intfhdl->pintfpriv; request =0x05 ; requesttype =0x01 ;/* read_in */ index =0 ; wvalue = (u16)(addr &0x0000ffff ); len =4 ; -r8712_usbctrl_vendorreq (pintfpriv, request, wvalue, index, &data, len, - requesttype); +r8712_usbctrl_vendorreq (intfpriv, request, wvalue, index, &data, len, + requesttype);return le32_to_cpu (data); } -static void usb_write8 (struct intf_hdl *pintfhdl,u32 addr,u8 val) +static void usb_write8 (struct intf_hdl *intfhdl,u32 addr,u8 val) {u8 request;u8 requesttype;
@@ -90,7 +90,7 @@ static void usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val)u16 index;u16 len;__le32 data; -struct intf_priv *pintfpriv = pintfhdl->pintfpriv; +struct intf_priv *intfpriv = intfhdl->pintfpriv; request =0x05 ; requesttype =0x00 ;/* write_out */
@@ -98,11 +98,11 @@ static void usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val) wvalue = (u16)(addr &0x0000ffff ); len =1 ; data =cpu_to_le32 ((u32 )val &0x000000ff ); -r8712_usbctrl_vendorreq (pintfpriv, request, wvalue, index, &data, len, - requesttype); +r8712_usbctrl_vendorreq (intfpriv, request, wvalue, index, &data, len, + requesttype); } -static void usb_write16 (struct intf_hdl *pintfhdl,u32 addr,u16 val) +static void usb_write16 (struct intf_hdl *intfhdl,u32 addr,u16 val) {u8 request;u8 requesttype;
@@ -110,7 +110,7 @@ static void usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val)u16 index;u16 len;__le32 data; -struct intf_priv *pintfpriv = pintfhdl->pintfpriv; +struct intf_priv *intfpriv = intfhdl->pintfpriv; request =0x05 ; requesttype =0x00 ;/* write_out */
@@ -118,11 +118,11 @@ static void usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val) wvalue = (u16)(addr &0x0000ffff ); len =2 ; data =cpu_to_le32 ((u32 )val &0x0000ffff ); -r8712_usbctrl_vendorreq (pintfpriv, request, wvalue, index, &data, len, - requesttype); +r8712_usbctrl_vendorreq (intfpriv, request, wvalue, index, &data, len, + requesttype); } -static void usb_write32 (struct intf_hdl *pintfhdl,u32 addr,u32 val) +static void usb_write32 (struct intf_hdl *intfhdl,u32 addr,u32 val) {u8 request;u8 requesttype;
@@ -130,7 +130,7 @@ static void usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val)u16 index;u16 len;__le32 data; -struct intf_priv *pintfpriv = pintfhdl->pintfpriv; +struct intf_priv *intfpriv = intfhdl->pintfpriv; request =0x05 ; requesttype =0x00 ;/* write_out */
@@ -138,13 +138,13 @@ static void usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val) wvalue = (u16)(addr &0x0000ffff ); len =4 ; data =cpu_to_le32 (val); -r8712_usbctrl_vendorreq (pintfpriv, request, wvalue, index, &data, len, - requesttype); +r8712_usbctrl_vendorreq (intfpriv, request, wvalue, index, &data, len, + requesttype); } -void r8712_usb_set_intf_option (u32 *poption) +void r8712_usb_set_intf_option (u32 *option) { - *poption = ((*poption) | _INTF_ASYNC_); + *option = ((*option) | _INTF_ASYNC_); }static void usb_intf_hdl_init (u8 *priv)
@@ -163,24 +163,24 @@ static void usb_intf_hdl_close(u8 *priv) { } -void r8712_usb_set_intf_funs (struct intf_hdl *pintf_hdl) +void r8712_usb_set_intf_funs (struct intf_hdl *intfhdl) { - pintf_hdl->intf_hdl_init = usb_intf_hdl_init; - pintf_hdl->intf_hdl_unload = usb_intf_hdl_unload; - pintf_hdl->intf_hdl_open = usb_intf_hdl_open; - pintf_hdl->intf_hdl_close = usb_intf_hdl_close; + intfhdl->intf_hdl_init = usb_intf_hdl_init; + intfhdl->intf_hdl_unload = usb_intf_hdl_unload; + intfhdl->intf_hdl_open = usb_intf_hdl_open; + intfhdl->intf_hdl_close = usb_intf_hdl_close; } -void r8712_usb_set_intf_ops (struct _io_ops *pops) +void r8712_usb_set_intf_ops (struct _io_ops *ops) { -memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_read8 = usb_read8; - pops->_read16 = usb_read16; - pops->_read32 = usb_read32; - pops->_read_port = r8712_usb_read_port; - pops->_write8 = usb_write8; - pops->_write16 = usb_write16; - pops->_write32 = usb_write32; - pops->_write_mem = r8712_usb_write_mem; - pops->_write_port = r8712_usb_write_port; +memset ((u8 *)ops,0 ,sizeof (struct _io_ops )); + ops->_read8 = usb_read8; + ops->_read16 = usb_read16; + ops->_read32 = usb_read32; + ops->_read_port = r8712_usb_read_port; + ops->_write8 = usb_write8; + ops->_write16 = usb_write16; + ops->_write32 = usb_write32; + ops->_write_mem = r8712_usb_write_mem; + ops->_write_port = r8712_usb_write_port; }
Signature · 1 line
2.19.1
PATCH 3/3 staging: rtl8712: usb_halinit.c: Remove p from variable names
In reply to Nishka DasguptaRemove leading 'p' from the names of the following pointer variables:
- padapter
- precvbuf
- pintfhdl
- pregistrypriv
- precvpriv.
Issue found with Coccinelle.
--- drivers/staging/rtl8712/usb_halinit.c | 288 +++++++++++++------------- 1 file changed, 144 insertions(+), 144 deletions(-)
drivers/staging/rtl8712/usb_halinit.c +144 -144
@@ -21,258 +21,258 @@#include "usb_ops.h" #include "usb_osintf.h" -u8 r8712_usb_hal_bus_init (struct _adapter *padapter) +u8 r8712_usb_hal_bus_init (struct _adapter *adapter) {u8 val8 =0 ;u8 ret = _SUCCESS;int PollingCnt =20 ; -struct registry_priv *pregistrypriv = &padapter->registrypriv; +struct registry_priv *registrypriv = &adapter->registrypriv; -if (pregistrypriv->chip_version ==RTL8712_FPGA ) { +if (registrypriv->chip_version ==RTL8712_FPGA ) { val8 =0x01 ;/* switch to 80M clock */ -r8712_write8 (padapter,SYS_CLKR , val8); - val8 =r8712_read8 (padapter,SPS1_CTRL ); +r8712_write8 (adapter,SYS_CLKR , val8); + val8 =r8712_read8 (adapter,SPS1_CTRL ); val8 = val8 |0x01 ;/* enable VSPS12 LDO Macro block */ -r8712_write8 (padapter,SPS1_CTRL , val8); - val8 =r8712_read8 (padapter,AFE_MISC ); +r8712_write8 (adapter,SPS1_CTRL , val8); + val8 =r8712_read8 (adapter,AFE_MISC ); val8 = val8 |0x01 ;/* Enable AFE Macro Block's Bandgap */ -r8712_write8 (padapter,AFE_MISC , val8); - val8 =r8712_read8 (padapter,LDOA15_CTRL ); +r8712_write8 (adapter,AFE_MISC , val8); + val8 =r8712_read8 (adapter,LDOA15_CTRL ); val8 = val8 |0x01 ;/* enable LDOA15 block */ -r8712_write8 (padapter,LDOA15_CTRL , val8); - val8 =r8712_read8 (padapter,SPS1_CTRL ); +r8712_write8 (adapter,LDOA15_CTRL , val8); + val8 =r8712_read8 (adapter,SPS1_CTRL ); val8 = val8 |0x02 ;/* Enable VSPS12_SW Macro Block */ -r8712_write8 (padapter,SPS1_CTRL , val8); - val8 =r8712_read8 (padapter,AFE_MISC ); +r8712_write8 (adapter,SPS1_CTRL , val8); + val8 =r8712_read8 (adapter,AFE_MISC ); val8 = val8 |0x02 ;/* Enable AFE Macro Block's Mbias */ -r8712_write8 (padapter,AFE_MISC , val8); - val8 =r8712_read8 (padapter,SYS_ISO_CTRL +1 ); +r8712_write8 (adapter,AFE_MISC , val8); + val8 =r8712_read8 (adapter,SYS_ISO_CTRL +1 ); val8 = val8 |0x08 ;/* isolate PCIe Analog 1.2V to PCIe 3.3V and PCIE Digital */ -r8712_write8 (padapter,SYS_ISO_CTRL +1 , val8); - val8 =r8712_read8 (padapter,SYS_ISO_CTRL +1 ); +r8712_write8 (adapter,SYS_ISO_CTRL +1 , val8); + val8 =r8712_read8 (adapter,SYS_ISO_CTRL +1 ); val8 = val8 &0xEF ;/* attatch AFE PLL to MACTOP/BB/PCIe Digital */ -r8712_write8 (padapter,SYS_ISO_CTRL +1 , val8); - val8 =r8712_read8 (padapter,AFE_XTAL_CTRL +1 ); +r8712_write8 (adapter,SYS_ISO_CTRL +1 , val8); + val8 =r8712_read8 (adapter,AFE_XTAL_CTRL +1 ); val8 = val8 &0xFB ;/* enable AFE clock */ -r8712_write8 (padapter,AFE_XTAL_CTRL +1 , val8); - val8 =r8712_read8 (padapter,AFE_PLL_CTRL ); +r8712_write8 (adapter,AFE_XTAL_CTRL +1 , val8); + val8 =r8712_read8 (adapter,AFE_PLL_CTRL ); val8 = val8 |0x01 ;/* Enable AFE PLL Macro Block */ -r8712_write8 (padapter,AFE_PLL_CTRL , val8); +r8712_write8 (adapter,AFE_PLL_CTRL , val8); val8 =0xEE ;/* release isolation AFE PLL & MD */ -r8712_write8 (padapter,SYS_ISO_CTRL , val8); - val8 =r8712_read8 (padapter,SYS_CLKR +1 ); +r8712_write8 (adapter,SYS_ISO_CTRL , val8); + val8 =r8712_read8 (adapter,SYS_CLKR +1 ); val8 = val8 |0x08 ;/* enable MAC clock */ -r8712_write8 (padapter,SYS_CLKR +1 , val8); - val8 =r8712_read8 (padapter,SYS_FUNC_EN +1 ); +r8712_write8 (adapter,SYS_CLKR +1 , val8); + val8 =r8712_read8 (adapter,SYS_FUNC_EN +1 ); val8 = val8 |0x08 ;/* enable Core digital and enable IOREG R/W */ -r8712_write8 (padapter,SYS_FUNC_EN +1 , val8); +r8712_write8 (adapter,SYS_FUNC_EN +1 , val8); val8 = val8 |0x80 ;/* enable REG_EN */ -r8712_write8 (padapter,SYS_FUNC_EN +1 , val8); - val8 =r8712_read8 (padapter,SYS_CLKR +1 ); +r8712_write8 (adapter,SYS_FUNC_EN +1 , val8); + val8 =r8712_read8 (adapter,SYS_CLKR +1 ); val8 = (val8 |0x80 ) &0xBF ;/* switch the control path */ -r8712_write8 (padapter,SYS_CLKR +1 , val8); +r8712_write8 (adapter,SYS_CLKR +1 , val8); val8 =0xFC ; -r8712_write8 (padapter,CR , val8); +r8712_write8 (adapter,CR , val8); val8 =0x37 ; -r8712_write8 (padapter,CR +1 , val8); +r8712_write8 (adapter,CR +1 , val8);/* reduce EndPoint & init it */ -r8712_write8 (padapter,0x102500ab ,r8712_read8 (padapter, +r8712_write8 (adapter,0x102500ab ,r8712_read8 (adapter,0x102500ab ) |BIT (6 ) |BIT (7 ));/* consideration of power consumption - init */ -r8712_write8 (padapter,0x10250008 ,r8712_read8 (padapter, +r8712_write8 (adapter,0x10250008 ,r8712_read8 (adapter,0x10250008 ) &0xfffffffb ); - }else if (pregistrypriv->chip_version == RTL8712_1stCUT) { + }else if (registrypriv->chip_version == RTL8712_1stCUT) {/* Initialization for power on sequence, */ -r8712_write8 (padapter,SPS0_CTRL +1 ,0x53 ); -r8712_write8 (padapter,SPS0_CTRL ,0x57 ); +r8712_write8 (adapter,SPS0_CTRL +1 ,0x53 ); +r8712_write8 (adapter,SPS0_CTRL ,0x57 );/* Enable AFE Macro Block's Bandgap and Enable AFE Macro * Block's Mbias */ - val8 =r8712_read8 (padapter,AFE_MISC ); -r8712_write8 (padapter,AFE_MISC , (val8 |AFE_MISC_BGEN | + val8 =r8712_read8 (adapter,AFE_MISC ); +r8712_write8 (adapter,AFE_MISC , (val8 |AFE_MISC_BGEN |AFE_MISC_MBEN ));/* Enable LDOA15 block */ - val8 =r8712_read8 (padapter,LDOA15_CTRL ); -r8712_write8 (padapter,LDOA15_CTRL , (val8 |LDA15_EN )); - val8 =r8712_read8 (padapter,SPS1_CTRL ); -r8712_write8 (padapter,SPS1_CTRL , (val8 |SPS1_LDEN )); + val8 =r8712_read8 (adapter,LDOA15_CTRL ); +r8712_write8 (adapter,LDOA15_CTRL , (val8 |LDA15_EN )); + val8 =r8712_read8 (adapter,SPS1_CTRL ); +r8712_write8 (adapter,SPS1_CTRL , (val8 |SPS1_LDEN ));msleep (20 );/* Enable Switch Regulator Block */ - val8 =r8712_read8 (padapter,SPS1_CTRL ); -r8712_write8 (padapter,SPS1_CTRL , (val8 |SPS1_SWEN )); -r8712_write32 (padapter,SPS1_CTRL ,0x00a7b267 ); - val8 =r8712_read8 (padapter,SYS_ISO_CTRL +1 ); -r8712_write8 (padapter,SYS_ISO_CTRL +1 , (val8 |0x08 )); + val8 =r8712_read8 (adapter,SPS1_CTRL ); +r8712_write8 (adapter,SPS1_CTRL , (val8 |SPS1_SWEN )); +r8712_write32 (adapter,SPS1_CTRL ,0x00a7b267 ); + val8 =r8712_read8 (adapter,SYS_ISO_CTRL +1 ); +r8712_write8 (adapter,SYS_ISO_CTRL +1 , (val8 |0x08 ));/* Engineer Packet CP test Enable */ - val8 =r8712_read8 (padapter,SYS_FUNC_EN +1 ); -r8712_write8 (padapter,SYS_FUNC_EN +1 , (val8 |0x20 )); - val8 =r8712_read8 (padapter,SYS_ISO_CTRL +1 ); -r8712_write8 (padapter,SYS_ISO_CTRL +1 , (val8 &0x6F )); + val8 =r8712_read8 (adapter,SYS_FUNC_EN +1 ); +r8712_write8 (adapter,SYS_FUNC_EN +1 , (val8 |0x20 )); + val8 =r8712_read8 (adapter,SYS_ISO_CTRL +1 ); +r8712_write8 (adapter,SYS_ISO_CTRL +1 , (val8 &0x6F ));/* Enable AFE clock */ - val8 =r8712_read8 (padapter,AFE_XTAL_CTRL +1 ); -r8712_write8 (padapter,AFE_XTAL_CTRL +1 , (val8 &0xfb )); + val8 =r8712_read8 (adapter,AFE_XTAL_CTRL +1 ); +r8712_write8 (adapter,AFE_XTAL_CTRL +1 , (val8 &0xfb ));/* Enable AFE PLL Macro Block */ - val8 =r8712_read8 (padapter,AFE_PLL_CTRL ); -r8712_write8 (padapter,AFE_PLL_CTRL , (val8 |0x11 )); + val8 =r8712_read8 (adapter,AFE_PLL_CTRL ); +r8712_write8 (adapter,AFE_PLL_CTRL , (val8 |0x11 ));/* Attach AFE PLL to MACTOP/BB/PCIe Digital */ - val8 =r8712_read8 (padapter,SYS_ISO_CTRL ); -r8712_write8 (padapter,SYS_ISO_CTRL , (val8 &0xEE )); + val8 =r8712_read8 (adapter,SYS_ISO_CTRL ); +r8712_write8 (adapter,SYS_ISO_CTRL , (val8 &0xEE ));/* Switch to 40M clock */ - val8 =r8712_read8 (padapter,SYS_CLKR ); -r8712_write8 (padapter,SYS_CLKR , val8 & (~SYS_CLKSEL )); + val8 =r8712_read8 (adapter,SYS_CLKR ); +r8712_write8 (adapter,SYS_CLKR , val8 & (~SYS_CLKSEL ));/* SSC Disable */ - val8 =r8712_read8 (padapter,SYS_CLKR ); + val8 =r8712_read8 (adapter,SYS_CLKR );/* Enable MAC clock */ - val8 =r8712_read8 (padapter,SYS_CLKR +1 ); -r8712_write8 (padapter,SYS_CLKR +1 , (val8 |0x18 )); + val8 =r8712_read8 (adapter,SYS_CLKR +1 ); +r8712_write8 (adapter,SYS_CLKR +1 , (val8 |0x18 ));/* Revised POS, */ -r8712_write8 (padapter,PMC_FSM ,0x02 ); +r8712_write8 (adapter,PMC_FSM ,0x02 );/* Enable Core digital and enable IOREG R/W */ - val8 =r8712_read8 (padapter,SYS_FUNC_EN +1 ); -r8712_write8 (padapter,SYS_FUNC_EN +1 , (val8 |0x08 )); + val8 =r8712_read8 (adapter,SYS_FUNC_EN +1 ); +r8712_write8 (adapter,SYS_FUNC_EN +1 , (val8 |0x08 ));/* Enable REG_EN */ - val8 =r8712_read8 (padapter,SYS_FUNC_EN +1 ); -r8712_write8 (padapter,SYS_FUNC_EN +1 , (val8 |0x80 )); + val8 =r8712_read8 (adapter,SYS_FUNC_EN +1 ); +r8712_write8 (adapter,SYS_FUNC_EN +1 , (val8 |0x80 ));/* Switch the control path to FW */ - val8 =r8712_read8 (padapter,SYS_CLKR +1 ); -r8712_write8 (padapter,SYS_CLKR +1 , (val8 |0x80 ) &0xBF ); -r8712_write8 (padapter,CR ,0xFC ); -r8712_write8 (padapter,CR +1 ,0x37 ); + val8 =r8712_read8 (adapter,SYS_CLKR +1 ); +r8712_write8 (adapter,SYS_CLKR +1 , (val8 |0x80 ) &0xBF ); +r8712_write8 (adapter,CR ,0xFC ); +r8712_write8 (adapter,CR +1 ,0x37 );/* Fix the RX FIFO issue(usb error), */ - val8 =r8712_read8 (padapter,0x1025FE5c ); -r8712_write8 (padapter,0x1025FE5c , (val8 |BIT (7 ))); - val8 =r8712_read8 (padapter,0x102500ab ); -r8712_write8 (padapter,0x102500ab , (val8 |BIT (6 ) |BIT (7 ))); + val8 =r8712_read8 (adapter,0x1025FE5c ); +r8712_write8 (adapter,0x1025FE5c , (val8 |BIT (7 ))); + val8 =r8712_read8 (adapter,0x102500ab ); +r8712_write8 (adapter,0x102500ab , (val8 |BIT (6 ) |BIT (7 )));/* For power save, used this in the bit file after 970621 */ - val8 =r8712_read8 (padapter,SYS_CLKR ); -r8712_write8 (padapter,SYS_CLKR , val8 & (~CPU_CLKSEL )); - }else if (pregistrypriv->chip_version == RTL8712_2ndCUT || - pregistrypriv->chip_version == RTL8712_3rdCUT) { + val8 =r8712_read8 (adapter,SYS_CLKR ); +r8712_write8 (adapter,SYS_CLKR , val8 & (~CPU_CLKSEL )); + }else if (registrypriv->chip_version == RTL8712_2ndCUT || + registrypriv->chip_version == RTL8712_3rdCUT) {/* Initialization for power on sequence, * E-Fuse leakage prevention sequence */ -r8712_write8 (padapter,0x37 ,0xb0 ); +r8712_write8 (adapter,0x37 ,0xb0 );msleep (20 ); -r8712_write8 (padapter,0x37 ,0x30 ); +r8712_write8 (adapter,0x37 ,0x30 );/* Set control path switch to HW control and reset Digital Core, * CPU Core and MAC I/O to solve FW download fail when system * from resume sate. */ - val8 =r8712_read8 (padapter,SYS_CLKR +1 ); + val8 =r8712_read8 (adapter,SYS_CLKR +1 );if (val8 &0x80 ) { val8 &=0x3f ; -r8712_write8 (padapter,SYS_CLKR +1 , val8); +r8712_write8 (adapter,SYS_CLKR +1 , val8); } - val8 =r8712_read8 (padapter,SYS_FUNC_EN +1 ); + val8 =r8712_read8 (adapter,SYS_FUNC_EN +1 ); val8 &=0x73 ; -r8712_write8 (padapter,SYS_FUNC_EN +1 , val8); +r8712_write8 (adapter,SYS_FUNC_EN +1 , val8);msleep (20 );/* Revised POS, */ /* Enable AFE Macro Block's Bandgap and Enable AFE Macro * Block's Mbias */ -r8712_write8 (padapter,SPS0_CTRL +1 ,0x53 ); -r8712_write8 (padapter,SPS0_CTRL ,0x57 ); - val8 =r8712_read8 (padapter,AFE_MISC ); +r8712_write8 (adapter,SPS0_CTRL +1 ,0x53 ); +r8712_write8 (adapter,SPS0_CTRL ,0x57 ); + val8 =r8712_read8 (adapter,AFE_MISC );/*Bandgap*/ -r8712_write8 (padapter,AFE_MISC , (val8 |AFE_MISC_BGEN )); -r8712_write8 (padapter,AFE_MISC , (val8 |AFE_MISC_BGEN | +r8712_write8 (adapter,AFE_MISC , (val8 |AFE_MISC_BGEN )); +r8712_write8 (adapter,AFE_MISC , (val8 |AFE_MISC_BGEN |AFE_MISC_MBEN |AFE_MISC_I32_EN ));/* Enable PLL Power (LDOA15V) */ - val8 =r8712_read8 (padapter,LDOA15_CTRL ); -r8712_write8 (padapter,LDOA15_CTRL , (val8 |LDA15_EN )); + val8 =r8712_read8 (adapter,LDOA15_CTRL ); +r8712_write8 (adapter,LDOA15_CTRL , (val8 |LDA15_EN ));/* Enable LDOV12D block */ - val8 =r8712_read8 (padapter,LDOV12D_CTRL ); -r8712_write8 (padapter,LDOV12D_CTRL , (val8 |LDV12_EN )); - val8 =r8712_read8 (padapter,SYS_ISO_CTRL +1 ); -r8712_write8 (padapter,SYS_ISO_CTRL +1 , (val8 |0x08 )); + val8 =r8712_read8 (adapter,LDOV12D_CTRL ); +r8712_write8 (adapter,LDOV12D_CTRL , (val8 |LDV12_EN )); + val8 =r8712_read8 (adapter,SYS_ISO_CTRL +1 ); +r8712_write8 (adapter,SYS_ISO_CTRL +1 , (val8 |0x08 ));/* Engineer Packet CP test Enable */ - val8 =r8712_read8 (padapter,SYS_FUNC_EN +1 ); -r8712_write8 (padapter,SYS_FUNC_EN +1 , (val8 |0x20 )); + val8 =r8712_read8 (adapter,SYS_FUNC_EN +1 ); +r8712_write8 (adapter,SYS_FUNC_EN +1 , (val8 |0x20 ));/* Support 64k IMEM */ - val8 =r8712_read8 (padapter,SYS_ISO_CTRL +1 ); -r8712_write8 (padapter,SYS_ISO_CTRL +1 , (val8 &0x68 )); + val8 =r8712_read8 (adapter,SYS_ISO_CTRL +1 ); +r8712_write8 (adapter,SYS_ISO_CTRL +1 , (val8 &0x68 ));/* Enable AFE clock */ - val8 =r8712_read8 (padapter,AFE_XTAL_CTRL +1 ); -r8712_write8 (padapter,AFE_XTAL_CTRL +1 , (val8 &0xfb )); + val8 =r8712_read8 (adapter,AFE_XTAL_CTRL +1 ); +r8712_write8 (adapter,AFE_XTAL_CTRL +1 , (val8 &0xfb ));/* Enable AFE PLL Macro Block */ - val8 =r8712_read8 (padapter,AFE_PLL_CTRL ); -r8712_write8 (padapter,AFE_PLL_CTRL , (val8 |0x11 )); + val8 =r8712_read8 (adapter,AFE_PLL_CTRL ); +r8712_write8 (adapter,AFE_PLL_CTRL , (val8 |0x11 ));/* Some sample will download fw failure. The clock will be * stable with 500 us delay after reset the PLL * TODO: When usleep is added to kernel, change next 3 * udelay(500) to usleep(500) */ udelay (500 ); -r8712_write8 (padapter,AFE_PLL_CTRL , (val8 |0x51 )); +r8712_write8 (adapter,AFE_PLL_CTRL , (val8 |0x51 ));udelay (500 ); -r8712_write8 (padapter,AFE_PLL_CTRL , (val8 |0x11 )); +r8712_write8 (adapter,AFE_PLL_CTRL , (val8 |0x11 ));udelay (500 );/* Attach AFE PLL to MACTOP/BB/PCIe Digital */ - val8 =r8712_read8 (padapter,SYS_ISO_CTRL ); -r8712_write8 (padapter,SYS_ISO_CTRL , (val8 &0xEE )); + val8 =r8712_read8 (adapter,SYS_ISO_CTRL ); +r8712_write8 (adapter,SYS_ISO_CTRL , (val8 &0xEE ));/* Switch to 40M clock */ -r8712_write8 (padapter,SYS_CLKR ,0x00 ); +r8712_write8 (adapter,SYS_CLKR ,0x00 );/* CPU Clock and 80M Clock SSC Disable to overcome FW download * fail timing issue. */ - val8 =r8712_read8 (padapter,SYS_CLKR ); -r8712_write8 (padapter,SYS_CLKR , (val8 |0xa0 )); + val8 =r8712_read8 (adapter,SYS_CLKR ); +r8712_write8 (adapter,SYS_CLKR , (val8 |0xa0 ));/* Enable MAC clock */ - val8 =r8712_read8 (padapter,SYS_CLKR +1 ); -r8712_write8 (padapter,SYS_CLKR +1 , (val8 |0x18 )); + val8 =r8712_read8 (adapter,SYS_CLKR +1 ); +r8712_write8 (adapter,SYS_CLKR +1 , (val8 |0x18 ));/* Revised POS, */ -r8712_write8 (padapter,PMC_FSM ,0x02 ); +r8712_write8 (adapter,PMC_FSM ,0x02 );/* Enable Core digital and enable IOREG R/W */ - val8 =r8712_read8 (padapter,SYS_FUNC_EN +1 ); -r8712_write8 (padapter,SYS_FUNC_EN +1 , (val8 |0x08 )); + val8 =r8712_read8 (adapter,SYS_FUNC_EN +1 ); +r8712_write8 (adapter,SYS_FUNC_EN +1 , (val8 |0x08 ));/* Enable REG_EN */ - val8 =r8712_read8 (padapter,SYS_FUNC_EN +1 ); -r8712_write8 (padapter,SYS_FUNC_EN +1 , (val8 |0x80 )); + val8 =r8712_read8 (adapter,SYS_FUNC_EN +1 ); +r8712_write8 (adapter,SYS_FUNC_EN +1 , (val8 |0x80 ));/* Switch the control path to FW */ - val8 =r8712_read8 (padapter,SYS_CLKR +1 ); -r8712_write8 (padapter,SYS_CLKR +1 , (val8 |0x80 ) &0xBF ); -r8712_write8 (padapter,CR ,0xFC ); -r8712_write8 (padapter,CR +1 ,0x37 ); + val8 =r8712_read8 (adapter,SYS_CLKR +1 ); +r8712_write8 (adapter,SYS_CLKR +1 , (val8 |0x80 ) &0xBF ); +r8712_write8 (adapter,CR ,0xFC ); +r8712_write8 (adapter,CR +1 ,0x37 );/* Fix the RX FIFO issue(usb error), 970410 */ - val8 =r8712_read8 (padapter,0x1025FE5c ); -r8712_write8 (padapter,0x1025FE5c , (val8 |BIT (7 ))); + val8 =r8712_read8 (adapter,0x1025FE5c ); +r8712_write8 (adapter,0x1025FE5c , (val8 |BIT (7 )));/* For power save, used this in the bit file after 970621 */ - val8 =r8712_read8 (padapter,SYS_CLKR ); -r8712_write8 (padapter,SYS_CLKR , val8 & (~CPU_CLKSEL )); + val8 =r8712_read8 (adapter,SYS_CLKR ); +r8712_write8 (adapter,SYS_CLKR , val8 & (~CPU_CLKSEL ));/* Revised for 8051 ROM code wrong operation. */ -r8712_write8 (padapter,0x1025fe1c ,0x80 ); +r8712_write8 (adapter,0x1025fe1c ,0x80 );/* To make sure that TxDMA can ready to download FW. * We should reset TxDMA if IMEM RPT was not ready. */ do { - val8 =r8712_read8 (padapter,TCR ); + val8 =r8712_read8 (adapter,TCR );if ((val8 & _TXDMA_INIT_VALUE) == _TXDMA_INIT_VALUE)break ;udelay (5 );/* PlatformStallExecution(5); */ }while (PollingCnt--);/* Delay 1ms */ if (PollingCnt <=0 ) { - val8 =r8712_read8 (padapter,CR ); -r8712_write8 (padapter,CR , val8 & (~_TXDMA_EN)); + val8 =r8712_read8 (adapter,CR ); +r8712_write8 (adapter,CR , val8 & (~_TXDMA_EN));udelay (2 );/* PlatformStallExecution(2); */ /* Reset TxDMA */ -r8712_write8 (padapter,CR , val8 | _TXDMA_EN); +r8712_write8 (adapter,CR , val8 | _TXDMA_EN); } }else { ret = _FAIL;
@@ -280,28 +280,28 @@ u8 r8712_usb_hal_bus_init(struct _adapter *padapter)return ret; } -unsigned int r8712_usb_inirp_init (struct _adapter *padapter) +unsigned int r8712_usb_inirp_init (struct _adapter *adapter) {u8 i; -struct recv_buf *precvbuf; -struct intf_hdl *pintfhdl = &padapter->pio_queue->intf; -struct recv_priv *precvpriv = &(padapter->recvpriv); +struct recv_buf *recvbuf; +struct intf_hdl *intfhdl = &adapter->pio_queue->intf; +struct recv_priv *recvpriv = &(adapter->recvpriv); - precvpriv->ff_hwaddr =RTL8712_DMA_RX0FF ;/* mapping rx fifo address */ + recvpriv->ff_hwaddr =RTL8712_DMA_RX0FF ;/* mapping rx fifo address */ /* issue Rx irp to receive data */ - precvbuf = (struct recv_buf *)precvpriv->precv_buf; + recvbuf = (struct recv_buf *)recvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -if (r8712_usb_read_port (pintfhdl, precvpriv->ff_hwaddr,0 , - (unsigned char *)precvbuf) == false) +if (r8712_usb_read_port (intfhdl, recvpriv->ff_hwaddr,0 , + (unsigned char *)recvbuf) == false)return _FAIL; - precvbuf++; - precvpriv->free_recv_buf_queue_cnt--; + recvbuf++; + recvpriv->free_recv_buf_queue_cnt--; }return _SUCCESS; } -unsigned int r8712_usb_inirp_deinit (struct _adapter *padapter) +unsigned int r8712_usb_inirp_deinit (struct _adapter *adapter) { -r8712_usb_read_port_cancel (padapter); +r8712_usb_read_port_cancel (adapter);return _SUCCESS; }
Signature · 1 line
2.19.1