staging: rtl8188eu: rtw_io.c: Remove unused function _rtw_write8_async()
PATCH 1/22 staging: rtl8188eu: rtw_io.c: Remove unused function _rtw_write8_async()
--- drivers/staging/rtl8188eu/core/rtw_io.c | 12 ------------ drivers/staging/rtl8188eu/include/rtw_io.h | 4 ---- 2 files changed, 16 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -12
@@ -138,18 +138,6 @@ int _rtw_writeN(struct adapter *adapter, u32 addr , u32 length , u8 *pdata)return RTW_STATUS_CODE (ret); } -int _rtw_write8_async (struct adapter *adapter,u32 addr,u8 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write8_async)(struct intf_hdl *pintfhdl,u32 addr,u8 val); -int ret; - _write8_async = pintfhdl->io_ops._write8_async; - - ret =_write8_async (pintfhdl, addr, val); - -return RTW_STATUS_CODE (ret); -}int _rtw_write16_async (struct adapter *adapter,u32 addr,u16 val) {
drivers/staging/rtl8188eu/include/rtw_io.h +0 -4
@@ -52,7 +52,6 @@ struct _io_ops {int (*_write32)(struct intf_hdl *pintfhdl,u32 addr,u32 val);int (*_writeN)(struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata); -int (*_write8_async)(struct intf_hdl *pintfhdl,u32 addr,u8 val);int (*_write16_async)(struct intf_hdl *pintfhdl,u32 addr,u16 val);int (*_write32_async)(struct intf_hdl *pintfhdl,u32 addr,u32 val); u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
@@ -103,7 +102,6 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val);int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); -int _rtw_write8_async (struct adapter *adapter,u32 addr,u8 val);int _rtw_write16_async (struct adapter *adapter,u32 addr,u16 val);int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val);
@@ -127,8 +125,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write32((adapter), (addr), (val))#define rtw_writeN (adapter, addr, length, data) \ _rtw_writeN((adapter), (addr), (length), (data)) -#define rtw_write8_async (adapter, addr, val) \ - _rtw_write8_async((adapter), (addr), (val))#define rtw_write16_async (adapter, addr, val) \ _rtw_write16_async((adapter), (addr), (val))#define rtw_write32_async (adapter, addr, val) \
Signature · 1 line
1.7.10.4
PATCH 2/22 staging: rtl8188eu: rtw_io.c: Remove unused function rtw_write16_async()
--- drivers/staging/rtl8188eu/core/rtw_io.c | 13 ------------- drivers/staging/rtl8188eu/include/rtw_io.h | 4 ---- 2 files changed, 17 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -13
@@ -139,19 +139,6 @@ int _rtw_writeN(struct adapter *adapter, u32 addr , u32 length , u8 *pdata)return RTW_STATUS_CODE (ret); } -int _rtw_write16_async (struct adapter *adapter,u32 addr,u16 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write16_async)(struct intf_hdl *pintfhdl,u32 addr,u16 val); -int ret; - - _write16_async = pintfhdl->io_ops._write16_async; - ret =_write16_async (pintfhdl, addr, val); - -return RTW_STATUS_CODE (ret); -} -int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val) {struct io_priv *pio_priv = &adapter->iopriv;
drivers/staging/rtl8188eu/include/rtw_io.h +0 -4
@@ -52,7 +52,6 @@ struct _io_ops {int (*_write32)(struct intf_hdl *pintfhdl,u32 addr,u32 val);int (*_writeN)(struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata); -int (*_write16_async)(struct intf_hdl *pintfhdl,u32 addr,u16 val);int (*_write32_async)(struct intf_hdl *pintfhdl,u32 addr,u32 val);u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem);
@@ -102,7 +101,6 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val);int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); -int _rtw_write16_async (struct adapter *adapter,u32 addr,u16 val);int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val);u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);
@@ -125,8 +123,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write32((adapter), (addr), (val))#define rtw_writeN (adapter, addr, length, data) \ _rtw_writeN((adapter), (addr), (length), (data)) -#define rtw_write16_async (adapter, addr, val) \ - _rtw_write16_async((adapter), (addr), (val))#define rtw_write32_async (adapter, addr, val) \ _rtw_write32_async((adapter), (addr), (val))#define rtw_write_port (adapter, addr, cnt, mem) \
Signature · 1 line
1.7.10.4
PATCH 3/22 staging: rtl8188eu: rtw_io.c: Remove unused function _rtw_write32_async()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_io.c | 13 ------------- drivers/staging/rtl8188eu/include/rtw_io.h | 5 ----- 2 files changed, 18 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -13
@@ -139,19 +139,6 @@ int _rtw_writeN(struct adapter *adapter, u32 addr , u32 length , u8 *pdata)return RTW_STATUS_CODE (ret); } -int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write32_async)(struct intf_hdl *pintfhdl,u32 addr,u32 val); -int ret; - - _write32_async = pintfhdl->io_ops._write32_async; - ret =_write32_async (pintfhdl, addr, val); - -return RTW_STATUS_CODE (ret); -} -void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) {u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem);
drivers/staging/rtl8188eu/include/rtw_io.h +0 -5
@@ -52,7 +52,6 @@ struct _io_ops {int (*_write32)(struct intf_hdl *pintfhdl,u32 addr,u32 val);int (*_writeN)(struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata); -int (*_write32_async)(struct intf_hdl *pintfhdl,u32 addr,u32 val);u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
@@ -101,8 +100,6 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val);int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); -int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val); -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms);
@@ -123,8 +120,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write32((adapter), (addr), (val))#define rtw_writeN (adapter, addr, length, data) \ _rtw_writeN((adapter), (addr), (length), (data)) -#define rtw_write32_async (adapter, addr, val) \ - _rtw_write32_async((adapter), (addr), (val))#define rtw_write_port (adapter, addr, cnt, mem) \ _rtw_write_port((adapter), (addr), (cnt), (mem))#define rtw_write_port_and_wait (adapter, addr, cnt, mem, timeout_ms) \
Signature · 1 line
1.7.10.4
PATCH 4/22 staging: rtl8188eu: rtw_io.c: Remove unused function _rtw_write_port_and_wait()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_io.c | 17 ----------------- drivers/staging/rtl8188eu/include/rtw_io.h | 4 ---- 2 files changed, 21 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -17
@@ -187,23 +187,6 @@ u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)return ret; } -u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem,int timeout_ms) -{ -int ret = _SUCCESS; -struct xmit_buf *pxmitbuf = (struct xmit_buf *)pmem; -struct submit_ctx sctx; - -rtw_sctx_init (&sctx, timeout_ms); - pxmitbuf->sctx = &sctx; - - ret =_rtw_write_port (adapter, addr, cnt, pmem); - -if (ret == _SUCCESS) - ret =rtw_sctx_wait (&sctx); - -return ret; -} -void _rtw_write_port_cancel (struct adapter *adapter) {void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
drivers/staging/rtl8188eu/include/rtw_io.h +0 -4
@@ -101,8 +101,6 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val);int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -u32 _rtw_write_port_and_wait (struct adapter *adapter,u32 addr,u32 cnt, -u8 *pmem,int timeout_ms);void _rtw_write_port_cancel (struct adapter *adapter);#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))
@@ -122,8 +120,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_writeN((adapter), (addr), (length), (data))#define rtw_write_port (adapter, addr, cnt, mem) \ _rtw_write_port((adapter), (addr), (cnt), (mem)) -#define rtw_write_port_and_wait (adapter, addr, cnt, mem, timeout_ms) \ - _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms))#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter))void rtw_write_scsi (struct adapter *adapter,u32 cnt,u8 *pmem);
Signature · 1 line
1.7.10.4
PATCH 5/22 staging: rtl8188eu: rtw_io.h: Remove unused function declarations
In reply to navin patidar--- drivers/staging/rtl8188eu/include/rtw_io.h | 43 ---------------------------- 1 file changed, 43 deletions(-)
drivers/staging/rtl8188eu/include/rtw_io.h +0 -43
@@ -122,51 +122,8 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write_port((adapter), (addr), (cnt), (mem))#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter)) -void rtw_write_scsi (struct adapter *adapter,u32 cnt,u8 *pmem); - -/* ioreq */ -void ioreq_read8 (struct adapter *adapter,u32 addr,u8 *pval); -void ioreq_read16 (struct adapter *adapter,u32 addr,u16 *pval); -void ioreq_read32 (struct adapter *adapter,u32 addr,u32 *pval); -void ioreq_write8 (struct adapter *adapter,u32 addr,u8 val); -void ioreq_write16 (struct adapter *adapter,u32 addr,u16 val); -void ioreq_write32 (struct adapter *adapter,u32 addr,u32 val); - -uint async_read8 (struct adapter *adapter,u32 addr,u8 *pbuff, -void (*_async_io_callback)(struct adapter *padater, -struct io_req *pio_req, -u8 *cnxt),u8 *cnxt); -uint async_read16 (struct adapter *adapter,u32 addr,u8 *pbuff, -void (*_async_io_callback)(struct adapter *padater, -struct io_req *pio_req, -u8 *cnxt),u8 *cnxt); -uint async_read32 (struct adapter *adapter,u32 addr,u8 *pbuff, -void (*_async_io_callback)(struct adapter *padater, -struct io_req *pio_req, -u8 *cnxt),u8 *cnxt); - -void async_read_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -void async_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); - -void async_write8 (struct adapter *adapter,u32 addr,u8 val, -void (*_async_io_callback)(struct adapter *padater, -struct io_req *pio_req, -u8 *cnxt),u8 *cnxt); -void async_write16 (struct adapter *adapter,u32 addr,u16 val, -void (*_async_io_callback)(struct adapter *padater, -struct io_req *pio_req, -u8 *cnxt),u8 *cnxt); -void async_write32 (struct adapter *adapter,u32 addr,u32 val, -void (*_async_io_callback)(struct adapter *padater, -struct io_req *pio_req, -u8 *cnxt),u8 *cnxt); - -void async_write_mem (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -void async_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)); -void dev_power_down (struct adapter *Adapter,u8 bpwrup); -#endif /* _RTL8711_IO_H_ */
Signature · 1 line
1.7.10.4
PATCH 6/22 staging: rtl8188eu: Instead of intf_hdl pass adapter in read & write functions
In reply to navin patidarintf_hdl is passed in usb_[read,write][8,16,32]() functions, which is then passed to vender_request() there it's used to get adapter pointer, so instead of passing intf_hdl we can directly pass adapter.
This change will also help in removing rtw_[read,write][8,16,32]() wrapper functions being used to call usb_[read,write][8,16,32]() functions.
--- drivers/staging/rtl8188eu/core/rtw_io.c | 44 ++++++++++----------- drivers/staging/rtl8188eu/hal/usb_halinit.c | 4 +- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 34 ++++++++-------- drivers/staging/rtl8188eu/include/rtw_io.h | 22 +++++------ drivers/staging/rtl8188eu/include/usb_ops_linux.h | 6 +-- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 9 ++--- 6 files changed, 57 insertions(+), 62 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +22 -22
@@ -57,10 +57,10 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr)u8 r_val;struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -u8 (*_read8)(struct intf_hdl *pintfhdl,u32 addr); +u8 (*_read8)(struct adapter *pintfhdl,u32 addr); _read8 = pintfhdl->io_ops._read8; - r_val =_read8 (pintfhdl, addr); + r_val =_read8 (adapter, addr);return r_val; }
@@ -69,10 +69,10 @@ u16 _rtw_read16(struct adapter *adapter, u32 addr)u16 r_val;struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -u16 (*_read16)(struct intf_hdl *pintfhdl,u32 addr); +u16 (*_read16)(struct adapter *pintfhdl,u32 addr); _read16 = pintfhdl->io_ops._read16; - r_val =_read16 (pintfhdl, addr); + r_val =_read16 (adapter, addr);return r_val; }
@@ -81,10 +81,10 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr)u32 r_val;struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -u32 (*_read32)(struct intf_hdl *pintfhdl,u32 addr); +u32 (*_read32)(struct adapter *pintfhdl,u32 addr); _read32 = pintfhdl->io_ops._read32; - r_val =_read32 (pintfhdl, addr); + r_val =_read32 (adapter, addr);return r_val; }
@@ -92,11 +92,11 @@ int _rtw_write8(struct adapter *adapter, u32 addr, u8 val) {struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write8)(struct intf_hdl *pintfhdl,u32 addr,u8 val); +int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val);int ret; _write8 = pintfhdl->io_ops._write8; - ret =_write8 (pintfhdl, addr, val); + ret =_write8 (adapter, addr, val);return RTW_STATUS_CODE (ret); }
@@ -105,11 +105,11 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val) {struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write16)(struct intf_hdl *pintfhdl,u32 addr,u16 val); +int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val);int ret; _write16 = pintfhdl->io_ops._write16; - ret =_write16 (pintfhdl, addr, val); + ret =_write16 (adapter, addr, val);return RTW_STATUS_CODE (ret); }
@@ -117,11 +117,11 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val) {struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write32)(struct intf_hdl *pintfhdl,u32 addr,u32 val); +int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val);int ret; _write32 = pintfhdl->io_ops._write32; - ret =_write32 (pintfhdl, addr, val); + ret =_write32 (adapter, addr, val);return RTW_STATUS_CODE (ret); }
@@ -130,18 +130,18 @@ int _rtw_writeN(struct adapter *adapter, u32 addr , u32 length , u8 *pdata) {struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = (struct intf_hdl *)(&(pio_priv->intf)); -int (*_writeN)(struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata); +int (*_writeN)(struct adapter *pintfhdl,u32 addr,u32 length,u8 *pdata);int ret; _writeN = pintfhdl->io_ops._writeN; - ret =_writeN (pintfhdl, addr, length, pdata); + ret =_writeN (adapter, addr, length, pdata);return RTW_STATUS_CODE (ret); }void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) { -u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); +u32 (*_read_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem);struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf);
@@ -155,25 +155,25 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) _read_port = pintfhdl->io_ops._read_port; -_read_port (pintfhdl, addr, cnt, pmem); +_read_port (adapter, addr, cnt, pmem); }void _rtw_read_port_cancel (struct adapter *adapter) { -void (*_read_port_cancel)(struct intf_hdl *pintfhdl); +void (*_read_port_cancel)(struct adapter *pintfhdl);struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); _read_port_cancel = pintfhdl->io_ops._read_port_cancel;if (_read_port_cancel) -_read_port_cancel (pintfhdl); +_read_port_cancel (adapter); }u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) { -u32 (*_write_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); +u32 (*_write_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem);struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf);u32 ret = _SUCCESS;
@@ -181,7 +181,7 @@ u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) _write_port = pintfhdl->io_ops._write_port; - ret =_write_port (pintfhdl, addr, cnt, pmem); + ret =_write_port (adapter, addr, cnt, pmem);return ret;
@@ -189,14 +189,14 @@ u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)void _rtw_write_port_cancel (struct adapter *adapter) { -void (*_write_port_cancel)(struct intf_hdl *pintfhdl); +void (*_write_port_cancel)(struct adapter *pintfhdl);struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); _write_port_cancel = pintfhdl->io_ops._write_port_cancel;if (_write_port_cancel) -_write_port_cancel (pintfhdl); +_write_port_cancel (adapter); }int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops))
drivers/staging/rtl8188eu/hal/usb_halinit.c +2 -2
@@ -1039,7 +1039,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)uint status;struct intf_hdl *pintfhdl = &Adapter->iopriv.intf;struct recv_priv *precvpriv = &(Adapter->recvpriv); -u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); +u32 (*_read_port)(struct adapter *padapter,u32 addr,u32 cnt,u8 *pmem); _read_port = pintfhdl->io_ops._read_port;
@@ -1054,7 +1054,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)/* issue Rx irp to receive data */ precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -if (_read_port (pintfhdl, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf) == false) { +if (_read_port (Adapter, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf) == false) {RT_TRACE (_module_hci_hal_init_c_, _drv_err_, ("usb_rx_init: usb_read_port error\n" )); status = _FAIL; goto exit;
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +16 -18
@@ -26,9 +26,8 @@#include <recv_osdep.h> #include <rtl8188e_hal.h> -static int usbctrl_vendorreq (struct intf_hdl *pintfhdl,u8 request,u16 value,u16 index,void *pdata,u16 len,u8 requesttype) +static int usbctrl_vendorreq (struct adapter *adapt,u8 request,u16 value,u16 index,void *pdata,u16 len,u8 requesttype) { -struct adapter *adapt = pintfhdl->padapter;struct dvobj_priv *dvobjpriv =adapter_to_dvobj (adapt);struct usb_device *udev = dvobjpriv->pusbdev;unsigned int pipe;
@@ -116,7 +115,7 @@ exit:return status; } -static u8 usb_read8 (struct intf_hdl *pintfhdl,u32 addr) +static u8 usb_read8 (struct adapter *adapter,u32 addr) {u8 request;u8 requesttype;
@@ -133,14 +132,14 @@ static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr) wvalue = (u16)(addr&0x0000ffff ); len =1 ; -usbctrl_vendorreq (pintfhdl, request, wvalue, index, &data, len, requesttype); +usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype);return data; } -static u16 usb_read16 (struct intf_hdl *pintfhdl,u32 addr) +static u16 usb_read16 (struct adapter *adapter,u32 addr) {u8 request;u8 requesttype;
@@ -154,12 +153,12 @@ static u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr) index =0 ;/* n/a */ wvalue = (u16)(addr&0x0000ffff ); len =2 ; -usbctrl_vendorreq (pintfhdl, request, wvalue, index, &data, len, requesttype); +usbctrl_vendorreq (adapter, 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 adapter *adapter,u32 addr) {u8 request;u8 requesttype;
@@ -176,13 +175,13 @@ static u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr) wvalue = (u16)(addr&0x0000ffff ); len =4 ; -usbctrl_vendorreq (pintfhdl, request, wvalue, index, &data, len, requesttype); +usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype);return le32_to_cpu (data); } -static int usb_write8 (struct intf_hdl *pintfhdl,u32 addr,u8 val) +static int usb_write8 (struct adapter *adapter,u32 addr,u8 val) {u8 request;u8 requesttype;
@@ -198,11 +197,11 @@ static int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val) wvalue = (u16)(addr&0x0000ffff ); len =1 ; data = val; - ret =usbctrl_vendorreq (pintfhdl, request, wvalue, index, &data, len, requesttype); + ret =usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype);return ret; } -static int usb_write16 (struct intf_hdl *pintfhdl,u32 addr,u16 val) +static int usb_write16 (struct adapter *adapter,u32 addr,u16 val) {u8 request;u8 requesttype;
@@ -222,13 +221,13 @@ static int usb_write16(struct intf_hdl *pintfhdl, u32 addr, u16 val) data =cpu_to_le32 (val &0x0000ffff ); - ret =usbctrl_vendorreq (pintfhdl, request, wvalue, index, &data, len, requesttype); + ret =usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype);return ret; } -static int usb_write32 (struct intf_hdl *pintfhdl,u32 addr,u32 val) +static int usb_write32 (struct adapter *adapter,u32 addr,u32 val) {u8 request;u8 requesttype;
@@ -247,13 +246,13 @@ static int usb_write32(struct intf_hdl *pintfhdl, u32 addr, u32 val) len =4 ; data =cpu_to_le32 (val); - ret =usbctrl_vendorreq (pintfhdl, request, wvalue, index, &data, len, requesttype); + ret =usbctrl_vendorreq (adapter, request, wvalue, index, &data, len, requesttype);return ret; } -static int usb_writeN (struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata) +static int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) {u8 request;u8 requesttype;
@@ -272,7 +271,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata len = length;memcpy (buf, pdata, len); - ret =usbctrl_vendorreq (pintfhdl, request, wvalue, index, buf, len, requesttype); + ret =usbctrl_vendorreq (adapter, request, wvalue, index, buf, len, requesttype);return ret;
@@ -565,11 +564,10 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) } } -static u32 usb_read_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *rmem) +static u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *rmem) {struct urb *purb =NULL ;struct recv_buf *precvbuf = (struct recv_buf *)rmem; -struct adapter *adapter = pintfhdl->padapter;struct dvobj_priv *pdvobj =adapter_to_dvobj (adapter);struct recv_priv *precvpriv = &adapter->recvpriv;struct usb_device *pusbd = pdvobj->pusbdev;
drivers/staging/rtl8188eu/include/rtw_io.h +11 -11
@@ -44,20 +44,20 @@ struct intf_priv;struct intf_hdl ;struct _io_ops { -u8 (*_read8)(struct intf_hdl *pintfhdl,u32 addr); -u16 (*_read16)(struct intf_hdl *pintfhdl,u32 addr); -u32 (*_read32)(struct intf_hdl *pintfhdl,u32 addr); -int (*_write8)(struct intf_hdl *pintfhdl,u32 addr,u8 val); -int (*_write16)(struct intf_hdl *pintfhdl,u32 addr,u16 val); -int (*_write32)(struct intf_hdl *pintfhdl,u32 addr,u32 val); -int (*_writeN)(struct intf_hdl *pintfhdl,u32 addr,u32 length, +u8 (*_read8)(struct adapter *pintfhdl,u32 addr); +u16 (*_read16)(struct adapter *pintfhdl,u32 addr); +u32 (*_read32)(struct adapter *pintfhdl,u32 addr); +int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val); +int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val); +int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val); +int (*_writeN)(struct adapter *pintfhdl,u32 addr,u32 length,u8 *pdata); -u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt, +u32 (*_read_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -u32 (*_write_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt, +u32 (*_write_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -void (*_read_port_cancel)(struct intf_hdl *pintfhdl); -void (*_write_port_cancel)(struct intf_hdl *pintfhdl); +void (*_read_port_cancel)(struct adapter *pintfhdl); +void (*_write_port_cancel)(struct adapter *pintfhdl); };struct io_req {
drivers/staging/rtl8188eu/include/usb_ops_linux.h +3 -3
@@ -47,9 +47,9 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr);void usb_read_mem (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *rmem);void usb_write_mem (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem); -void usb_read_port_cancel (struct intf_hdl *pintfhdl); +void usb_read_port_cancel (struct adapter *padapter); -u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem); -void usb_write_port_cancel (struct intf_hdl *pintfhdl); +u32 usb_write_port (struct adapter *padapter,u32 addr,u32 cnt,u8 *wmem); +void usb_write_port_cancel (struct adapter *padapter);#endif
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +3 -6
@@ -39,11 +39,10 @@ unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr)return pipe; } -void usb_read_port_cancel (struct intf_hdl *pintfhdl) +void usb_read_port_cancel (struct adapter *padapter) {int i;struct recv_buf *precvbuf; -struct adapter *padapter = pintfhdl->padapter; precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;DBG_88E ("%s\n" , __func__);
@@ -137,14 +136,13 @@ check_completion:tasklet_hi_schedule (&pxmitpriv->xmit_tasklet); } -u32 usb_write_port (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem) +u32 usb_write_port (struct adapter *padapter,u32 addr,u32 cnt,u8 *wmem) {unsigned long irqL;unsigned int pipe;int status;u32 ret = _FAIL;struct urb *purb =NULL ; -struct adapter *padapter = (struct adapter *)pintfhdl->padapter;struct dvobj_priv *pdvobj =adapter_to_dvobj (padapter);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem;
@@ -230,10 +228,9 @@ exit:return ret; } -void usb_write_port_cancel (struct intf_hdl *pintfhdl) +void usb_write_port_cancel (struct adapter *padapter) {int i, j; -struct adapter *padapter = pintfhdl->padapter;struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;DBG_88E ("%s\n" , __func__);
Signature · 1 line
1.7.10.4
Re: [PATCH 06/22] staging: rtl8188eu: Instead of intf_hdl pass adapter in read & write functions
drivers/staging/rtl8188eu/core/rtw_io.c u8 _rtw_read8(struct adapter *adapter, u32 addr) · line 60
Quoted 10 lines · navin patidar
drivers/staging/rtl8188eu/core/rtw_io.c +1
-1@@ -57,10 +57,10 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr)u8 r_val;struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -u8 (*_read8)(struct intf_hdl *pintfhdl,u32 addr); +u8 (*_read8)(struct adapter *pintfhdl,u32 addr);
^^^^^^^^
Could you send a follow on patch to change pintfhdl to adapter in all the declarations?
regards,
dan carpenter
Re: [PATCH 06/22] staging: rtl8188eu: Instead of intf_hdl pass adapter in read & write functions
Quoted 12 lines · Dan Carpenter
drivers/staging/rtl8188eu/core/rtw_io.c u8 _rtw_read8(struct adapter *adapter, u32 addr) · line 60
Quoted 10 lines · navin patidar
drivers/staging/rtl8188eu/core/rtw_io.c +1
-1@@ -57,10 +57,10 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr)u8 r_val;struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -u8 (*_read8)(struct intf_hdl *pintfhdl,u32 addr); +u8 (*_read8)(struct adapter *pintfhdl,u32 addr);^^^^^^^^
Quoted 3 lines
Could you send a follow on patch to change pintfhdl to adapter in all the declarations?
dan, these declarations are removed by other patches of this patch set.
do i still need to send v2 of this patch?
regards,
navin patidar
Re: [PATCH 06/22] staging: rtl8188eu: Instead of intf_hdl pass adapter in read & write functions
Quoted 17 lines · navin patidar
Quoted 12 lines · Dan Carpenter
drivers/staging/rtl8188eu/core/rtw_io.c u8 _rtw_read8(struct adapter *adapter, u32 addr) · line 60
Quoted 10 lines · navin patidar
drivers/staging/rtl8188eu/core/rtw_io.c +1
-1@@ -57,10 +57,10 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr)u8 r_val;struct io_priv *pio_priv = &adapter->iopriv;struct intf_hdl *pintfhdl = &(pio_priv->intf); -u8 (*_read8)(struct intf_hdl *pintfhdl,u32 addr); +u8 (*_read8)(struct adapter *pintfhdl,u32 addr);^^^^^^^^Quoted 3 lines
Could you send a follow on patch to change pintfhdl to adapter in all the declarations?
Quoted 3 lines
dan, these declarations are removed by other patches of this patch set.
do i still need to send v2 of this patch?
No. That's fine, thanks.
regards,
dan carpenter
PATCH 7/22 staging: rtl8188eu: Remove function _rtw_writeN()
In reply to navin patidar_rtw_writeN() is a wrapper function, being used to call usb_writeN(). Call usb_writeN() directly and drop _rtw_writeN().
--- drivers/staging/rtl8188eu/core/rtw_io.c | 13 ------------- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 4 ++-- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 5 ++--- drivers/staging/rtl8188eu/include/rtw_io.h | 6 +----- 4 files changed, 5 insertions(+), 23 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -13
@@ -126,19 +126,6 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -int _rtw_writeN (struct adapter *adapter,u32 addr ,u32 length ,u8 *pdata) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = (struct intf_hdl *)(&(pio_priv->intf)); -int (*_writeN)(struct adapter *pintfhdl,u32 addr,u32 length,u8 *pdata); -int ret; - _writeN = pintfhdl->io_ops._writeN; - - ret =_writeN (adapter, addr, length, pdata); - -return RTW_STATUS_CODE (ret); -} -void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) {u32 (*_read_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem);
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +2 -2
@@ -441,7 +441,7 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize) }for (i =0 ; i < blockCount_p1; i++) { - ret =rtw_writeN (padapter, (FW_8188E_START_ADDRESS + i * blockSize_p1), blockSize_p1, (bufferPtr + i * blockSize_p1)); + ret =usb_writeN (padapter, (FW_8188E_START_ADDRESS + i * blockSize_p1), blockSize_p1, (bufferPtr + i * blockSize_p1));if (ret == _FAIL) goto exit; }
@@ -460,7 +460,7 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize) }for (i =0 ; i < blockCount_p2; i++) { - ret =rtw_writeN (padapter, (FW_8188E_START_ADDRESS + offset + i*blockSize_p2), blockSize_p2, (bufferPtr + offset + i*blockSize_p2)); + ret =usb_writeN (padapter, (FW_8188E_START_ADDRESS + offset + i*blockSize_p2), blockSize_p2, (bufferPtr + offset + i*blockSize_p2));if (ret == _FAIL) goto exit;
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +2 -3
@@ -252,7 +252,7 @@ static int usb_write32(struct adapter *adapter, u32 addr, u32 val)return ret; } -static int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) +int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) {u8 request;u8 requesttype;
@@ -274,7 +274,7 @@ static int usb_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata) ret =usbctrl_vendorreq (adapter, request, wvalue, index, buf, len, requesttype); -return ret; +return RTW_STATUS_CODE (ret); }static void interrupt_handler_8188eu (struct adapter *adapt,u16 pkt_len,u8 *pbuf)
@@ -673,7 +673,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_write8 = &usb_write8; pops->_write16 = &usb_write16; pops->_write32 = &usb_write32; - pops->_writeN = &usb_writeN; pops->_write_port = &usb_write_port; pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel;
drivers/staging/rtl8188eu/include/rtw_io.h +1 -5
@@ -50,8 +50,6 @@ struct _io_ops {int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val);int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val);int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val); -int (*_writeN)(struct adapter *pintfhdl,u32 addr,u32 length, -u8 *pdata);u32 (*_read_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem); u32 (*_write_port)(struct adapter *pintfhdl, u32 addr, u32 cnt,
@@ -98,7 +96,7 @@ void _rtw_read_port_cancel(struct adapter *adapter);int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val);int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val);int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val); -int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); +int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_write_port_cancel (struct adapter *adapter);
@@ -116,8 +114,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write16((adapter), (addr), (val))#define rtw_write32 (adapter, addr, val) \ _rtw_write32((adapter), (addr), (val)) -#define rtw_writeN (adapter, addr, length, data) \ - _rtw_writeN((adapter), (addr), (length), (data))#define rtw_write_port (adapter, addr, cnt, mem) \ _rtw_write_port((adapter), (addr), (cnt), (mem))#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter))
Signature · 1 line
1.7.10.4
PATCH 8/22 staging: rtl8188eu: Remove function _rtw_read_port()
In reply to navin patidar_rtw_read_port() is a wrapper function, being used to call usb_read_port(). use usb_read_port() directly and drop _rtw_read_port().
--- drivers/staging/rtl8188eu/core/rtw_io.c | 20 -------------------- drivers/staging/rtl8188eu/hal/usb_halinit.c | 7 +------ drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 9 ++++----- drivers/staging/rtl8188eu/include/rtw_io.h | 6 +----- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 2 +- 5 files changed, 7 insertions(+), 37 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -20
@@ -126,26 +126,6 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) -{ -u32 (*_read_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); - - -if (adapter->bDriverStopped || adapter->bSurpriseRemoved) { -RT_TRACE (_module_rtl871x_io_c_, _drv_info_, - ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)" , - adapter->bDriverStopped, adapter->bSurpriseRemoved)); -return ; - } - - _read_port = pintfhdl->io_ops._read_port; - -_read_port (adapter, addr, cnt, pmem); - -} -void _rtw_read_port_cancel (struct adapter *adapter) {void (*_read_port_cancel)(struct adapter *pintfhdl);
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -6
@@ -1037,12 +1037,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)u8 i;struct recv_buf *precvbuf;uint status; -struct intf_hdl *pintfhdl = &Adapter->iopriv.intf;struct recv_priv *precvpriv = &(Adapter->recvpriv); -u32 (*_read_port)(struct adapter *padapter,u32 addr,u32 cnt,u8 *pmem); - - - _read_port = pintfhdl->io_ops._read_port; status = _SUCCESS;
@@ -1054,7 +1049,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)/* issue Rx irp to receive data */ precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -if (_read_port (Adapter, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf) == false) { +if (usb_read_port (Adapter, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf) == false) {RT_TRACE (_module_hci_hal_init_c_, _drv_err_, ("usb_rx_init: usb_read_port error\n" )); status = _FAIL; goto exit;
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +4 -5
@@ -511,7 +511,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)RT_TRACE (_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n" )); precvbuf->reuse = true; -rtw_read_port (adapt, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf); +usb_read_port (adapt, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf);DBG_88E ("%s()-%d: RX Warning!\n" , __func__, __LINE__); }else {rtw_reset_continual_urb_error (adapter_to_dvobj (adapt));
@@ -524,7 +524,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) precvbuf->pskb =NULL ; precvbuf->reuse = false; -rtw_read_port (adapt, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf); +usb_read_port (adapt, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf); } }else {RT_TRACE (_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete : purb->status(%d) != 0\n" , purb->status));
@@ -553,7 +553,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) haldata->srestpriv.Wifi_Error_Status =USB_READ_PORT_FAIL ; } precvbuf->reuse = true; -rtw_read_port (adapt, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf); +usb_read_port (adapt, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf);break ;case -EINPROGRESS :DBG_88E ("ERROR: URB IS IN PROGRESS!\n" );
@@ -564,7 +564,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) } } -static u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *rmem) +u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *rmem) {struct urb *purb =NULL ;struct recv_buf *precvbuf = (struct recv_buf *)rmem;
@@ -669,7 +669,6 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_read8 = &usb_read8; pops->_read16 = &usb_read16; pops->_read32 = &usb_read32; - pops->_read_port = &usb_read_port; pops->_write8 = &usb_write8; pops->_write16 = &usb_write16; pops->_write32 = &usb_write32;
drivers/staging/rtl8188eu/include/rtw_io.h +1 -5
@@ -50,8 +50,6 @@ struct _io_ops {int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val);int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val);int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val); -u32 (*_read_port)(struct adapter *pintfhdl,u32 addr,u32 cnt, -u8 *pmem);u32 (*_write_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem);void (*_read_port_cancel)(struct adapter *pintfhdl);
@@ -90,7 +88,7 @@ struct io_priv {u8 _rtw_read8 (struct adapter *adapter,u32 addr);u16 _rtw_read16 (struct adapter *adapter,u32 addr);u32 _rtw_read32 (struct adapter *adapter,u32 addr); -void _rtw_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); +u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_read_port_cancel (struct adapter *adapter);int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val);
@@ -104,8 +102,6 @@ void _rtw_write_port_cancel(struct adapter *adapter);#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr))#define rtw_read32 (adapter, addr) _rtw_read32((adapter), (addr)) -#define rtw_read_port (adapter, addr, cnt, mem) \ - _rtw_read_port((adapter), (addr), (cnt), (mem))#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter))#define rtw_write8 (adapter, addr, val) \
drivers/staging/rtl8188eu/os_dep/recv_linux.c +1 -1
@@ -199,7 +199,7 @@ void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf)dev_kfree_skb_any (precvbuf->pskb); precvbuf->pskb =NULL ; precvbuf->reuse = false; -rtw_read_port (padapter, precvpriv->ff_hwaddr,0 , +usb_read_port (padapter, precvpriv->ff_hwaddr,0 , (unsigned char *)precvbuf); }
Signature · 1 line
1.7.10.4
PATCH 9/22 staging: rtl8188eu: Remove function _rtw_read_port_cancel()
In reply to navin patidar_rtw_read_port_cancel() is a wrapper function, being used to call usb_read_port_cancel().
Call usb_read_port_cancel() directly and drop _rtw_read_port_cancel().
--- drivers/staging/rtl8188eu/core/rtw_io.c | 12 ------------ drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 +- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/rtl8188eu/include/rtw_io.h | 4 +--- 4 files changed, 2 insertions(+), 17 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -12
@@ -126,18 +126,6 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -void _rtw_read_port_cancel (struct adapter *adapter) -{ -void (*_read_port_cancel)(struct adapter *pintfhdl); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); - - _read_port_cancel = pintfhdl->io_ops._read_port_cancel; - -if (_read_port_cancel) -_read_port_cancel (adapter); -} -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) {u32 (*_write_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem);
drivers/staging/rtl8188eu/hal/usb_halinit.c +1 -1
@@ -1071,7 +1071,7 @@ static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter) {RT_TRACE (_module_hci_hal_init_c_, _drv_info_, ("\n ===> usb_rx_deinit\n" )); -rtw_read_port_cancel (Adapter); +usb_read_port_cancel (Adapter);RT_TRACE (_module_hci_hal_init_c_, _drv_info_, ("\n <=== usb_rx_deinit\n" ));
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +0 -1
@@ -673,6 +673,5 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_write16 = &usb_write16; pops->_write32 = &usb_write32; pops->_write_port = &usb_write_port; - pops->_read_port_cancel = &usb_read_port_cancel; pops->_write_port_cancel = &usb_write_port_cancel; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -3
@@ -52,7 +52,6 @@ struct _io_ops {int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val);u32 (*_write_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -void (*_read_port_cancel)(struct adapter *pintfhdl);void (*_write_port_cancel)(struct adapter *pintfhdl); };
@@ -89,7 +88,7 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr);u16 _rtw_read16 (struct adapter *adapter,u32 addr);u32 _rtw_read32 (struct adapter *adapter,u32 addr);u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -void _rtw_read_port_cancel (struct adapter *adapter); +void usb_read_port_cancel (struct adapter *adapter);int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val);int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val);
@@ -102,7 +101,6 @@ void _rtw_write_port_cancel(struct adapter *adapter);#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr))#define rtw_read32 (adapter, addr) _rtw_read32((adapter), (addr)) -#define rtw_read_port_cancel (adapter) _rtw_read_port_cancel((adapter))#define rtw_write8 (adapter, addr, val) \ _rtw_write8((adapter), (addr), (val))
Signature · 1 line
1.7.10.4
PATCH 10/22 staging: rtl8188eu: Remove function _rtw_write_port()
In reply to navin patidar_rtw_write_port() is a wrapper function, being used to call usb_write_port(). Call usb_write_port() directly and drop _rtw_write_port().
--- drivers/staging/rtl8188eu/core/rtw_io.c | 16 ---------------- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 ++-- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/rtl8188eu/include/rtw_io.h | 6 +----- 4 files changed, 3 insertions(+), 24 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -16
@@ -126,22 +126,6 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem) -{ -u32 (*_write_port)(struct adapter *pintfhdl,u32 addr,u32 cnt,u8 *pmem); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -u32 ret = _SUCCESS; - - - _write_port = pintfhdl->io_ops._write_port; - - ret =_write_port (adapter, addr, cnt, pmem); - - -return ret; -} -void _rtw_write_port_cancel (struct adapter *adapter) {void (*_write_port_cancel)(struct adapter *pintfhdl);
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +2 -2
@@ -397,7 +397,7 @@ static s32 rtw_dump_xframe(struct adapter *adapt, struct xmit_frame *pxmitframe) } ff_hwaddr =rtw_get_ff_hwaddr (pxmitframe); - inner_ret =rtw_write_port (adapt, ff_hwaddr, w_sz, (unsigned char *)pxmitbuf); + inner_ret =usb_write_port (adapt, ff_hwaddr, w_sz, (unsigned char *)pxmitbuf);rtw_count_tx_stats (adapt, pxmitframe, sz);
@@ -608,7 +608,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp/* 3 4. write xmit buffer to USB FIFO */ ff_hwaddr =rtw_get_ff_hwaddr (pfirstframe); -rtw_write_port (adapt, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf); +usb_write_port (adapt, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf);/* 3 5. update statisitc */ pbuf_tail -= (pfirstframe->agg_num *TXDESC_SIZE );
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +0 -1
@@ -672,6 +672,5 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_write8 = &usb_write8; pops->_write16 = &usb_write16; pops->_write32 = &usb_write32; - pops->_write_port = &usb_write_port; pops->_write_port_cancel = &usb_write_port_cancel; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -5
@@ -50,8 +50,6 @@ struct _io_ops {int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val);int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val);int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val); -u32 (*_write_port)(struct adapter *pintfhdl,u32 addr,u32 cnt, -u8 *pmem);void (*_write_port_cancel)(struct adapter *pintfhdl); };
@@ -95,7 +93,7 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val);int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); -u32 _rtw_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); +u32 usb_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void _rtw_write_port_cancel (struct adapter *adapter);#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))
@@ -108,8 +106,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write16((adapter), (addr), (val))#define rtw_write32 (adapter, addr, val) \ _rtw_write32((adapter), (addr), (val)) -#define rtw_write_port (adapter, addr, cnt, mem) \ - _rtw_write_port((adapter), (addr), (cnt), (mem))#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter))
Signature · 1 line
1.7.10.4
PATCH 11/22 staging: rtl8188eu: Remove function _rtw_write_port_cancel()
In reply to navin patidar_rtw_write_port_cancel() is a wrapper function, being used to call usb_write_port_cancel().
Call usb_write_port_cancel() directly and drop _rtw_write_port_cancel().
--- drivers/staging/rtl8188eu/core/rtw_io.c | 12 ------------ drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/rtl8188eu/include/rtw_io.h | 5 +---- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- 4 files changed, 2 insertions(+), 18 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -12
@@ -126,18 +126,6 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)return RTW_STATUS_CODE (ret); } -void _rtw_write_port_cancel (struct adapter *adapter) -{ -void (*_write_port_cancel)(struct adapter *pintfhdl); -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); - - _write_port_cancel = pintfhdl->io_ops._write_port_cancel; - -if (_write_port_cancel) -_write_port_cancel (adapter); -} -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) {struct io_priv *piopriv = &padapter->iopriv;
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +0 -1
@@ -672,5 +672,4 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_write8 = &usb_write8; pops->_write16 = &usb_write16; pops->_write32 = &usb_write32; - pops->_write_port_cancel = &usb_write_port_cancel; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -4
@@ -50,7 +50,6 @@ struct _io_ops {int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val);int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val);int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val); -void (*_write_port_cancel)(struct adapter *pintfhdl); };struct io_req {
@@ -94,7 +93,7 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val);int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);u32 usb_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -void _rtw_write_port_cancel (struct adapter *adapter); +void usb_write_port_cancel (struct adapter *adapter);#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr))
@@ -106,8 +105,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); _rtw_write16((adapter), (addr), (val))#define rtw_write32 (adapter, addr, val) \ _rtw_write32((adapter), (addr), (val)) -#define rtw_write_port_cancel (adapter) _rtw_write_port_cancel((adapter)) -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops));
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -1
@@ -194,7 +194,7 @@ static void usb_intf_stop(struct adapter *padapter)rtw_hal_inirp_deinit (padapter);/* cancel out irp */ -rtw_write_port_cancel (padapter); +usb_write_port_cancel (padapter);/* todo:cancel other irps */
Signature · 1 line
1.7.10.4
PATCH 12/22 staging: rtl8188eu: Remove function _rtw_write32()
In reply to navin patidar_rtw_write32() is a wrapper function, being used to call usb_write32(). Call usb_write32() directly and drop _rtw_write32().
--- drivers/staging/rtl8188eu/core/rtw_debug.c | 2 +- drivers/staging/rtl8188eu/core/rtw_io.c | 12 --- drivers/staging/rtl8188eu/core/rtw_mp.c | 16 ++-- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 2 +- drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 2 +- drivers/staging/rtl8188eu/hal/odm.c | 4 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 6 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 6 +- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 94 ++++++++++----------- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 3 +- drivers/staging/rtl8188eu/include/rtw_io.h | 5 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 14 +-- 13 files changed, 76 insertions(+), 92 deletions(-)
drivers/staging/rtl8188eu/core/rtw_debug.c +1 -1
@@ -69,7 +69,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,rtw_write16 (padapter, addr, (u16 )val);break ;case 4 : -rtw_write32 (padapter, addr, val); +usb_write32 (padapter, addr, val);break ;default :DBG_88E ("error write length =%d" , len);
drivers/staging/rtl8188eu/core/rtw_io.c +0 -12
@@ -113,18 +113,6 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)return RTW_STATUS_CODE (ret); } -int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val); -int ret; - _write32 = pintfhdl->io_ops._write32; - - ret =_write32 (adapter, addr, val); - -return RTW_STATUS_CODE (ret); -}int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) {
drivers/staging/rtl8188eu/core/rtw_mp.c +8 -8
@@ -56,7 +56,7 @@ void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz)rtw_write16 (padapter, addr, (u16 )val);break ;case 4 : -rtw_write32 (padapter, addr, val); +usb_write32 (padapter, addr, val);break ;default :break ;
@@ -221,7 +221,7 @@ s32 MPT_InitializeAdapter(struct adapter *pAdapter, u8 Channel)/* */ /* Don't accept any packets */ -rtw_write32 (pAdapter,REG_RCR ,0 ); +usb_write32 (pAdapter,REG_RCR ,0 );PHY_IQCalibrate (pAdapter, false);dm_CheckTXPowerTracking (&pHalData->odmpriv);/* trigger thermal meter */
@@ -788,12 +788,12 @@ void SetPacketRx(struct adapter *pAdapter, u8 bStartRx) pHalData->ReceiveConfig |=ACRC32 ; -rtw_write32 (pAdapter,REG_RCR , pHalData->ReceiveConfig); +usb_write32 (pAdapter,REG_RCR , pHalData->ReceiveConfig);/* Accept all data frames */ rtw_write16 (pAdapter,REG_RXFLTMAP2 ,0xFFFF ); }else { -rtw_write32 (pAdapter,REG_RCR ,0 ); +usb_write32 (pAdapter,REG_RCR ,0 ); } }
@@ -805,7 +805,7 @@ void ResetPhyRxPktCount(struct adapter *pAdapter) phyrx_set =0 ; phyrx_set |=_RXERR_RPT_SEL (i);/* select */ phyrx_set |=RXERR_RPT_RST ;/* set counter to zero */ -rtw_write32 (pAdapter,REG_RXERR_RPT , phyrx_set); +usb_write32 (pAdapter,REG_RXERR_RPT , phyrx_set); } }
@@ -815,7 +815,7 @@ static u32 GetPhyRxPktCounts(struct adapter *pAdapter, u32 selbit)u32 phyrx_set =0 , count =0 ; phyrx_set =_RXERR_RPT_SEL (selbit &0xF ); -rtw_write32 (pAdapter,REG_RXERR_RPT , phyrx_set); +usb_write32 (pAdapter,REG_RXERR_RPT , phyrx_set);/* Read packet count */ count =rtw_read32 (pAdapter,REG_RXERR_RPT ) &RXERR_COUNTER_MASK ;
@@ -857,11 +857,11 @@ static u32 rtw_GetPSDData(struct adapter *pAdapter, u32 point) psd_val &=0xFFBFFC00 ; psd_val |= point; -rtw_write32 (pAdapter,0x808 , psd_val); +usb_write32 (pAdapter,0x808 , psd_val);mdelay (1 ); psd_val |=0x00400000 ; -rtw_write32 (pAdapter,0x808 , psd_val); +usb_write32 (pAdapter,0x808 , psd_val);mdelay (1 ); psd_val =rtw_read32 (pAdapter,0x8B4 );
drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c +1 -1
@@ -863,7 +863,7 @@ int rtl8188eu_oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)rtw_write16 (padapter, offset, (u16 )value);break ;case 4 : -rtw_write32 (padapter, offset, value); +usb_write32 (padapter, offset, value);break ;default : status =NDIS_STATUS_NOT_ACCEPTED ;
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c +1 -1
@@ -850,7 +850,7 @@ _PHY_ReloadMACRegisters(for (i =0 ; i < (IQK_MAC_REG_NUM -1 ); i++) {rtw_write8 (adapt, MACReg[i], (u8 )MACBackup[i]); } -rtw_write32 (adapt, MACReg[i], MACBackup[i]); +usb_write32 (adapt, MACReg[i], MACBackup[i]); }void
drivers/staging/rtl8188eu/hal/odm.c +2 -2
@@ -1363,7 +1363,7 @@ void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm)else edca_param = EDCAParam[HT_IOT_PEER_UNKNOWN ][trafficIndex]; -rtw_write32 (Adapter,REG_EDCA_BE_PARAM , edca_param); +usb_write32 (Adapter,REG_EDCA_BE_PARAM , edca_param); pDM_Odm->DM_EDCA_Table.prv_traffic_idx = trafficIndex; }
@@ -1373,7 +1373,7 @@ void odm_EdcaTurboCheckCE(struct odm_dm_struct *pDM_Odm)/* Turn Off EDCA turbo here. */ /* Restore original EDCA according to the declaration of AP. */ if (pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA) { -rtw_write32 (Adapter,REG_EDCA_BE_PARAM , pHalData->AcParam_BE); +usb_write32 (Adapter,REG_EDCA_BE_PARAM , pHalData->AcParam_BE); pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false; } }
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +3 -3
@@ -726,9 +726,9 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state) p2p_ps_offload->NoA1_En =1 ;/* config P2P NoA Descriptor Register */ -rtw_write32 (adapt,REG_NOA_DESC_DURATION , pwdinfo->noa_duration[i]); -rtw_write32 (adapt,REG_NOA_DESC_INTERVAL , pwdinfo->noa_interval[i]); -rtw_write32 (adapt,REG_NOA_DESC_START , pwdinfo->noa_start_time[i]); +usb_write32 (adapt,REG_NOA_DESC_DURATION , pwdinfo->noa_duration[i]); +usb_write32 (adapt,REG_NOA_DESC_INTERVAL , pwdinfo->noa_interval[i]); +usb_write32 (adapt,REG_NOA_DESC_START , pwdinfo->noa_start_time[i]);rtw_write8 (adapt,REG_NOA_DESC_COUNT , pwdinfo->noa_count[i]); }
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +3 -3
@@ -372,7 +372,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter, int data_len)rtw_write8 (Adapter,REG_PKT_BUFF_ACCESS_CTRL ,TXPKT_BUF_SELECT );if (pbuf) {for (addr =0 ; addr < data_cnts; addr++) { -rtw_write32 (Adapter,0x140 , addr); +usb_write32 (Adapter,0x140 , addr);msleep (1 ); loop =0 ; do {
@@ -563,7 +563,7 @@ static s32 _FWFreeToGo(struct adapter *padapter) value32 =rtw_read32 (padapter,REG_MCUFWDL ); value32 |=MCUFWDL_RDY ; value32 &= ~WINTINI_RDY ; -rtw_write32 (padapter,REG_MCUFWDL , value32); +usb_write32 (padapter,REG_MCUFWDL , value32);_8051Reset88E (padapter);
@@ -1903,7 +1903,7 @@ static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)u32 value =_LLT_INIT_ADDR (address) |_LLT_INIT_DATA (data) |_LLT_OP (_LLT_WRITE_ACCESS);u16 LLTReg =REG_LLT_INIT ; -rtw_write32 (padapter, LLTReg, value); +usb_write32 (padapter, LLTReg, value);/* polling */ do {
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +1 -1
@@ -129,7 +129,7 @@ void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u3 Data = ((OriginalValue & (~BitMask)) | (Data << BitShift)); } -rtw_write32 (Adapter, RegAddr, Data); +usb_write32 (Adapter, RegAddr, Data); }
drivers/staging/rtl8188eu/hal/usb_halinit.c +47 -47
277 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +1 -2
@@ -227,7 +227,7 @@ static int usb_write16(struct adapter *adapter, u32 addr, u16 val)return ret; } -static int usb_write32 (struct adapter *adapter,u32 addr,u32 val) +int usb_write32 (struct adapter *adapter,u32 addr,u32 val) {u8 request;u8 requesttype;
@@ -671,5 +671,4 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_read32 = &usb_read32; pops->_write8 = &usb_write8; pops->_write16 = &usb_write16; - pops->_write32 = &usb_write32; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -4
@@ -49,7 +49,6 @@ struct _io_ops {u32 (*_read32)(struct adapter *pintfhdl,u32 addr);int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val);int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val); -int (*_write32)(struct adapter *pintfhdl,u32 addr,u32 val); };struct io_req {
@@ -89,7 +88,7 @@ void usb_read_port_cancel(struct adapter *adapter);int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val);int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val); -int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val); +int usb_write32 (struct adapter *adapter,u32 addr,u32 val);int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);u32 usb_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);
@@ -103,8 +102,6 @@ void usb_write_port_cancel(struct adapter *adapter); _rtw_write8((adapter), (addr), (val))#define rtw_write16 (adapter, addr, val) \ _rtw_write16((adapter), (addr), (val)) -#define rtw_write32 (adapter, addr, val) \ - _rtw_write32((adapter), (addr), (val))int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops));
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +7 -7
@@ -2230,7 +2230,7 @@ static int rtw_wx_write32(struct net_device *dev,DBG_88E (KERN_INFO "%s: addr = 0x%08X data = 0x%04X\n" , __func__, addr, (u16 )data32);break ;case 4 : -rtw_write32 (padapter, addr, data32); +usb_write32 (padapter, addr, data32);DBG_88E (KERN_INFO "%s: addr = 0x%08X data = 0x%08X\n" , __func__, addr, data32);break ;default :
@@ -2376,7 +2376,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 lertw_write16 (padapter, RegRWStruct->offset, (u16 )RegRWStruct->value);break ;case 4 : -rtw_write32 (padapter, RegRWStruct->offset, (u32 )RegRWStruct->value); +usb_write32 (padapter, RegRWStruct->offset, (u32 )RegRWStruct->value);break ;default :break ;
@@ -3948,12 +3948,12 @@ static int rtw_cta_test_start(struct net_device *dev,if (padapter->in_cta_test) {u32 v =rtw_read32 (padapter,REG_RCR ); v &= ~(RCR_CBSSID_DATA |RCR_CBSSID_BCN );/* RCR_ADF */ -rtw_write32 (padapter,REG_RCR , v); +usb_write32 (padapter,REG_RCR , v);DBG_88E ("enable RCR_ADF\n" ); }else {u32 v =rtw_read32 (padapter,REG_RCR ); v |=RCR_CBSSID_DATA |RCR_CBSSID_BCN ;/* RCR_ADF */ -rtw_write32 (padapter,REG_RCR , v); +usb_write32 (padapter,REG_RCR , v);DBG_88E ("disable RCR_ADF\n" ); }return ret;
@@ -4130,8 +4130,8 @@ static int rtw_dbg_port(struct net_device *dev,DBG_88E ("rtw_write16(0x%x) = 0x%04x\n" , arg,rtw_read16 (padapter, arg));break ;case 4 : -rtw_write32 (padapter, arg, extra_arg); -DBG_88E ("rtw_write32(0x%x) = 0x%08x\n" , arg,rtw_read32 (padapter, arg)); +usb_write32 (padapter, arg, extra_arg); +DBG_88E ("usb_write32(0x%x) = 0x%08x\n" , arg,rtw_read32 (padapter, arg));break ; }break ;
@@ -6426,7 +6426,7 @@ static int rtw_mp_write_reg(struct net_device *dev,break ;case 'd' :/* 4 bytes */ -rtw_write32 (padapter, addr, data); +usb_write32 (padapter, addr, data);break ;default : ret = -EINVAL ;
Signature · 1 line
1.7.10.4
PATCH 13/22 staging: rtl8188eu: Remove function _rtw_write16()
In reply to navin patidar_rtw_write16() is a wrapper function, being used to call usb_write16(). Call usb_write16() directly and drop _rtw_write16().
--- drivers/staging/rtl8188eu/core/rtw_debug.c | 2 +- drivers/staging/rtl8188eu/core/rtw_io.c | 13 ---- drivers/staging/rtl8188eu/core/rtw_mp.c | 8 +-- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 2 +- .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 8 +-- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 4 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 76 ++++++++++---------- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 3 +- drivers/staging/rtl8188eu/include/rtw_io.h | 5 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 12 ++-- 12 files changed, 60 insertions(+), 77 deletions(-)
drivers/staging/rtl8188eu/core/rtw_debug.c +1 -1
@@ -66,7 +66,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,rtw_write8 (padapter, addr, (u8 )val);break ;case 2 : -rtw_write16 (padapter, addr, (u16 )val); +usb_write16 (padapter, addr, (u16 )val);break ;case 4 :usb_write32 (padapter, addr, val);
drivers/staging/rtl8188eu/core/rtw_io.c +0 -13
@@ -101,19 +101,6 @@ int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)return RTW_STATUS_CODE (ret); } -int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val); -int ret; - _write16 = pintfhdl->io_ops._write16; - - ret =_write16 (adapter, addr, val); - -return RTW_STATUS_CODE (ret); -} -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) {struct io_priv *piopriv = &padapter->iopriv;
drivers/staging/rtl8188eu/core/rtw_mp.c +4 -4
@@ -53,7 +53,7 @@ void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz)rtw_write8 (padapter, addr, (u8 )val);break ;case 2 : -rtw_write16 (padapter, addr, (u16 )val); +usb_write16 (padapter, addr, (u16 )val);break ;case 4 :usb_write32 (padapter, addr, val);
@@ -234,8 +234,8 @@ s32 MPT_InitializeAdapter(struct adapter *pAdapter, u8 Channel) pMptCtx->backup0x52_RF_B = (u8 )PHY_QueryRFReg (pAdapter,RF_PATH_A , RF_0x52,0x000F0 );/* set ant to wifi side in mp mode */ -rtw_write16 (pAdapter,0x870 ,0x300 ); -rtw_write16 (pAdapter,0x860 ,0x110 ); +usb_write16 (pAdapter,0x870 ,0x300 ); +usb_write16 (pAdapter,0x860 ,0x110 );if (pAdapter->registrypriv.mp_mode ==1 ) pmlmepriv->fw_state =WIFI_MP_STATE ;
@@ -791,7 +791,7 @@ void SetPacketRx(struct adapter *pAdapter, u8 bStartRx)usb_write32 (pAdapter,REG_RCR , pHalData->ReceiveConfig);/* Accept all data frames */ -rtw_write16 (pAdapter,REG_RXFLTMAP2 ,0xFFFF ); +usb_write16 (pAdapter,REG_RXFLTMAP2 ,0xFFFF ); }else {usb_write32 (pAdapter,REG_RCR ,0 ); }
drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c +1 -1
@@ -860,7 +860,7 @@ int rtl8188eu_oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) status =NDIS_STATUS_NOT_ACCEPTED ;break ; } -rtw_write16 (padapter, offset, (u16 )value); +usb_write16 (padapter, offset, (u16 )value);break ;case 4 :usb_write32 (padapter, offset, value);
drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c +1 -1
@@ -670,7 +670,7 @@ void ODM_RA_Set_TxRPT_Time(struct odm_dm_struct *dm_odm, u16 minRptTime) {struct adapter *adapt = dm_odm->Adapter; -rtw_write16 (adapt,REG_TX_RPT_TIME , minRptTime); +usb_write16 (adapt,REG_TX_RPT_TIME , minRptTime); }void ODM_RA_TxRPT2Handle_8188E (struct odm_dm_struct *dm_odm,u8 *TxRPT_Buf,u16 TxRPT_Len,u32 macid_entry0,u32 macid_entry1)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +1 -1
@@ -615,7 +615,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)if (mstatus ==1 ) {/* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */ /* Suggested by filen. Added by tynli. */ -rtw_write16 (adapt,REG_BCN_PSR_RPT , (0xC000 |pmlmeinfo->aid)); +usb_write16 (adapt,REG_BCN_PSR_RPT , (0xC000 |pmlmeinfo->aid));/* Do not set TSF again here or vWiFi beacon DMA INT will not work. */ /* Set REG_CR bit 8. DMA beacon by SW. */
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +4 -4
@@ -236,7 +236,7 @@ static void efuse_read_phymap_from_txpktbuf( dbg_addr = bcnhead*128 /8 ;/* 8-bytes addressing */ while (1 ) { -rtw_write16 (adapter,REG_PKTBUF_DBG_ADDR , dbg_addr+i); +usb_write16 (adapter,REG_PKTBUF_DBG_ADDR , dbg_addr+i);rtw_write8 (adapter,REG_TXPKTBUF_DBG ,0 ); start = jiffies;
@@ -766,20 +766,20 @@ hal_EfusePowerSwitch_RTL8188E( tmpV16 =rtw_read16 (pAdapter,REG_SYS_ISO_CTRL );if (!(tmpV16 &PWC_EV12V )) { tmpV16 |=PWC_EV12V ; -rtw_write16 (pAdapter,REG_SYS_ISO_CTRL , tmpV16); +usb_write16 (pAdapter,REG_SYS_ISO_CTRL , tmpV16); }/* Reset: 0x0000h[28], default valid */ tmpV16 =rtw_read16 (pAdapter,REG_SYS_FUNC_EN );if (!(tmpV16 &FEN_ELDR )) { tmpV16 |=FEN_ELDR ; -rtw_write16 (pAdapter,REG_SYS_FUNC_EN , tmpV16); +usb_write16 (pAdapter,REG_SYS_FUNC_EN , tmpV16); }/* Clock: Gated(0x0008h[5]) 8M(0x0008h[1]) clock from ANA, default valid */ tmpV16 =rtw_read16 (pAdapter,REG_SYS_CLKR );if ((!(tmpV16 &LOADER_CLK_EN )) || (!(tmpV16 &ANA8M ))) { tmpV16 |= (LOADER_CLK_EN |ANA8M ); -rtw_write16 (pAdapter,REG_SYS_CLKR , tmpV16); +usb_write16 (pAdapter,REG_SYS_CLKR , tmpV16); }if (bWrite) {
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +2 -2
@@ -386,7 +386,7 @@ s32 PHY_MACConfig8188E(struct adapter *Adapter) rtStatus = _FAIL;/* 2010.07.13 AMPDU aggregation number B */ -rtw_write16 (Adapter,REG_MAX_AGGR_NUM ,MAX_AGGR_NUM ); +usb_write16 (Adapter,REG_MAX_AGGR_NUM ,MAX_AGGR_NUM );return rtStatus; }
@@ -604,7 +604,7 @@ PHY_BBConfig8188E(/* Enable BB and RF */ RegVal =rtw_read16 (Adapter,REG_SYS_FUNC_EN ); -rtw_write16 (Adapter,REG_SYS_FUNC_EN , (u16)(RegVal|BIT13 |BIT0 |BIT1 )); +usb_write16 (Adapter,REG_SYS_FUNC_EN , (u16)(RegVal|BIT13 |BIT0 |BIT1 ));/* 20090923 Joseph: Advised by Steven and Jenyu. Power sequence before init RF. */
drivers/staging/rtl8188eu/hal/usb_halinit.c +38 -38
239 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +1 -2
@@ -201,7 +201,7 @@ static int usb_write8(struct adapter *adapter, u32 addr, u8 val)return ret; } -static int usb_write16 (struct adapter *adapter,u32 addr,u16 val) +int usb_write16 (struct adapter *adapter,u32 addr,u16 val) {u8 request;u8 requesttype;
@@ -670,5 +670,4 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_read16 = &usb_read16; pops->_read32 = &usb_read32; pops->_write8 = &usb_write8; - pops->_write16 = &usb_write16; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -4
@@ -48,7 +48,6 @@ struct _io_ops {u16 (*_read16)(struct adapter *pintfhdl,u32 addr);u32 (*_read32)(struct adapter *pintfhdl,u32 addr);int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val); -int (*_write16)(struct adapter *pintfhdl,u32 addr,u16 val); };struct io_req {
@@ -87,7 +86,7 @@ u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);void usb_read_port_cancel (struct adapter *adapter);int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val); -int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val); +int usb_write16 (struct adapter *adapter,u32 addr,u16 val);int usb_write32 (struct adapter *adapter,u32 addr,u32 val);int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);
@@ -100,8 +99,6 @@ void usb_write_port_cancel(struct adapter *adapter);#define rtw_write8 (adapter, addr, val) \ _rtw_write8((adapter), (addr), (val)) -#define rtw_write16 (adapter, addr, val) \ - _rtw_write16((adapter), (addr), (val))int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops));
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +6 -6
@@ -2226,7 +2226,7 @@ static int rtw_wx_write32(struct net_device *dev,DBG_88E (KERN_INFO "%s: addr = 0x%08X data = 0x%02X\n" , __func__, addr, (u8 )data32);break ;case 2 : -rtw_write16 (padapter, addr, (u16 )data32); +usb_write16 (padapter, addr, (u16 )data32);DBG_88E (KERN_INFO "%s: addr = 0x%08X data = 0x%04X\n" , __func__, addr, (u16 )data32);break ;case 4 :
@@ -2373,7 +2373,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 lertw_write8 (padapter, RegRWStruct->offset, (u8 )RegRWStruct->value);break ;case 2 : -rtw_write16 (padapter, RegRWStruct->offset, (u16 )RegRWStruct->value); +usb_write16 (padapter, RegRWStruct->offset, (u16 )RegRWStruct->value);break ;case 4 :usb_write32 (padapter, RegRWStruct->offset, (u32 )RegRWStruct->value);
@@ -4126,8 +4126,8 @@ static int rtw_dbg_port(struct net_device *dev,DBG_88E ("rtw_write8(0x%x) = 0x%02x\n" , arg,rtw_read8 (padapter, arg));break ;case 2 : -rtw_write16 (padapter, arg, extra_arg); -DBG_88E ("rtw_write16(0x%x) = 0x%04x\n" , arg,rtw_read16 (padapter, arg)); +usb_write16 (padapter, arg, extra_arg); +DBG_88E ("usb_write16(0x%x) = 0x%04x\n" , arg,rtw_read16 (padapter, arg));break ;case 4 :usb_write32 (padapter, arg, extra_arg);
@@ -4311,7 +4311,7 @@ static int rtw_dbg_port(struct net_device *dev, value = value |0x10 ; write_value = value | (value <<5 ); -rtw_write16 (padapter,0x6d9 , write_value); +usb_write16 (padapter,0x6d9 , write_value); }break ;case 0x7a :
@@ -6422,7 +6422,7 @@ static int rtw_mp_write_reg(struct net_device *dev, ret = -EINVAL ;break ; } -rtw_write16 (padapter, addr, data); +usb_write16 (padapter, addr, data);break ;case 'd' :/* 4 bytes */
Signature · 1 line
1.7.10.4
PATCH 14/22 staging: rtl8188eu: Remove function _rtw_write8()
In reply to navin patidar_rtw_write8() is a wrapper function, being used to call usb_write8(). Call usb_write8() directly and drop _rtw_write8().
--- drivers/staging/rtl8188eu/core/rtw_debug.c | 2 +- drivers/staging/rtl8188eu/core/rtw_efuse.c | 26 +-- drivers/staging/rtl8188eu/core/rtw_io.c | 13 -- drivers/staging/rtl8188eu/core/rtw_mp.c | 6 +- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 2 +- drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 18 +- drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c | 2 +- drivers/staging/rtl8188eu/hal/hal_com.c | 2 +- drivers/staging/rtl8188eu/hal/odm.c | 2 +- drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 28 +-- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 58 +++--- drivers/staging/rtl8188eu/hal/rtl8188e_mp.c | 32 +-- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 10 +- drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 8 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 216 ++++++++++---------- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 3 +- drivers/staging/rtl8188eu/include/rtw_io.h | 6 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 14 +- 21 files changed, 218 insertions(+), 236 deletions(-)
drivers/staging/rtl8188eu/core/rtw_debug.c +1 -1
@@ -63,7 +63,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer, }switch (len) {case 1 : -rtw_write8 (padapter, addr, (u8 )val); +usb_write8 (padapter, addr, (u8 )val);break ;case 2 :usb_write16 (padapter, addr, (u16 )val);
drivers/staging/rtl8188eu/core/rtw_efuse.c +13 -13
@@ -181,13 +181,13 @@ ReadEFuseByte( }/* Write Address */ -rtw_write8 (Adapter,EFUSE_CTRL +1 , (_offset &0xff )); +usb_write8 (Adapter,EFUSE_CTRL +1 , (_offset &0xff )); readbyte =rtw_read8 (Adapter,EFUSE_CTRL +2 ); -rtw_write8 (Adapter,EFUSE_CTRL +2 , ((_offset >>8 ) &0x03 ) | (readbyte &0xfc )); +usb_write8 (Adapter,EFUSE_CTRL +2 , ((_offset >>8 ) &0x03 ) | (readbyte &0xfc ));/* Write bit 32 0 */ readbyte =rtw_read8 (Adapter,EFUSE_CTRL +3 ); -rtw_write8 (Adapter,EFUSE_CTRL +3 , (readbyte &0x7f )); +usb_write8 (Adapter,EFUSE_CTRL +3 , (readbyte &0x7f ));/* Check bit 32 read-ready */ retry =0 ;
@@ -263,16 +263,16 @@ u8 EFUSE_Read1Byte(struct adapter *Adapter, u16 Address)if (Address < contentLen) {/* E-fuse 512Byte */ /* Write E-fuse Register address bit0~7 */ temp = Address &0xFF ; -rtw_write8 (Adapter,EFUSE_CTRL +1 , temp); +usb_write8 (Adapter,EFUSE_CTRL +1 , temp); Bytetemp =rtw_read8 (Adapter,EFUSE_CTRL +2 );/* Write E-fuse Register address bit8~9 */ temp = ((Address >>8 ) &0x03 ) | (Bytetemp &0xFC ); -rtw_write8 (Adapter,EFUSE_CTRL +2 , temp); +usb_write8 (Adapter,EFUSE_CTRL +2 , temp);/* Write 0x30[31]= 0 */ Bytetemp =rtw_read8 (Adapter,EFUSE_CTRL +3 ); temp = Bytetemp &0x7F ; -rtw_write8 (Adapter,EFUSE_CTRL +3 , temp); +usb_write8 (Adapter,EFUSE_CTRL +3 , temp);/* Wait Write-ready (0x30[31]= 1) */ Bytetemp =rtw_read8 (Adapter,EFUSE_CTRL +3 );
@@ -304,11 +304,11 @@ u8 efuse_OneByteRead(struct adapter *pAdapter, u16 addr, u8 *data, bool pseudo) }/* -----------------e-fuse reg ctrl --------------------------------- */ /* address */ -rtw_write8 (pAdapter,EFUSE_CTRL +1 , (u8)(addr &0xff )); -rtw_write8 (pAdapter,EFUSE_CTRL +2 , ((u8)((addr>>8 ) &0x03 )) | +usb_write8 (pAdapter,EFUSE_CTRL +1 , (u8)(addr &0xff )); +usb_write8 (pAdapter,EFUSE_CTRL +2 , ((u8)((addr>>8 ) &0x03 )) | (rtw_read8 (pAdapter,EFUSE_CTRL +2 ) &0xFC )); -rtw_write8 (pAdapter,EFUSE_CTRL +3 ,0x72 );/* read cmd */ +usb_write8 (pAdapter,EFUSE_CTRL +3 ,0x72 );/* read cmd */ while (!(0x80 &rtw_read8 (pAdapter,EFUSE_CTRL +3 )) && (tmpidx <100 )) tmpidx++;
@@ -335,13 +335,13 @@ u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, bool pseudo)/* -----------------e-fuse reg ctrl --------------------------------- */ /* address */ -rtw_write8 (pAdapter,EFUSE_CTRL +1 , (u8)(addr&0xff )); -rtw_write8 (pAdapter,EFUSE_CTRL +2 , +usb_write8 (pAdapter,EFUSE_CTRL +1 , (u8)(addr&0xff )); +usb_write8 (pAdapter,EFUSE_CTRL +2 , (rtw_read8 (pAdapter,EFUSE_CTRL +2 ) &0xFC ) | (u8)((addr>>8 ) &0x03 )); -rtw_write8 (pAdapter,EFUSE_CTRL , data);/* data */ +usb_write8 (pAdapter,EFUSE_CTRL , data);/* data */ -rtw_write8 (pAdapter,EFUSE_CTRL +3 ,0xF2 );/* write cmd */ +usb_write8 (pAdapter,EFUSE_CTRL +3 ,0xF2 );/* write cmd */ while ((0x80 &rtw_read8 (pAdapter,EFUSE_CTRL +3 )) && (tmpidx <100 )) tmpidx++;
drivers/staging/rtl8188eu/core/rtw_io.c +0 -13
@@ -88,19 +88,6 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr)return r_val; } -int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val) -{ -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val); -int ret; - _write8 = pintfhdl->io_ops._write8; - - ret =_write8 (adapter, addr, val); - -return RTW_STATUS_CODE (ret); -} -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) {struct io_priv *piopriv = &padapter->iopriv;
drivers/staging/rtl8188eu/core/rtw_mp.c +3 -3
@@ -50,7 +50,7 @@ void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz) {switch (sz) {case 1 : -rtw_write8 (padapter, addr, (u8 )val); +usb_write8 (padapter, addr, (u8 )val);break ;case 2 :usb_write16 (padapter, addr, (u16 )val);
@@ -304,7 +304,7 @@ static void disable_dm(struct adapter *padapter)/* disable Power Training, Rate Adaptive */ v8 =rtw_read8 (padapter,REG_BCN_CTRL ); v8 &= ~EN_BCN_FUNCTION ; -rtw_write8 (padapter,REG_BCN_CTRL , v8); +usb_write8 (padapter,REG_BCN_CTRL , v8);/* 3 2. disable driver dynamic mechanism */ /* disable Dynamic Initial Gain */
@@ -423,7 +423,7 @@ end_of_mp_start_test:/* set MSR to WIFI_FW_ADHOC_STATE */ val8 =rtw_read8 (padapter,MSR ) &0xFC ;/* 0x0102 */ val8 |=WIFI_FW_ADHOC_STATE ; -rtw_write8 (padapter,MSR , val8);/* Link in ad hoc network */ +usb_write8 (padapter,MSR , val8);/* Link in ad hoc network */ }return res; }
drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c +1 -1
@@ -853,7 +853,7 @@ int rtl8188eu_oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) status =NDIS_STATUS_NOT_ACCEPTED ;break ; } -rtw_write8 (padapter, offset, (u8 )value); +usb_write8 (padapter, offset, (u8 )value);break ;case 2 :if (value >0xFFFF ) {
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c +9 -9
@@ -848,7 +848,7 @@ _PHY_ReloadMACRegisters(ODM_RT_TRACE (dm_odm,ODM_COMP_CALIBRATION ,ODM_DBG_LOUD , ("Reload MAC parameters !\n" ));for (i =0 ; i < (IQK_MAC_REG_NUM -1 ); i++) { -rtw_write8 (adapt, MACReg[i], (u8 )MACBackup[i]); +usb_write8 (adapt, MACReg[i], (u8 )MACBackup[i]); }usb_write32 (adapt, MACReg[i], MACBackup[i]); }
@@ -892,12 +892,12 @@ _PHY_MACSettingCalibration(ODM_RT_TRACE (dm_odm,ODM_COMP_CALIBRATION ,ODM_DBG_LOUD , ("MAC settings for Calibration.\n" )); -rtw_write8 (adapt, MACReg[i],0x3F ); +usb_write8 (adapt, MACReg[i],0x3F );for (i =1 ; i < (IQK_MAC_REG_NUM -1 ); i++) { -rtw_write8 (adapt, MACReg[i], (u8)(MACBackup[i]&(~BIT3 ))); +usb_write8 (adapt, MACReg[i], (u8)(MACBackup[i]&(~BIT3 ))); } -rtw_write8 (adapt, MACReg[i], (u8)(MACBackup[i]&(~BIT5 ))); +usb_write8 (adapt, MACReg[i], (u8)(MACBackup[i]&(~BIT5 ))); }void
@@ -1208,9 +1208,9 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t) tmpreg =rtw_read8 (adapt,0xd03 );if ((tmpreg&0x70 ) !=0 )/* Deal with contisuous TX case */ -rtw_write8 (adapt,0xd03 , tmpreg&0x8F );/* disable all continuous TX */ +usb_write8 (adapt,0xd03 , tmpreg&0x8F );/* disable all continuous TX */ else /* Deal with Packet TX case */ -rtw_write8 (adapt,REG_TXPAUSE ,0xFF );/* block all queues */ +usb_write8 (adapt,REG_TXPAUSE ,0xFF );/* block all queues */ if ((tmpreg&0x70 ) !=0 ) {/* 1. Read original RF mode */
@@ -1242,7 +1242,7 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t)if ((tmpreg&0x70 ) !=0 ) {/* Deal with continuous TX case */ /* Path-A */ -rtw_write8 (adapt,0xd03 , tmpreg); +usb_write8 (adapt,0xd03 , tmpreg);PHY_SetRFReg (adapt,RF_PATH_A ,RF_AC , bMask12Bits, RF_Amode);/* Path-B */
@@ -1250,7 +1250,7 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t)PHY_SetRFReg (adapt,RF_PATH_B ,RF_AC , bMask12Bits, RF_Bmode); }else {/* Deal with Packet TX case */ -rtw_write8 (adapt,REG_TXPAUSE ,0x00 ); +usb_write8 (adapt,REG_TXPAUSE ,0x00 ); } }
@@ -1447,7 +1447,7 @@ static void phy_setrfpathswitch_8188e(struct adapter *adapt, bool main, bool is2if (!adapt->hw_init_completed) {u8 u1btmp; u1btmp =rtw_read8 (adapt,REG_LEDCFG2 ) |BIT7 ; -rtw_write8 (adapt,REG_LEDCFG2 , u1btmp); +usb_write8 (adapt,REG_LEDCFG2 , u1btmp);PHY_SetBBReg (adapt, rFPGA0_XAB_RFParameter,BIT13 ,0x01 ); }
drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c +1 -1
@@ -86,7 +86,7 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 cut_vers, u8 fab_vers, value |= (GET_PWR_CFG_VALUE (pwrcfgcmd) &GET_PWR_CFG_MASK (pwrcfgcmd));/* Write the value back to system register */ -rtw_write8 (padapter, offset, value); +usb_write8 (padapter, offset, value);break ;case PWR_CMD_POLLING :RT_TRACE (_module_hal_init_c_ , _drv_info_, ("HalPwrSeqCmdParsing: PWR_CMD_POLLING\n" ));
drivers/staging/rtl8188eu/hal/hal_com.c +1 -1
@@ -328,7 +328,7 @@ void hal_init_macaddr(struct adapter *adapter)void c2h_evt_clear (struct adapter *adapter) { -rtw_write8 (adapter,REG_C2HEVT_CLEAR ,C2H_EVT_HOST_CLOSE ); +usb_write8 (adapter,REG_C2HEVT_CLEAR ,C2H_EVT_HOST_CLOSE ); }s32 c2h_evt_read (struct adapter *adapter,u8 *buf)
drivers/staging/rtl8188eu/hal/odm.c +1 -1
@@ -833,7 +833,7 @@ void ODM_Write_CCK_CCA_Thres(struct odm_dm_struct *pDM_Odm, u8 CurCCK_CCAThres)struct adapter *adapt = pDM_Odm->Adapter;if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres)/* modify by Guo.Mingzhi 2012-01-03 */ -rtw_write8 (adapt,ODM_REG_CCK_CCA_11N , CurCCK_CCAThres); +usb_write8 (adapt,ODM_REG_CCK_CCA_11N , CurCCK_CCAThres); pDM_DigTable->PreCCK_CCAThres = pDM_DigTable->CurCCK_CCAThres; pDM_DigTable->CurCCK_CCAThres = CurCCK_CCAThres; }
drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c +1 -1
@@ -68,7 +68,7 @@ void odm_ConfigMAC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u8 Data) {struct adapter *adapt = pDM_Odm->Adapter; -rtw_write8 (adapt, Addr, Data); +usb_write8 (adapt, Addr, Data);ODM_RT_TRACE (pDM_Odm,ODM_COMP_INIT ,ODM_DBG_TRACE , ("===> ODM_ConfigMACWithHeaderFile: [MAC_REG] %08X %08X\n" , Addr, Data)); }
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +14 -14
@@ -106,13 +106,13 @@ static s32 FillH2CCmd_88E(struct adapter *adapt, u8 ElementID, u32 CmdLen, u8 *p/* Write Ext command */ msgbox_ex_addr =REG_HMEBOX_EXT_0 + (h2c_box_num *RTL88E_EX_MESSAGE_BOX_SIZE );for (cmd_idx =0 ; cmd_idx < ext_cmd_len; cmd_idx++) { -rtw_write8 (adapt, msgbox_ex_addr+cmd_idx, *((u8 *)(&h2c_cmd_ex)+cmd_idx)); +usb_write8 (adapt, msgbox_ex_addr+cmd_idx, *((u8 *)(&h2c_cmd_ex)+cmd_idx)); } }/* Write command */ msgbox_addr =REG_HMEBOX_0 + (h2c_box_num *RTL88E_MESSAGE_BOX_SIZE );for (cmd_idx =0 ; cmd_idx <RTL88E_MESSAGE_BOX_SIZE ; cmd_idx++) { -rtw_write8 (adapt, msgbox_addr+cmd_idx, *((u8 *)(&h2c_cmd)+cmd_idx)); +usb_write8 (adapt, msgbox_addr+cmd_idx, *((u8 *)(&h2c_cmd)+cmd_idx)); } bcmd_down = true;
@@ -620,13 +620,13 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)/* Set REG_CR bit 8. DMA beacon by SW. */ haldata->RegCR_1 |=BIT0 ; -rtw_write8 (adapt,REG_CR +1 , haldata->RegCR_1); +usb_write8 (adapt,REG_CR +1 , haldata->RegCR_1);/* Disable Hw protection for a time which revserd for Hw sending beacon. */ /* Fix download reserved page packet fail that access collision with the protection time. */ /* 2010.05.11. Added by tynli. */ -rtw_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )&(~BIT (3 ))); -rtw_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )|BIT (4 )); +usb_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )&(~BIT (3 ))); +usb_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )|BIT (4 ));if (haldata->RegFwHwTxQCtrl&BIT6 ) {DBG_88E ("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n" );
@@ -634,7 +634,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus) }/* Set FWHW_TXQ_CTRL 0x422[6]=0 to tell Hw the packet is not a real beacon frame. */ -rtw_write8 (adapt,REG_FWHW_TXQ_CTRL +2 , (haldata->RegFwHwTxQCtrl&(~BIT6 ))); +usb_write8 (adapt,REG_FWHW_TXQ_CTRL +2 , (haldata->RegFwHwTxQCtrl&(~BIT6 ))); haldata->RegFwHwTxQCtrl &= (~BIT6 );/* Clear beacon valid check bit. */
@@ -668,8 +668,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)/* */ /* Enable Bcn */ -rtw_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )|BIT (3 )); -rtw_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )&(~BIT (4 ))); +usb_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )|BIT (3 )); +usb_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )&(~BIT (4 )));/* To make sure that if there exists an adapter which would like to send beacon. */ /* If exists, the origianl value of 0x422[6] will be 1, we should check this to */
@@ -677,7 +677,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)/* the beacon cannot be sent by HW. */ /* 2010.06.23. Added by tynli. */ if (bSendBeacon) { -rtw_write8 (adapt,REG_FWHW_TXQ_CTRL +2 , (haldata->RegFwHwTxQCtrl|BIT6 )); +usb_write8 (adapt,REG_FWHW_TXQ_CTRL +2 , (haldata->RegFwHwTxQCtrl|BIT6 )); haldata->RegFwHwTxQCtrl |=BIT6 ; }
@@ -690,7 +690,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)/* Do not enable HW DMA BCN or it will cause Pcie interface hang by timing issue. 2011.11.24. by tynli. */ /* Clear CR[8] or beacon packet will not be send to TxBuf anymore. */ haldata->RegCR_1 &= (~BIT0 ); -rtw_write8 (adapt,REG_CR +1 , haldata->RegCR_1); +usb_write8 (adapt,REG_CR +1 , haldata->RegCR_1); } }
@@ -713,13 +713,13 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)/* update CTWindow value. */ if (pwdinfo->ctwindow >0 ) { p2p_ps_offload->CTWindow_En =1 ; -rtw_write8 (adapt,REG_P2P_CTWIN , pwdinfo->ctwindow); +usb_write8 (adapt,REG_P2P_CTWIN , pwdinfo->ctwindow); }/* hw only support 2 set of NoA */ for (i =0 ; i < pwdinfo->noa_num; i++) {/* To control the register setting for which NOA */ -rtw_write8 (adapt,REG_NOA_DESC_SEL , (i <<4 )); +usb_write8 (adapt,REG_NOA_DESC_SEL , (i <<4 ));if (i ==0 ) p2p_ps_offload->NoA0_En =1 ;else
@@ -729,12 +729,12 @@ void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *adapt, u8 p2p_ps_state)usb_write32 (adapt,REG_NOA_DESC_DURATION , pwdinfo->noa_duration[i]);usb_write32 (adapt,REG_NOA_DESC_INTERVAL , pwdinfo->noa_interval[i]);usb_write32 (adapt,REG_NOA_DESC_START , pwdinfo->noa_start_time[i]); -rtw_write8 (adapt,REG_NOA_DESC_COUNT , pwdinfo->noa_count[i]); +usb_write8 (adapt,REG_NOA_DESC_COUNT , pwdinfo->noa_count[i]); }if ((pwdinfo->opp_ps ==1 ) || (pwdinfo->noa_num >0 )) {/* rst p2p circuit */ -rtw_write8 (adapt,REG_DUAL_TSF_RST ,BIT (4 )); +usb_write8 (adapt,REG_DUAL_TSF_RST ,BIT (4 )); p2p_ps_offload->Offload_En =1 ;
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +1 -1
@@ -39,7 +39,7 @@ static void dm_InitGPIOSetting(struct adapter *Adapter) tmp1byte =rtw_read8 (Adapter,REG_GPIO_MUXCFG ); tmp1byte &= (GPIOSEL_GPIO | ~GPIOSEL_ENBT ); -rtw_write8 (Adapter,REG_GPIO_MUXCFG , tmp1byte); +usb_write8 (Adapter,REG_GPIO_MUXCFG , tmp1byte); }/* */
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +29 -29
199 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/rtl8188e_mp.c +16 -16
@@ -201,23 +201,23 @@ void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, bool beven) CCK_index =32 ;/* Adjust CCK according to gain index */ if (!pDM_Odm->RFCalibrateInfo.bCCKinCH14) { -rtw_write8 (pAdapter,0xa22 , CCKSwingTable_Ch1_Ch13[CCK_index][0 ]); -rtw_write8 (pAdapter,0xa23 , CCKSwingTable_Ch1_Ch13[CCK_index][1 ]); -rtw_write8 (pAdapter,0xa24 , CCKSwingTable_Ch1_Ch13[CCK_index][2 ]); -rtw_write8 (pAdapter,0xa25 , CCKSwingTable_Ch1_Ch13[CCK_index][3 ]); -rtw_write8 (pAdapter,0xa26 , CCKSwingTable_Ch1_Ch13[CCK_index][4 ]); -rtw_write8 (pAdapter,0xa27 , CCKSwingTable_Ch1_Ch13[CCK_index][5 ]); -rtw_write8 (pAdapter,0xa28 , CCKSwingTable_Ch1_Ch13[CCK_index][6 ]); -rtw_write8 (pAdapter,0xa29 , CCKSwingTable_Ch1_Ch13[CCK_index][7 ]); +usb_write8 (pAdapter,0xa22 , CCKSwingTable_Ch1_Ch13[CCK_index][0 ]); +usb_write8 (pAdapter,0xa23 , CCKSwingTable_Ch1_Ch13[CCK_index][1 ]); +usb_write8 (pAdapter,0xa24 , CCKSwingTable_Ch1_Ch13[CCK_index][2 ]); +usb_write8 (pAdapter,0xa25 , CCKSwingTable_Ch1_Ch13[CCK_index][3 ]); +usb_write8 (pAdapter,0xa26 , CCKSwingTable_Ch1_Ch13[CCK_index][4 ]); +usb_write8 (pAdapter,0xa27 , CCKSwingTable_Ch1_Ch13[CCK_index][5 ]); +usb_write8 (pAdapter,0xa28 , CCKSwingTable_Ch1_Ch13[CCK_index][6 ]); +usb_write8 (pAdapter,0xa29 , CCKSwingTable_Ch1_Ch13[CCK_index][7 ]); }else { -rtw_write8 (pAdapter,0xa22 , CCKSwingTable_Ch14[CCK_index][0 ]); -rtw_write8 (pAdapter,0xa23 , CCKSwingTable_Ch14[CCK_index][1 ]); -rtw_write8 (pAdapter,0xa24 , CCKSwingTable_Ch14[CCK_index][2 ]); -rtw_write8 (pAdapter,0xa25 , CCKSwingTable_Ch14[CCK_index][3 ]); -rtw_write8 (pAdapter,0xa26 , CCKSwingTable_Ch14[CCK_index][4 ]); -rtw_write8 (pAdapter,0xa27 , CCKSwingTable_Ch14[CCK_index][5 ]); -rtw_write8 (pAdapter,0xa28 , CCKSwingTable_Ch14[CCK_index][6 ]); -rtw_write8 (pAdapter,0xa29 , CCKSwingTable_Ch14[CCK_index][7 ]); +usb_write8 (pAdapter,0xa22 , CCKSwingTable_Ch14[CCK_index][0 ]); +usb_write8 (pAdapter,0xa23 , CCKSwingTable_Ch14[CCK_index][1 ]); +usb_write8 (pAdapter,0xa24 , CCKSwingTable_Ch14[CCK_index][2 ]); +usb_write8 (pAdapter,0xa25 , CCKSwingTable_Ch14[CCK_index][3 ]); +usb_write8 (pAdapter,0xa26 , CCKSwingTable_Ch14[CCK_index][4 ]); +usb_write8 (pAdapter,0xa27 , CCKSwingTable_Ch14[CCK_index][5 ]); +usb_write8 (pAdapter,0xa28 , CCKSwingTable_Ch14[CCK_index][6 ]); +usb_write8 (pAdapter,0xa29 , CCKSwingTable_Ch14[CCK_index][7 ]); } } }
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +5 -5
@@ -608,9 +608,9 @@ PHY_BBConfig8188E(/* 20090923 Joseph: Advised by Steven and Jenyu. Power sequence before init RF. */ -rtw_write8 (Adapter,REG_RF_CTRL ,RF_EN |RF_RSTB |RF_SDMRSTB ); +usb_write8 (Adapter,REG_RF_CTRL ,RF_EN |RF_RSTB |RF_SDMRSTB ); -rtw_write8 (Adapter,REG_SYS_FUNC_EN ,FEN_USBA |FEN_USBD | FEN_BB_GLB_RSTn |FEN_BBRSTB ); +usb_write8 (Adapter,REG_SYS_FUNC_EN ,FEN_USBA |FEN_USBD | FEN_BB_GLB_RSTn |FEN_BBRSTB );/* Config BB and AGC */ rtStatus =phy_BB8188E_Config_ParaFile (Adapter);
@@ -799,14 +799,14 @@ _PHY_SetBWMode92C(case HT_CHANNEL_WIDTH_20 : regBwOpMode |=BW_OPMODE_20MHZ ;/* 2007/02/07 Mark by Emily because we have not verify whether this register works */ -rtw_write8 (Adapter,REG_BWOPMODE , regBwOpMode); +usb_write8 (Adapter,REG_BWOPMODE , regBwOpMode);break ;case HT_CHANNEL_WIDTH_40 : regBwOpMode &= ~BW_OPMODE_20MHZ ;/* 2007/02/07 Mark by Emily because we have not verify whether this register works */ -rtw_write8 (Adapter,REG_BWOPMODE , regBwOpMode); +usb_write8 (Adapter,REG_BWOPMODE , regBwOpMode); regRRSR_RSC = (regRRSR_RSC&0x90 ) | (pHalData->nCur40MhzPrimeSC<<5 ); -rtw_write8 (Adapter,REG_RRSR +2 , regRRSR_RSC); +usb_write8 (Adapter,REG_RRSR +2 , regRRSR_RSC);break ;default :break ;
drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +1 -1
@@ -366,7 +366,7 @@ static void writeOFDMPowerReg88E(struct adapter *Adapter, u8 index, u32 *pValue) writeVal = (writeVal >8 ) ? (writeVal-8 ) :0 ; else writeVal = (writeVal >6 ) ? (writeVal-6 ) :0 ; -rtw_write8 (Adapter, (u32)(regoffset+i), (u8 )writeVal); +usb_write8 (Adapter, (u32)(regoffset+i), (u8 )writeVal); } } }
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c +4 -4
@@ -35,7 +35,7 @@ void SwLedOn(struct adapter *padapter, struct LED_871x *pLed)if (padapter->bSurpriseRemoved || padapter->bDriverStopped)return ; LedCfg =rtw_read8 (padapter,REG_LEDCFG2 ); -rtw_write8 (padapter,REG_LEDCFG2 , (LedCfg&0xf0 )|BIT5 |BIT6 );/* SW control led0 on. */ +usb_write8 (padapter,REG_LEDCFG2 , (LedCfg&0xf0 )|BIT5 |BIT6 );/* SW control led0 on. */ pLed->bLedOn = true; }
@@ -54,12 +54,12 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)if (pHalData->bLedOpenDrain) {/* Open-drain arrangement for controlling the LED) */ LedCfg &=0x90 ;/* Set to software control. */ -rtw_write8 (padapter,REG_LEDCFG2 , (LedCfg|BIT3 )); +usb_write8 (padapter,REG_LEDCFG2 , (LedCfg|BIT3 )); LedCfg =rtw_read8 (padapter,REG_MAC_PINMUX_CFG ); LedCfg &=0xFE ; -rtw_write8 (padapter,REG_MAC_PINMUX_CFG , LedCfg); +usb_write8 (padapter,REG_MAC_PINMUX_CFG , LedCfg); }else { -rtw_write8 (padapter,REG_LEDCFG2 , (LedCfg|BIT3 |BIT5 |BIT6 )); +usb_write8 (padapter,REG_LEDCFG2 , (LedCfg|BIT3 |BIT5 |BIT6 )); } exit: pLed->bLedOn = false;
drivers/staging/rtl8188eu/hal/usb_halinit.c +108 -108
603 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +1 -2
@@ -181,7 +181,7 @@ static u32 usb_read32(struct adapter *adapter, u32 addr)return le32_to_cpu (data); } -static int usb_write8 (struct adapter *adapter,u32 addr,u8 val) +int usb_write8 (struct adapter *adapter,u32 addr,u8 val) {u8 request;u8 requesttype;
@@ -669,5 +669,4 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) pops->_read8 = &usb_read8; pops->_read16 = &usb_read16; pops->_read32 = &usb_read32; - pops->_write8 = &usb_write8; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -5
@@ -47,7 +47,6 @@ struct _io_ops {u8 (*_read8)(struct adapter *pintfhdl,u32 addr);u16 (*_read16)(struct adapter *pintfhdl,u32 addr);u32 (*_read32)(struct adapter *pintfhdl,u32 addr); -int (*_write8)(struct adapter *pintfhdl,u32 addr,u8 val); };struct io_req {
@@ -85,7 +84,7 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr);u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void usb_read_port_cancel (struct adapter *adapter); -int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val); +int usb_write8 (struct adapter *adapter,u32 addr,u8 val);int usb_write16 (struct adapter *adapter,u32 addr,u16 val);int usb_write32 (struct adapter *adapter,u32 addr,u32 val);int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata);
@@ -97,9 +96,6 @@ void usb_write_port_cancel(struct adapter *adapter);#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr))#define rtw_read32 (adapter, addr) _rtw_read32((adapter), (addr)) -#define rtw_write8 (adapter, addr, val) \ - _rtw_write8((adapter), (addr), (val)) -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops));
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +7 -7
@@ -2222,7 +2222,7 @@ static int rtw_wx_write32(struct net_device *dev,switch (bytes) {case 1 : -rtw_write8 (padapter, addr, (u8 )data32); +usb_write8 (padapter, addr, (u8 )data32);DBG_88E (KERN_INFO "%s: addr = 0x%08X data = 0x%02X\n" , __func__, addr, (u8 )data32);break ;case 2 :
@@ -2370,7 +2370,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le RegRWStruct = (struct mp_rw_reg *)pdata;switch (RegRWStruct->width) {case 1 : -rtw_write8 (padapter, RegRWStruct->offset, (u8 )RegRWStruct->value); +usb_write8 (padapter, RegRWStruct->offset, (u8 )RegRWStruct->value);break ;case 2 :usb_write16 (padapter, RegRWStruct->offset, (u16 )RegRWStruct->value);
@@ -4122,8 +4122,8 @@ static int rtw_dbg_port(struct net_device *dev,case 0x71 :/* write_reg */ switch (minor_cmd) {case 1 : -rtw_write8 (padapter, arg, extra_arg); -DBG_88E ("rtw_write8(0x%x) = 0x%02x\n" , arg,rtw_read8 (padapter, arg)); +usb_write8 (padapter, arg, extra_arg); +DBG_88E ("usb_write8(0x%x) = 0x%02x\n" , arg,rtw_read8 (padapter, arg));break ;case 2 :usb_write16 (padapter, arg, extra_arg);
@@ -4576,9 +4576,9 @@ static int rtw_dbg_port(struct net_device *dev,break ;case 0xfd : -rtw_write8 (padapter,0xc50 , arg); +usb_write8 (padapter,0xc50 , arg);DBG_88E ("wr(0xc50) = 0x%x\n" ,rtw_read8 (padapter,0xc50 )); -rtw_write8 (padapter,0xc58 , arg); +usb_write8 (padapter,0xc58 , arg);DBG_88E ("wr(0xc58) = 0x%x\n" ,rtw_read8 (padapter,0xc58 ));break ;case 0xfe :
@@ -6414,7 +6414,7 @@ static int rtw_mp_write_reg(struct net_device *dev, ret = -EINVAL ;break ; } -rtw_write8 (padapter, addr, data); +usb_write8 (padapter, addr, data);break ;case 'w' :/* 2 bytes */
Signature · 1 line
1.7.10.4
PATCH 15/22 staging: rtl8188eu: Remove function _rtw_read32()
In reply to navin patidar_rtw_read32() is a wrapper function, being used to call usb_read32(). Call usb_read32() directly and drop _rtw_read32().
--- drivers/staging/rtl8188eu/core/rtw_debug.c | 14 ++--- drivers/staging/rtl8188eu/core/rtw_efuse.c | 6 +- drivers/staging/rtl8188eu/core/rtw_io.c | 12 ---- drivers/staging/rtl8188eu/core/rtw_mp.c | 8 +-- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 2 +- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8188eu/core/rtw_sreset.c | 2 +- .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 8 +-- drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 2 +- drivers/staging/rtl8188eu/hal/odm.c | 8 +-- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 20 +++---- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 4 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 36 ++++++------ drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 3 +- drivers/staging/rtl8188eu/include/rtw_io.h | 4 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 58 ++++++++++---------- 16 files changed, 87 insertions(+), 102 deletions(-)
drivers/staging/rtl8188eu/core/rtw_debug.c +7 -7
@@ -104,7 +104,7 @@ int proc_get_read_reg(char *page, char **start, len +=snprintf (page + len, count - len,"rtw_read16(0x%x)=0x%x\n" , proc_get_read_addr,rtw_read16 (padapter, proc_get_read_addr));break ;case 4 : - len +=snprintf (page + len, count - len,"rtw_read32(0x%x)=0x%x\n" , proc_get_read_addr,rtw_read32 (padapter, proc_get_read_addr)); + len +=snprintf (page + len, count - len,"usb_read32(0x%x)=0x%x\n" , proc_get_read_addr,usb_read32 (padapter, proc_get_read_addr));break ;default : len +=snprintf (page + len, count - len,"error read length=%d\n" , proc_get_read_len);
@@ -326,7 +326,7 @@ int proc_get_mac_reg_dump1(char *page, char **start,for (i =0x0 ; i <0x300 ; i +=4 ) {if (j%4 ==1 ) len +=snprintf (page + len, count - len,"0x%02x" , i); - len +=snprintf (page + len, count - len," 0x%08x " ,rtw_read32 (padapter, i)); + len +=snprintf (page + len, count - len," 0x%08x " ,usb_read32 (padapter, i));if ((j++)%4 ==0 ) len +=snprintf (page + len, count - len,"\n" ); }
@@ -349,7 +349,7 @@ int proc_get_mac_reg_dump2(char *page, char **start,for (i =0x300 ; i <0x600 ; i +=4 ) {if (j%4 ==1 ) len +=snprintf (page + len, count - len,"0x%02x" , i); - len +=snprintf (page + len, count - len," 0x%08x " ,rtw_read32 (padapter, i)); + len +=snprintf (page + len, count - len," 0x%08x " ,usb_read32 (padapter, i));if ((j++)%4 ==0 ) len +=snprintf (page + len, count - len,"\n" ); }
@@ -372,7 +372,7 @@ int proc_get_mac_reg_dump3(char *page, char **start,for (i =0x600 ; i <0x800 ; i +=4 ) {if (j%4 ==1 ) len +=snprintf (page + len, count - len,"0x%02x" , i); - len +=snprintf (page + len, count - len," 0x%08x " ,rtw_read32 (padapter, i)); + len +=snprintf (page + len, count - len," 0x%08x " ,usb_read32 (padapter, i));if ((j++)%4 ==0 ) len +=snprintf (page + len, count - len,"\n" ); }
@@ -394,7 +394,7 @@ int proc_get_bb_reg_dump1(char *page, char **start,for (i =0x800 ; i <0xB00 ; i +=4 ) {if (j%4 ==1 ) len +=snprintf (page + len, count - len,"0x%02x" , i); - len +=snprintf (page + len, count - len," 0x%08x " ,rtw_read32 (padapter, i)); + len +=snprintf (page + len, count - len," 0x%08x " ,usb_read32 (padapter, i));if ((j++)%4 ==0 ) len +=snprintf (page + len, count - len,"\n" ); }
@@ -415,7 +415,7 @@ int proc_get_bb_reg_dump2(char *page, char **start,for (i =0xB00 ; i <0xE00 ; i +=4 ) {if (j%4 ==1 ) len +=snprintf (page + len, count - len,"0x%02x" , i); - len +=snprintf (page + len, count - len," 0x%08x " ,rtw_read32 (padapter, i)); + len +=snprintf (page + len, count - len," 0x%08x " ,usb_read32 (padapter, i));if ((j++)%4 ==0 ) len +=snprintf (page + len, count - len,"\n" ); }
@@ -436,7 +436,7 @@ int proc_get_bb_reg_dump3(char *page, char **start,for (i =0xE00 ; i <0x1000 ; i +=4 ) {if (j%4 ==1 ) len +=snprintf (page + len, count - len,"0x%02x" , i); - len +=snprintf (page + len, count - len," 0x%08x " ,rtw_read32 (padapter, i)); + len +=snprintf (page + len, count - len," 0x%08x " ,usb_read32 (padapter, i));if ((j++)%4 ==0 ) len +=snprintf (page + len, count - len,"\n" ); }
drivers/staging/rtl8188eu/core/rtw_efuse.c +3 -3
@@ -191,9 +191,9 @@ ReadEFuseByte(/* Check bit 32 read-ready */ retry =0 ; - value32 =rtw_read32 (Adapter,EFUSE_CTRL ); + value32 =usb_read32 (Adapter,EFUSE_CTRL );while (!(((value32 >>24 ) &0xff ) &0x80 ) && (retry <10000 )) { - value32 =rtw_read32 (Adapter,EFUSE_CTRL ); + value32 =usb_read32 (Adapter,EFUSE_CTRL ); retry++; }
@@ -202,7 +202,7 @@ ReadEFuseByte(/* Designer says that there shall be some delay after ready bit is set, or the */ /* result will always stay on last data we read. */ udelay (50 ); - value32 =rtw_read32 (Adapter,EFUSE_CTRL ); + value32 =usb_read32 (Adapter,EFUSE_CTRL ); *pbuf = (u8)(value32 &0xff ); }
drivers/staging/rtl8188eu/core/rtw_io.c +0 -12
@@ -76,18 +76,6 @@ u16 _rtw_read16(struct adapter *adapter, u32 addr)return r_val; } -u32 _rtw_read32 (struct adapter *adapter,u32 addr) -{ -u32 r_val; -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -u32 (*_read32)(struct adapter *pintfhdl,u32 addr); - _read32 = pintfhdl->io_ops._read32; - - r_val =_read32 (adapter, addr); -return r_val; -} -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) {struct io_priv *piopriv = &padapter->iopriv;
drivers/staging/rtl8188eu/core/rtw_mp.c +4 -4
@@ -36,7 +36,7 @@ u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz) val =rtw_read16 (padapter, addr);break ;case 4 : - val =rtw_read32 (padapter, addr); + val =usb_read32 (padapter, addr);break ;default : val =0xffffffff ;
@@ -818,7 +818,7 @@ static u32 GetPhyRxPktCounts(struct adapter *pAdapter, u32 selbit)usb_write32 (pAdapter,REG_RXERR_RPT , phyrx_set);/* Read packet count */ - count =rtw_read32 (pAdapter,REG_RXERR_RPT ) &RXERR_COUNTER_MASK ; + count =usb_read32 (pAdapter,REG_RXERR_RPT ) &RXERR_COUNTER_MASK ;return count; }
@@ -853,7 +853,7 @@ static u32 rtw_GetPSDData(struct adapter *pAdapter, u32 point)int psd_val; - psd_val =rtw_read32 (pAdapter,0x808 ); + psd_val =usb_read32 (pAdapter,0x808 ); psd_val &=0xFFBFFC00 ; psd_val |= point;
@@ -863,7 +863,7 @@ static u32 rtw_GetPSDData(struct adapter *pAdapter, u32 point)usb_write32 (pAdapter,0x808 , psd_val);mdelay (1 ); - psd_val =rtw_read32 (pAdapter,0x8B4 ); + psd_val =usb_read32 (pAdapter,0x8B4 ); psd_val &=0x0000FFFF ;
drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c +1 -1
@@ -808,7 +808,7 @@ int rtl8188eu_oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)break ;default : width =4 ; - RegRWStruct->value =rtw_read32 (Adapter, offset); + RegRWStruct->value =usb_read32 (Adapter, offset);break ; } RT_TRACE(_module_mp_, _drv_notice_,
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +1 -1
@@ -203,7 +203,7 @@ int ips_leave(struct adapter *padapter) } } -DBG_88E ("==> ips_leave.....LED(0x%08x)...\n" ,rtw_read32 (padapter,0x4c )); +DBG_88E ("==> ips_leave.....LED(0x%08x)...\n" ,usb_read32 (padapter,0x4c )); pwrpriv->bips_processing = false; pwrpriv->bkeepfwalive = false;
drivers/staging/rtl8188eu/core/rtw_sreset.c +1 -1
@@ -36,7 +36,7 @@ u8 sreset_get_wifi_status(struct adapter *padapter)u8 status =WIFI_STATUS_SUCCESS ;u32 val32 =0 ; - val32 =rtw_read32 (padapter,REG_TXDMA_STATUS ); + val32 =usb_read32 (padapter,REG_TXDMA_STATUS );if (val32 ==0xeaeaeaea ) { psrtpriv->Wifi_Error_Status =WIFI_IF_NOT_EXIST ; }else if (val32 !=0 ) {
drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c +4 -4
@@ -358,19 +358,19 @@ static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_inf pRaInfo->RAUseRate = (pRaInfo->RateMask)&0x0000000d ;break ;case 12 : - MaskFromReg =rtw_read32 (adapt,REG_ARFR0 ); + MaskFromReg =usb_read32 (adapt,REG_ARFR0 ); pRaInfo->RAUseRate = (pRaInfo->RateMask)&MaskFromReg;break ;case 13 : - MaskFromReg =rtw_read32 (adapt,REG_ARFR1 ); + MaskFromReg =usb_read32 (adapt,REG_ARFR1 ); pRaInfo->RAUseRate = (pRaInfo->RateMask)&MaskFromReg;break ;case 14 : - MaskFromReg =rtw_read32 (adapt,REG_ARFR2 ); + MaskFromReg =usb_read32 (adapt,REG_ARFR2 ); pRaInfo->RAUseRate = (pRaInfo->RateMask)&MaskFromReg;break ;case 15 : - MaskFromReg =rtw_read32 (adapt,REG_ARFR3 ); + MaskFromReg =usb_read32 (adapt,REG_ARFR3 ); pRaInfo->RAUseRate = (pRaInfo->RateMask)&MaskFromReg;break ;default :
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c +1 -1
@@ -821,7 +821,7 @@ static void _PHY_SaveMACRegisters(for (i =0 ; i < (IQK_MAC_REG_NUM -1 ); i++) { MACBackup[i] =rtw_read8 (adapt, MACReg[i]); } - MACBackup[i] =rtw_read32 (adapt, MACReg[i]); + MACBackup[i] =usb_read32 (adapt, MACReg[i]); }static void reload_adda_reg (struct adapter *adapt,u32 *ADDAReg,u32 *ADDABackup,u32 RegiesterNum)
drivers/staging/rtl8188eu/hal/odm.c +4 -4
@@ -1291,10 +1291,10 @@ void ODM_EdcaTurboInit(struct odm_dm_struct *pDM_Odm) pDM_Odm->DM_EDCA_Table.bIsCurRDLState = false; Adapter->recvpriv.bIsAnyNonBEPkts = false; -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , ("Orginial VO PARAM: 0x%x\n" ,rtw_read32 (Adapter,ODM_EDCA_VO_PARAM ))); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , ("Orginial VI PARAM: 0x%x\n" ,rtw_read32 (Adapter,ODM_EDCA_VI_PARAM ))); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , ("Orginial BE PARAM: 0x%x\n" ,rtw_read32 (Adapter,ODM_EDCA_BE_PARAM ))); -ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , ("Orginial BK PARAM: 0x%x\n" ,rtw_read32 (Adapter,ODM_EDCA_BK_PARAM ))); +ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , ("Orginial VO PARAM: 0x%x\n" ,usb_read32 (Adapter,ODM_EDCA_VO_PARAM ))); +ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , ("Orginial VI PARAM: 0x%x\n" ,usb_read32 (Adapter,ODM_EDCA_VI_PARAM ))); +ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , ("Orginial BE PARAM: 0x%x\n" ,usb_read32 (Adapter,ODM_EDCA_BE_PARAM ))); +ODM_RT_TRACE (pDM_Odm,ODM_COMP_EDCA_TURBO ,ODM_DBG_LOUD , ("Orginial BK PARAM: 0x%x\n" ,usb_read32 (Adapter,ODM_EDCA_BK_PARAM ))); }/* ODM_InitEdcaTurbo */ void odm_EdcaTurboCheck (struct odm_dm_struct *pDM_Odm)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +10 -10
@@ -246,8 +246,8 @@ static void efuse_read_phymap_from_txpktbuf(msleep (1 ); } - lo32 =rtw_read32 (adapter,REG_PKTBUF_DBG_DATA_L ); - hi32 =rtw_read32 (adapter,REG_PKTBUF_DBG_DATA_H ); + lo32 =usb_read32 (adapter,REG_PKTBUF_DBG_DATA_L ); + hi32 =usb_read32 (adapter,REG_PKTBUF_DBG_DATA_H );if (i ==0 ) {u8 lenc[2 ];
@@ -376,12 +376,12 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter, int data_len)msleep (1 ); loop =0 ; do { - rstatus = (reg_140 = rtw_read32(Adapter, REG_PKTBUF_DBG_CTRL)&BIT24); + rstatus = (reg_140 = usb_read32(Adapter, REG_PKTBUF_DBG_CTRL)&BIT24); if (rstatus) { - fifo_data = rtw_read32(Adapter, REG_PKTBUF_DBG_DATA_L); + fifo_data = usb_read32(Adapter, REG_PKTBUF_DBG_DATA_L); memcpy(pbuf+(addr*8), &fifo_data, 4); - fifo_data = rtw_read32(Adapter, REG_PKTBUF_DBG_DATA_H); + fifo_data = usb_read32(Adapter, REG_PKTBUF_DBG_DATA_H); memcpy(pbuf+(addr*8+4), &fifo_data, 4); } msleep(1);
@@ -549,7 +549,7 @@ static s32 _FWFreeToGo(struct adapter *padapter)/* polling CheckSum report */ do { - value32 =rtw_read32 (padapter,REG_MCUFWDL ); + value32 =usb_read32 (padapter,REG_MCUFWDL );if (value32 & FWDL_ChkSum_rpt)break ; }while (counter++ <POLLING_READY_TIMEOUT_COUNT );
@@ -560,7 +560,7 @@ static s32 _FWFreeToGo(struct adapter *padapter) }DBG_88E ("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n" , __func__, value32); - value32 =rtw_read32 (padapter,REG_MCUFWDL ); + value32 =usb_read32 (padapter,REG_MCUFWDL ); value32 |=MCUFWDL_RDY ; value32 &= ~WINTINI_RDY ;usb_write32 (padapter,REG_MCUFWDL , value32);
@@ -570,7 +570,7 @@ static s32 _FWFreeToGo(struct adapter *padapter)/* polling for FW ready */ counter =0 ; do { - value32 = rtw_read32(padapter, REG_MCUFWDL); + value32 = usb_read32(padapter, REG_MCUFWDL); if (value32 & WINTINI_RDY) { DBG_88E("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __func__, value32); return _SUCCESS;
@@ -1743,7 +1743,7 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) pHalData =GET_HAL_DATA (padapter); - value32 =rtw_read32 (padapter,REG_SYS_CFG ); + value32 =usb_read32 (padapter,REG_SYS_CFG ); ChipVersion.ICType =CHIP_8188E ; ChipVersion.ChipType = ((value32 &RTL_ID ) ?TEST_CHIP :NORMAL_CHIP );
@@ -1907,7 +1907,7 @@ static s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)/* polling */ do { - value = rtw_read32(padapter, LLTReg); + value = usb_read32(padapter, LLTReg); if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value)) break;
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +2 -2
@@ -94,7 +94,7 @@ rtl8188e_PHY_QueryBBReg( {u32 ReturnValue =0 , OriginalValue, BitShift; - OriginalValue =rtw_read32 (Adapter, RegAddr); + OriginalValue =usb_read32 (Adapter, RegAddr); BitShift =phy_CalculateBitShift (BitMask); ReturnValue = (OriginalValue & BitMask) >> BitShift;return ReturnValue;
@@ -124,7 +124,7 @@ void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u3u32 OriginalValue, BitShift;if (BitMask != bMaskDWord) {/* if not "double word" write */ - OriginalValue =rtw_read32 (Adapter, RegAddr); + OriginalValue =usb_read32 (Adapter, RegAddr); BitShift =phy_CalculateBitShift (BitMask); Data = ((OriginalValue & (~BitMask)) | (Data << BitShift)); }
drivers/staging/rtl8188eu/hal/usb_halinit.c +18 -18
@@ -341,7 +341,7 @@ static void _InitNetworkType(struct adapter *Adapter) {u32 value32; - value32 =rtw_read32 (Adapter,REG_CR ); + value32 =usb_read32 (Adapter,REG_CR );/* TODO: use the other function to set network type */ value32 = (value32 & ~MASK_NETTYPE ) |_NETTYPE (NT_LINK_AP );
@@ -385,7 +385,7 @@ static void _InitAdaptiveCtrl(struct adapter *Adapter)u32 value32;/* Response Rate Set */ - value32 =rtw_read32 (Adapter,REG_RRSR ); + value32 =usb_read32 (Adapter,REG_RRSR ); value32 &= ~RATE_BITMAP_ALL ; value32 |=RATE_RRSR_CCK_ONLY_1M ;usb_write32 (Adapter,REG_RRSR , value32);
@@ -469,7 +469,7 @@ static void usb_AggSettingTxUpdate(struct adapter *Adapter) haldata->UsbTxAggMode = false;if (haldata->UsbTxAggMode) { - value32 =rtw_read32 (Adapter,REG_TDECTRL ); + value32 =usb_read32 (Adapter,REG_TDECTRL ); value32 = value32 & ~(BLK_DESC_NUM_MASK <<BLK_DESC_NUM_SHIFT ); value32 |= ((haldata->UsbTxAggDescNum &BLK_DESC_NUM_MASK ) <<BLK_DESC_NUM_SHIFT );
@@ -633,7 +633,7 @@ static void _InitAntenna_Selection(struct adapter *Adapter)return ;DBG_88E ("==> %s ....\n" , __func__); -usb_write32 (Adapter,REG_LEDCFG0 ,rtw_read32 (Adapter,REG_LEDCFG0 )|BIT23 ); +usb_write32 (Adapter,REG_LEDCFG0 ,usb_read32 (Adapter,REG_LEDCFG0 )|BIT23 );PHY_SetBBReg (Adapter, rFPGA0_XAB_RFParameter,BIT13 ,0x01 );if (PHY_QueryBBReg (Adapter, rFPGA0_XA_RFInterfaceOE,0x300 ) == Antenna_A)
@@ -931,7 +931,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK);usb_write8 (Adapter,REG_USB_HRPWM ,0 );/* ack for xmit mgmt frames. */ -usb_write32 (Adapter,REG_FWHW_TXQ_CTRL ,rtw_read32 (Adapter,REG_FWHW_TXQ_CTRL )|BIT (12 )); +usb_write32 (Adapter,REG_FWHW_TXQ_CTRL ,usb_read32 (Adapter,REG_FWHW_TXQ_CTRL )|BIT (12 )); exit:HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_END );
@@ -1421,11 +1421,11 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)break ;case HW_VAR_CHECK_BSSID :if (*((u8 *)val)) { -usb_write32 (Adapter,REG_RCR ,rtw_read32 (Adapter,REG_RCR )|RCR_CBSSID_DATA |RCR_CBSSID_BCN ); +usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR )|RCR_CBSSID_DATA |RCR_CBSSID_BCN ); }else {u32 val32; - val32 =rtw_read32 (Adapter,REG_RCR ); + val32 =usb_read32 (Adapter,REG_RCR ); val32 &= ~(RCR_CBSSID_DATA |RCR_CBSSID_BCN );
@@ -1446,7 +1446,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)case HW_VAR_MLME_SITESURVEY :if (*((u8 *)val)) {/* under sitesurvey */ /* config RCR to receive different BSSID & not to receive data frame */ -u32 v =rtw_read32 (Adapter,REG_RCR ); +u32 v =usb_read32 (Adapter,REG_RCR ); v &= ~(RCR_CBSSID_BCN );usb_write32 (Adapter,REG_RCR , v);/* reject all data frame */
@@ -1471,14 +1471,14 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)usb_write8 (Adapter,REG_BCN_CTRL ,rtw_read8 (Adapter,REG_BCN_CTRL )&(~BIT (4 ))); }if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE ) { -usb_write32 (Adapter,REG_RCR ,rtw_read32 (Adapter,REG_RCR )|RCR_CBSSID_BCN ); +usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR )|RCR_CBSSID_BCN ); }else {if (Adapter->in_cta_test) { -u32 v =rtw_read32 (Adapter,REG_RCR ); +u32 v =usb_read32 (Adapter,REG_RCR ); v &= ~(RCR_CBSSID_DATA |RCR_CBSSID_BCN );/* RCR_ADF */ usb_write32 (Adapter,REG_RCR , v); }else { -usb_write32 (Adapter,REG_RCR ,rtw_read32 (Adapter,REG_RCR )|RCR_CBSSID_BCN ); +usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR )|RCR_CBSSID_BCN ); } } }
@@ -1494,11 +1494,11 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)usb_write16 (Adapter,REG_RXFLTMAP2 ,0xFFFF );if (Adapter->in_cta_test) { -u32 v =rtw_read32 (Adapter,REG_RCR ); +u32 v =usb_read32 (Adapter,REG_RCR ); v &= ~(RCR_CBSSID_DATA |RCR_CBSSID_BCN );/* RCR_ADF */ usb_write32 (Adapter,REG_RCR , v); }else { -usb_write32 (Adapter,REG_RCR ,rtw_read32 (Adapter,REG_RCR )|RCR_CBSSID_DATA |RCR_CBSSID_BCN ); +usb_write32 (Adapter,REG_RCR ,usb_read32 (Adapter,REG_RCR )|RCR_CBSSID_DATA |RCR_CBSSID_BCN ); }if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ))
@@ -1805,9 +1805,9 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)if (!pwrpriv->bkeepfwalive) {/* RX DMA stop */ -usb_write32 (Adapter,REG_RXPKT_NUM , (rtw_read32 (Adapter,REG_RXPKT_NUM )|RW_RELEASE_EN )); +usb_write32 (Adapter,REG_RXPKT_NUM , (usb_read32 (Adapter,REG_RXPKT_NUM )|RW_RELEASE_EN ));do { -if (!(rtw_read32 (Adapter,REG_RXPKT_NUM )&RXDMA_IDLE )) +if (!(usb_read32 (Adapter,REG_RXPKT_NUM )&RXDMA_IDLE ))break ; }while (trycnt--);if (trycnt ==0 )
@@ -1875,7 +1875,7 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) val[0 ] = true; }else {u32 valRCR; - valRCR =rtw_read32 (Adapter,REG_RCR ); + valRCR =usb_read32 (Adapter,REG_RCR ); valRCR &=0x00070000 ;if (valRCR) val[0 ] = false;
@@ -1894,7 +1894,7 @@ static void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) *val = haldata->bMacPwrCtrlOn;break ;case HW_VAR_CHK_HI_QUEUE_EMPTY : - *val = ((rtw_read32 (Adapter,REG_HGQ_INFORMATION )&0x0000ff00 ) ==0 ) ? true : false; + *val = ((usb_read32 (Adapter,REG_HGQ_INFORMATION )&0x0000ff00 ) ==0 ) ? true : false;break ;default :break ;
@@ -2169,7 +2169,7 @@ static void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt)usb_write8 (adapt,REG_SLOT ,0x09 ); - value32 =rtw_read32 (adapt,REG_TCR ); + value32 =usb_read32 (adapt,REG_TCR ); value32 &= ~TSFRST ;usb_write32 (adapt,REG_TCR , value32);
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +1 -2
@@ -158,7 +158,7 @@ static u16 usb_read16(struct adapter *adapter, u32 addr)return (u16)(le32_to_cpu (data)&0xffff ); } -static u32 usb_read32 (struct adapter *adapter,u32 addr) +u32 usb_read32 (struct adapter *adapter,u32 addr) {u8 request;u8 requesttype;
@@ -668,5 +668,4 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)_rtw_memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); pops->_read8 = &usb_read8; pops->_read16 = &usb_read16; - pops->_read32 = &usb_read32; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -3
@@ -46,7 +46,6 @@ struct intf_hdl;struct _io_ops {u8 (*_read8)(struct adapter *pintfhdl,u32 addr);u16 (*_read16)(struct adapter *pintfhdl,u32 addr); -u32 (*_read32)(struct adapter *pintfhdl,u32 addr); };struct io_req {
@@ -80,7 +79,7 @@ struct io_priv {u8 _rtw_read8 (struct adapter *adapter,u32 addr);u16 _rtw_read16 (struct adapter *adapter,u32 addr); -u32 _rtw_read32 (struct adapter *adapter,u32 addr); +u32 usb_read32 (struct adapter *adapter,u32 addr);u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void usb_read_port_cancel (struct adapter *adapter);
@@ -94,7 +93,6 @@ void usb_write_port_cancel(struct adapter *adapter);#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr)) -#define rtw_read32 (adapter, addr) _rtw_read32((adapter), (addr))int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops));
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +29 -29
148 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 16/22 staging: rtl8188eu: Remove function _rtw_read16()
In reply to navin patidar_rtw_read16() is a wrapper function, being used to call usb_read16(). Call usb_read16() directly and drop _rtw_read16().
--- drivers/staging/rtl8188eu/core/rtw_debug.c | 2 +- drivers/staging/rtl8188eu/core/rtw_io.c | 12 ------------ drivers/staging/rtl8188eu/core/rtw_mp.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 8 ++++---- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 2 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +++++----- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 3 +-- drivers/staging/rtl8188eu/include/rtw_io.h | 4 +--- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 12 ++++++------ 10 files changed, 21 insertions(+), 36 deletions(-)
drivers/staging/rtl8188eu/core/rtw_debug.c +1 -1
@@ -101,7 +101,7 @@ int proc_get_read_reg(char *page, char **start, len +=snprintf (page + len, count - len,"rtw_read8(0x%x)=0x%x\n" , proc_get_read_addr,rtw_read8 (padapter, proc_get_read_addr));break ;case 2 : - len +=snprintf (page + len, count - len,"rtw_read16(0x%x)=0x%x\n" , proc_get_read_addr,rtw_read16 (padapter, proc_get_read_addr)); + len +=snprintf (page + len, count - len,"usb_read16(0x%x)=0x%x\n" , proc_get_read_addr,usb_read16 (padapter, proc_get_read_addr));break ;case 4 : len +=snprintf (page + len, count - len,"usb_read32(0x%x)=0x%x\n" , proc_get_read_addr,usb_read32 (padapter, proc_get_read_addr));
drivers/staging/rtl8188eu/core/rtw_io.c +0 -12
@@ -64,18 +64,6 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr)return r_val; } -u16 _rtw_read16 (struct adapter *adapter,u32 addr) -{ -u16 r_val; -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -u16 (*_read16)(struct adapter *pintfhdl,u32 addr); - _read16 = pintfhdl->io_ops._read16; - - r_val =_read16 (adapter, addr); -return r_val; -} -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) {struct io_priv *piopriv = &padapter->iopriv;
drivers/staging/rtl8188eu/core/rtw_mp.c +1 -1
@@ -33,7 +33,7 @@ u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz) val =rtw_read8 (padapter, addr);break ;case 2 : - val =rtw_read16 (padapter, addr); + val =usb_read16 (padapter, addr);break ;case 4 : val =usb_read32 (padapter, addr);
drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c +1 -1
@@ -804,7 +804,7 @@ int rtl8188eu_oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv) RegRWStruct->value =rtw_read8 (Adapter, offset);break ;case 2 : - RegRWStruct->value =rtw_read16 (Adapter, offset); + RegRWStruct->value =usb_read16 (Adapter, offset);break ;default : width =4 ;
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +4 -4
@@ -763,20 +763,20 @@ hal_EfusePowerSwitch_RTL8188E(usb_write8 (pAdapter,REG_EFUSE_ACCESS ,EFUSE_ACCESS_ON );/* 1.2V Power: From VDDON with Power Cut(0x0000h[15]), defualt valid */ - tmpV16 =rtw_read16 (pAdapter,REG_SYS_ISO_CTRL ); + tmpV16 =usb_read16 (pAdapter,REG_SYS_ISO_CTRL );if (!(tmpV16 &PWC_EV12V )) { tmpV16 |=PWC_EV12V ;usb_write16 (pAdapter,REG_SYS_ISO_CTRL , tmpV16); }/* Reset: 0x0000h[28], default valid */ - tmpV16 =rtw_read16 (pAdapter,REG_SYS_FUNC_EN ); + tmpV16 =usb_read16 (pAdapter,REG_SYS_FUNC_EN );if (!(tmpV16 &FEN_ELDR )) { tmpV16 |=FEN_ELDR ;usb_write16 (pAdapter,REG_SYS_FUNC_EN , tmpV16); }/* Clock: Gated(0x0008h[5]) 8M(0x0008h[1]) clock from ANA, default valid */ - tmpV16 =rtw_read16 (pAdapter,REG_SYS_CLKR ); + tmpV16 =usb_read16 (pAdapter,REG_SYS_CLKR );if ((!(tmpV16 &LOADER_CLK_EN )) || (!(tmpV16 &ANA8M ))) { tmpV16 |= (LOADER_CLK_EN |ANA8M );usb_write16 (pAdapter,REG_SYS_CLKR , tmpV16);
@@ -1882,7 +1882,7 @@ u8 GetEEPROMSize8188E(struct adapter *padapter)u8 size =0 ;u32 cr; - cr =rtw_read16 (padapter,REG_9346CR ); + cr =usb_read16 (padapter,REG_9346CR );/* 6: EEPROM used is 93C46, 4: boot from E-Fuse. */ size = (cr &BOOT_FROM_EEPROM ) ?6 :4 ;
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +1 -1
@@ -603,7 +603,7 @@ PHY_BBConfig8188E(/* Enable BB and RF */ - RegVal =rtw_read16 (Adapter,REG_SYS_FUNC_EN ); + RegVal =usb_read16 (Adapter,REG_SYS_FUNC_EN );usb_write16 (Adapter,REG_SYS_FUNC_EN , (u16)(RegVal|BIT13 |BIT0 |BIT1 ));/* 20090923 Joseph: Advised by Steven and Jenyu. Power sequence before init RF. */
drivers/staging/rtl8188eu/hal/usb_halinit.c +5 -5
@@ -120,7 +120,7 @@ static u32 rtl8188eu_InitPowerOn(struct adapter *adapt)usb_write16 (adapt,REG_CR ,0x00 );/* suggseted by zhouzhou, by page, 20111230 */ /* Enable MAC DMA/WMAC/SCHEDULE/SEC block */ - value16 =rtw_read16 (adapt,REG_CR ); + value16 =usb_read16 (adapt,REG_CR ); value16 |= (HCI_TXDMA_EN |HCI_RXDMA_EN |TXDMA_EN |RXDMA_EN |PROTOCOL_EN |SCHEDULE_EN |ENSEC |CALTMR_EN );/* for SDIO - Set CR bit10 to enable 32k calibration. Suggested by SD1 Gimmy. Added by tynli. 2011.08.31. */
@@ -221,7 +221,7 @@ static void _InitNormalChipRegPriority(struct adapter *Adapter, u16 beQ, u16 bkQ, u16 viQ, u16 voQ, u16 mgtQ, u16 hiQ) { - u16 value16 = (rtw_read16(Adapter, REG_TRXDMA_CTRL) & 0x7); + u16 value16 = (usb_read16(Adapter, REG_TRXDMA_CTRL) & 0x7); value16 |=_TXDMA_BEQ_MAP (beQ) |_TXDMA_BKQ_MAP (bkQ) | _TXDMA_VIQ_MAP(viQ) | _TXDMA_VOQ_MAP(voQ) |
@@ -823,7 +823,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)/* Init CR MACTXEN, MACRXEN after setting RxFF boundary REG_TRXFF_BNDY to patch */ /* Hw bug which Hw initials RxFF boundary size to a value which is larger than the real Rx buffer size in 88E. */ /* Enable MACTXEN/MACRXEN block */ - value16 =rtw_read16 (Adapter,REG_CR ); + value16 =usb_read16 (Adapter,REG_CR ); value16 |= (MACTXEN |MACRXEN );usb_write8 (Adapter,REG_CR , value16);
@@ -905,7 +905,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_HAL_DM);usb_write16 (Adapter,REG_TX_RPT_TIME ,0x3DF0 );/* enable tx DMA to drop the redundate data of packet */ -usb_write16 (Adapter,REG_TXDMA_OFFSET_CHK , (rtw_read16 (Adapter,REG_TXDMA_OFFSET_CHK ) |DROP_DATA_EN )); +usb_write16 (Adapter,REG_TXDMA_OFFSET_CHK , (usb_read16 (Adapter,REG_TXDMA_OFFSET_CHK ) |DROP_DATA_EN ));HAL_INIT_PROFILE_TAG (HAL_INIT_STAGES_IQK );/* 2010/08/26 MH Merge from 8192CE. */
@@ -1801,7 +1801,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)usb_write8 (Adapter,REG_TXPAUSE ,0xff );/* keep sn */ - Adapter->xmitpriv.nqos_ssn =rtw_read16 (Adapter,REG_NQOS_SEQ ); + Adapter->xmitpriv.nqos_ssn =usb_read16 (Adapter,REG_NQOS_SEQ );if (!pwrpriv->bkeepfwalive) {/* RX DMA stop */
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +1 -2
@@ -139,7 +139,7 @@ static u8 usb_read8(struct adapter *adapter, u32 addr) } -static u16 usb_read16 (struct adapter *adapter,u32 addr) +u16 usb_read16 (struct adapter *adapter,u32 addr) {u8 request;u8 requesttype;
@@ -667,5 +667,4 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) {_rtw_memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); pops->_read8 = &usb_read8; - pops->_read16 = &usb_read16; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -3
@@ -45,7 +45,6 @@ struct intf_hdl;struct _io_ops {u8 (*_read8)(struct adapter *pintfhdl,u32 addr); -u16 (*_read16)(struct adapter *pintfhdl,u32 addr); };struct io_req {
@@ -78,7 +77,7 @@ struct io_priv { };u8 _rtw_read8 (struct adapter *adapter,u32 addr); -u16 _rtw_read16 (struct adapter *adapter,u32 addr); +u16 usb_read16 (struct adapter *adapter,u32 addr);u32 usb_read32 (struct adapter *adapter,u32 addr);u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void usb_read_port_cancel (struct adapter *adapter);
@@ -92,7 +91,6 @@ u32 usb_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);void usb_write_port_cancel (struct adapter *adapter);#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr)) -#define rtw_read16 (adapter, addr) _rtw_read16((adapter), (addr))int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops));
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +6 -6
@@ -2183,7 +2183,7 @@ static int rtw_wx_read32(struct net_device *dev,sprintf (extra,"0x%02X" , data32);break ;case 2 : - data32 =rtw_read16 (padapter, addr); + data32 =usb_read16 (padapter, addr);sprintf (extra,"0x%04X" , data32);break ;case 4 :
@@ -2356,7 +2356,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le RegRWStruct->value =rtw_read8 (padapter, RegRWStruct->offset);break ;case 2 : - RegRWStruct->value =rtw_read16 (padapter, RegRWStruct->offset); + RegRWStruct->value =usb_read16 (padapter, RegRWStruct->offset);break ;case 4 : RegRWStruct->value =usb_read32 (padapter, RegRWStruct->offset);
@@ -4112,7 +4112,7 @@ static int rtw_dbg_port(struct net_device *dev,DBG_88E ("rtw_read8(0x%x) = 0x%02x\n" , arg,rtw_read8 (padapter, arg));break ;case 2 : -DBG_88E ("rtw_read16(0x%x) = 0x%04x\n" , arg,rtw_read16 (padapter, arg)); +DBG_88E ("usb_read16(0x%x) = 0x%04x\n" , arg,usb_read16 (padapter, arg));break ;case 4 :DBG_88E ("usb_read32(0x%x) = 0x%08x\n" , arg,usb_read32 (padapter, arg));
@@ -4127,7 +4127,7 @@ static int rtw_dbg_port(struct net_device *dev,break ;case 2 :usb_write16 (padapter, arg, extra_arg); -DBG_88E ("usb_write16(0x%x) = 0x%04x\n" , arg,rtw_read16 (padapter, arg)); +DBG_88E ("usb_write16(0x%x) = 0x%04x\n" , arg,usb_read16 (padapter, arg));break ;case 4 :usb_write32 (padapter, arg, extra_arg);
@@ -4256,7 +4256,7 @@ static int rtw_dbg_port(struct net_device *dev,if (_SUCCESS !=rtw_IOL_exec_cmds_sync (padapter, xmit_frame,5000 ,0 )) ret = -EPERM ; - final =rtw_read16 (padapter, reg); + final =usb_read16 (padapter, reg);if (start_value+write_num-1 == final)DBG_88E ("continuous IOL_CMD_WW_REG to 0x%x %u times Success, start:%u, final:%u\n" , reg, write_num, start_value, final);else
@@ -6499,7 +6499,7 @@ static int rtw_mp_read_reg(struct net_device *dev,break ;case 'w' :/* 2 bytes */ -sprintf (data,"%04x\n" ,rtw_read16 (padapter, addr)); +sprintf (data,"%04x\n" ,usb_read16 (padapter, addr));for (i =0 ; i <=strlen (data); i++) {if (i%2 ==0 ) { tmp[j] =' ' ;
Signature · 1 line
1.7.10.4
PATCH 17/22 staging: rtl8188eu: Remove function _rtw_read8()
In reply to navin patidar_rtw_read8() is a wrapper function, being used to call usb_read8(). Call usb_read8() directly and drop _rtw_read8().
--- drivers/staging/rtl8188eu/core/rtw_debug.c | 2 +- drivers/staging/rtl8188eu/core/rtw_efuse.c | 24 +++--- drivers/staging/rtl8188eu/core/rtw_io.c | 13 --- drivers/staging/rtl8188eu/core/rtw_mp.c | 6 +- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 2 +- drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 6 +- drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c | 4 +- drivers/staging/rtl8188eu/hal/hal_com.c | 8 +- drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 10 +-- drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 42 +++++----- drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 4 +- drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 6 +- drivers/staging/rtl8188eu/hal/usb_halinit.c | 90 ++++++++++----------- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 3 +- drivers/staging/rtl8188eu/include/rtw_io.h | 4 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 22 ++--- 17 files changed, 116 insertions(+), 132 deletions(-)
drivers/staging/rtl8188eu/core/rtw_debug.c +1 -1
@@ -98,7 +98,7 @@ int proc_get_read_reg(char *page, char **start,switch (proc_get_read_len) {case 1 : - len +=snprintf (page + len, count - len,"rtw_read8(0x%x)=0x%x\n" , proc_get_read_addr,rtw_read8 (padapter, proc_get_read_addr)); + len +=snprintf (page + len, count - len,"usb_read8(0x%x)=0x%x\n" , proc_get_read_addr,usb_read8 (padapter, proc_get_read_addr));break ;case 2 : len +=snprintf (page + len, count - len,"usb_read16(0x%x)=0x%x\n" , proc_get_read_addr,usb_read16 (padapter, proc_get_read_addr));
drivers/staging/rtl8188eu/core/rtw_efuse.c +12 -12
@@ -182,11 +182,11 @@ ReadEFuseByte(/* Write Address */ usb_write8 (Adapter,EFUSE_CTRL +1 , (_offset &0xff )); - readbyte =rtw_read8 (Adapter,EFUSE_CTRL +2 ); + readbyte =usb_read8 (Adapter,EFUSE_CTRL +2 );usb_write8 (Adapter,EFUSE_CTRL +2 , ((_offset >>8 ) &0x03 ) | (readbyte &0xfc ));/* Write bit 32 0 */ - readbyte =rtw_read8 (Adapter,EFUSE_CTRL +3 ); + readbyte =usb_read8 (Adapter,EFUSE_CTRL +3 );usb_write8 (Adapter,EFUSE_CTRL +3 , (readbyte &0x7f ));/* Check bit 32 read-ready */
@@ -264,27 +264,27 @@ u8 EFUSE_Read1Byte(struct adapter *Adapter, u16 Address)/* Write E-fuse Register address bit0~7 */ temp = Address &0xFF ;usb_write8 (Adapter,EFUSE_CTRL +1 , temp); - Bytetemp =rtw_read8 (Adapter,EFUSE_CTRL +2 ); + Bytetemp =usb_read8 (Adapter,EFUSE_CTRL +2 );/* Write E-fuse Register address bit8~9 */ temp = ((Address >>8 ) &0x03 ) | (Bytetemp &0xFC );usb_write8 (Adapter,EFUSE_CTRL +2 , temp);/* Write 0x30[31]= 0 */ - Bytetemp =rtw_read8 (Adapter,EFUSE_CTRL +3 ); + Bytetemp =usb_read8 (Adapter,EFUSE_CTRL +3 ); temp = Bytetemp &0x7F ;usb_write8 (Adapter,EFUSE_CTRL +3 , temp);/* Wait Write-ready (0x30[31]= 1) */ - Bytetemp =rtw_read8 (Adapter,EFUSE_CTRL +3 ); + Bytetemp =usb_read8 (Adapter,EFUSE_CTRL +3 );while (!(Bytetemp &0x80 )) { - Bytetemp =rtw_read8 (Adapter,EFUSE_CTRL +3 ); + Bytetemp =usb_read8 (Adapter,EFUSE_CTRL +3 ); k++;if (k ==1000 ) { k =0 ;break ; } } - data =rtw_read8 (Adapter,EFUSE_CTRL ); + data =usb_read8 (Adapter,EFUSE_CTRL );return data; }else {return 0xFF ;
@@ -306,14 +306,14 @@ u8 efuse_OneByteRead(struct adapter *pAdapter, u16 addr, u8 *data, bool pseudo)/* address */ usb_write8 (pAdapter,EFUSE_CTRL +1 , (u8)(addr &0xff ));usb_write8 (pAdapter,EFUSE_CTRL +2 , ((u8)((addr>>8 ) &0x03 )) | - (rtw_read8 (pAdapter,EFUSE_CTRL +2 ) &0xFC )); + (usb_read8 (pAdapter,EFUSE_CTRL +2 ) &0xFC ));usb_write8 (pAdapter,EFUSE_CTRL +3 ,0x72 );/* read cmd */ -while (!(0x80 &rtw_read8 (pAdapter,EFUSE_CTRL +3 )) && (tmpidx <100 )) +while (!(0x80 &usb_read8 (pAdapter,EFUSE_CTRL +3 )) && (tmpidx <100 )) tmpidx++;if (tmpidx <100 ) { - *data =rtw_read8 (pAdapter,EFUSE_CTRL ); + *data =usb_read8 (pAdapter,EFUSE_CTRL ); result = true; }else { *data =0xff ;
@@ -337,13 +337,13 @@ u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, bool pseudo)/* address */ usb_write8 (pAdapter,EFUSE_CTRL +1 , (u8)(addr&0xff ));usb_write8 (pAdapter,EFUSE_CTRL +2 , - (rtw_read8 (pAdapter,EFUSE_CTRL +2 ) &0xFC ) | + (usb_read8 (pAdapter,EFUSE_CTRL +2 ) &0xFC ) | (u8)((addr>>8 ) &0x03 ));usb_write8 (pAdapter,EFUSE_CTRL , data);/* data */ usb_write8 (pAdapter,EFUSE_CTRL +3 ,0xF2 );/* write cmd */ -while ((0x80 &rtw_read8 (pAdapter,EFUSE_CTRL +3 )) && (tmpidx <100 )) +while ((0x80 &usb_read8 (pAdapter,EFUSE_CTRL +3 )) && (tmpidx <100 )) tmpidx++;if (tmpidx <100 )
drivers/staging/rtl8188eu/core/rtw_io.c +0 -13
@@ -51,19 +51,6 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) - -u8 _rtw_read8 (struct adapter *adapter,u32 addr) -{ -u8 r_val; -struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); -u8 (*_read8)(struct adapter *pintfhdl,u32 addr); - - _read8 = pintfhdl->io_ops._read8; - r_val =_read8 (adapter, addr); -return r_val; -} -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) {struct io_priv *piopriv = &padapter->iopriv;
drivers/staging/rtl8188eu/core/rtw_mp.c +3 -3
@@ -30,7 +30,7 @@ u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz)switch (sz) {case 1 : - val =rtw_read8 (padapter, addr); + val =usb_read8 (padapter, addr);break ;case 2 : val =usb_read16 (padapter, addr);
@@ -302,7 +302,7 @@ static void disable_dm(struct adapter *padapter)/* 3 1. disable firmware dynamic mechanism */ /* disable Power Training, Rate Adaptive */ - v8 =rtw_read8 (padapter,REG_BCN_CTRL ); + v8 =usb_read8 (padapter,REG_BCN_CTRL ); v8 &= ~EN_BCN_FUNCTION ;usb_write8 (padapter,REG_BCN_CTRL , v8);
@@ -421,7 +421,7 @@ end_of_mp_start_test:if (res == _SUCCESS) {/* set MSR to WIFI_FW_ADHOC_STATE */ - val8 =rtw_read8 (padapter,MSR ) &0xFC ;/* 0x0102 */ + val8 =usb_read8 (padapter,MSR ) &0xFC ;/* 0x0102 */ val8 |=WIFI_FW_ADHOC_STATE ;usb_write8 (padapter,MSR , val8);/* Link in ad hoc network */ }
drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c +1 -1
@@ -801,7 +801,7 @@ int rtl8188eu_oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)switch (width) {case 1 : - RegRWStruct->value =rtw_read8 (Adapter, offset); + RegRWStruct->value =usb_read8 (Adapter, offset);break ;case 2 : RegRWStruct->value =usb_read16 (Adapter, offset);
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c +3 -3
@@ -819,7 +819,7 @@ static void _PHY_SaveMACRegisters(struct odm_dm_struct *dm_odm = &pHalData->odmpriv;ODM_RT_TRACE (dm_odm,ODM_COMP_CALIBRATION ,ODM_DBG_LOUD , ("Save MAC parameters.\n" ));for (i =0 ; i < (IQK_MAC_REG_NUM -1 ); i++) { - MACBackup[i] =rtw_read8 (adapt, MACReg[i]); + MACBackup[i] =usb_read8 (adapt, MACReg[i]); } MACBackup[i] =usb_read32 (adapt, MACReg[i]); }
@@ -1205,7 +1205,7 @@ static void phy_LCCalibrate_8188E(struct adapter *adapt, bool is2t)u32 RF_Amode =0 , RF_Bmode =0 , LC_Cal;/* Check continuous TX and Packet TX */ - tmpreg =rtw_read8 (adapt,0xd03 ); + tmpreg =usb_read8 (adapt,0xd03 );if ((tmpreg&0x70 ) !=0 )/* Deal with contisuous TX case */ usb_write8 (adapt,0xd03 , tmpreg&0x8F );/* disable all continuous TX */
@@ -1446,7 +1446,7 @@ static void phy_setrfpathswitch_8188e(struct adapter *adapt, bool main, bool is2 {if (!adapt->hw_init_completed) {u8 u1btmp; - u1btmp =rtw_read8 (adapt,REG_LEDCFG2 ) |BIT7 ; + u1btmp =usb_read8 (adapt,REG_LEDCFG2 ) |BIT7 ;usb_write8 (adapt,REG_LEDCFG2 , u1btmp);PHY_SetBBReg (adapt, rFPGA0_XAB_RFParameter,BIT13 ,0x01 ); }
drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c +2 -2
@@ -80,7 +80,7 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 cut_vers, u8 fab_vers, offset =GET_PWR_CFG_OFFSET (pwrcfgcmd);/* Read the value from system register */ - value =rtw_read8 (padapter, offset); + value =usb_read8 (padapter, offset); value &= ~(GET_PWR_CFG_MASK (pwrcfgcmd)); value |= (GET_PWR_CFG_VALUE (pwrcfgcmd) &GET_PWR_CFG_MASK (pwrcfgcmd));
@@ -94,7 +94,7 @@ u8 HalPwrSeqCmdParsing(struct adapter *padapter, u8 cut_vers, u8 fab_vers, poll_bit = false; offset =GET_PWR_CFG_OFFSET (pwrcfgcmd); do { - value = rtw_read8(padapter, offset); + value = usb_read8(padapter, offset); value &= GET_PWR_CFG_MASK(pwrcfgcmd); if (value == (GET_PWR_CFG_VALUE(pwrcfgcmd) & GET_PWR_CFG_MASK(pwrcfgcmd)))
drivers/staging/rtl8188eu/hal/hal_com.c +4 -4
@@ -341,7 +341,7 @@ s32 c2h_evt_read(struct adapter *adapter, u8 *buf)if (buf ==NULL ) goto exit; - trigger =rtw_read8 (adapter,REG_C2HEVT_CLEAR ); + trigger =usb_read8 (adapter,REG_C2HEVT_CLEAR );if (trigger ==C2H_EVT_HOST_CLOSE ) goto exit;/* Not ready */
@@ -352,15 +352,15 @@ s32 c2h_evt_read(struct adapter *adapter, u8 *buf)_rtw_memset (c2h_evt,0 ,16 ); - *buf =rtw_read8 (adapter,REG_C2HEVT_MSG_NORMAL ); - *(buf+1 ) =rtw_read8 (adapter,REG_C2HEVT_MSG_NORMAL +1 ); + *buf =usb_read8 (adapter,REG_C2HEVT_MSG_NORMAL ); + *(buf+1 ) =usb_read8 (adapter,REG_C2HEVT_MSG_NORMAL +1 );RT_PRINT_DATA (_module_hal_init_c_, _drv_info_,"c2h_evt_read(): " , &c2h_evt ,sizeof (c2h_evt));/* Read the content */ for (i =0 ; i < c2h_evt->plen; i++) - c2h_evt->payload[i] =rtw_read8 (adapter,REG_C2HEVT_MSG_NORMAL + + c2h_evt->payload[i] =usb_read8 (adapter,REG_C2HEVT_MSG_NORMAL +sizeof (*c2h_evt) + i); RT_PRINT_DATA(_module_hal_init_c_, _drv_info_,
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c +5 -5
@@ -41,7 +41,7 @@ static u8 _is_fw_read_cmd_down(struct adapter *adapt, u8 msgbox_num)u8 valid;do { - valid =rtw_read8 (adapt,REG_HMETFR ) &BIT (msgbox_num); + valid =usb_read8 (adapt,REG_HMETFR ) &BIT (msgbox_num);if (0 == valid) read_down = true; }while ((!read_down) && (retry_cnts--));
@@ -625,8 +625,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)/* Disable Hw protection for a time which revserd for Hw sending beacon. */ /* Fix download reserved page packet fail that access collision with the protection time. */ /* 2010.05.11. Added by tynli. */ -usb_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )&(~BIT (3 ))); -usb_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )|BIT (4 )); +usb_write8 (adapt,REG_BCN_CTRL ,usb_read8 (adapt,REG_BCN_CTRL )&(~BIT (3 ))); +usb_write8 (adapt,REG_BCN_CTRL ,usb_read8 (adapt,REG_BCN_CTRL )|BIT (4 ));if (haldata->RegFwHwTxQCtrl&BIT6 ) {DBG_88E ("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n" );
@@ -668,8 +668,8 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *adapt, u8 mstatus)/* */ /* Enable Bcn */ -usb_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )|BIT (3 )); -usb_write8 (adapt,REG_BCN_CTRL ,rtw_read8 (adapt,REG_BCN_CTRL )&(~BIT (4 ))); +usb_write8 (adapt,REG_BCN_CTRL ,usb_read8 (adapt,REG_BCN_CTRL )|BIT (3 )); +usb_write8 (adapt,REG_BCN_CTRL ,usb_read8 (adapt,REG_BCN_CTRL )&(~BIT (4 )));/* To make sure that if there exists an adapter which would like to send beacon. */ /* If exists, the origianl value of 0x422[6] will be 1, we should check this to */
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +1 -1
@@ -36,7 +36,7 @@ static void dm_InitGPIOSetting(struct adapter *Adapter) {u8 tmp1byte; - tmp1byte =rtw_read8 (Adapter,REG_GPIO_MUXCFG ); + tmp1byte =usb_read8 (Adapter,REG_GPIO_MUXCFG ); tmp1byte &= (GPIOSEL_GPIO | ~GPIOSEL_ENBT );usb_write8 (Adapter,REG_GPIO_MUXCFG , tmp1byte);
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +21 -21
142 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +2 -2
@@ -792,8 +792,8 @@ _PHY_SetBWMode92C(/* 3<1>Set MAC register */ /* 3 */ - regBwOpMode =rtw_read8 (Adapter,REG_BWOPMODE ); - regRRSR_RSC =rtw_read8 (Adapter,REG_RRSR +2 ); + regBwOpMode =usb_read8 (Adapter,REG_BWOPMODE ); + regRRSR_RSC =usb_read8 (Adapter,REG_RRSR +2 );switch (pHalData->CurrentChannelBW) {case HT_CHANNEL_WIDTH_20 :
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c +3 -3
@@ -34,7 +34,7 @@ void SwLedOn(struct adapter *padapter, struct LED_871x *pLed)if (padapter->bSurpriseRemoved || padapter->bDriverStopped)return ; - LedCfg =rtw_read8 (padapter,REG_LEDCFG2 ); + LedCfg =usb_read8 (padapter,REG_LEDCFG2 );usb_write8 (padapter,REG_LEDCFG2 , (LedCfg&0xf0 )|BIT5 |BIT6 );/* SW control led0 on. */ pLed->bLedOn = true; }
@@ -49,13 +49,13 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)if (padapter->bSurpriseRemoved || padapter->bDriverStopped) goto exit; - LedCfg =rtw_read8 (padapter,REG_LEDCFG2 );/* 0x4E */ + LedCfg =usb_read8 (padapter,REG_LEDCFG2 );/* 0x4E */ if (pHalData->bLedOpenDrain) {/* Open-drain arrangement for controlling the LED) */ LedCfg &=0x90 ;/* Set to software control. */ usb_write8 (padapter,REG_LEDCFG2 , (LedCfg|BIT3 )); - LedCfg =rtw_read8 (padapter,REG_MAC_PINMUX_CFG ); + LedCfg =usb_read8 (padapter,REG_MAC_PINMUX_CFG ); LedCfg &=0xFE ;usb_write8 (padapter,REG_MAC_PINMUX_CFG , LedCfg); }else {
drivers/staging/rtl8188eu/hal/usb_halinit.c +45 -45
290 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +1 -2
@@ -115,7 +115,7 @@ exit:return status; } -static u8 usb_read8 (struct adapter *adapter,u32 addr) +u8 usb_read8 (struct adapter *adapter,u32 addr) {u8 request;u8 requesttype;
@@ -666,5 +666,4 @@ void rtl8188eu_xmit_tasklet(void *priv)void rtl8188eu_set_intf_ops (struct _io_ops *pops) {_rtw_memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); - pops->_read8 = &usb_read8; }
drivers/staging/rtl8188eu/include/rtw_io.h +1 -3
@@ -44,7 +44,6 @@ struct intf_priv;struct intf_hdl ;struct _io_ops { -u8 (*_read8)(struct adapter *pintfhdl,u32 addr); };struct io_req {
@@ -76,7 +75,7 @@ struct io_priv {struct intf_hdl intf; }; -u8 _rtw_read8 (struct adapter *adapter,u32 addr); +u8 usb_read8 (struct adapter *adapter,u32 addr);u16 usb_read16 (struct adapter *adapter,u32 addr);u32 usb_read32 (struct adapter *adapter,u32 addr);u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);
@@ -90,7 +89,6 @@ int usb_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata);u32 usb_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void usb_write_port_cancel (struct adapter *adapter); -#define rtw_read8 (adapter, addr) _rtw_read8((adapter), (addr))int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops));
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +11 -11
@@ -2179,7 +2179,7 @@ static int rtw_wx_read32(struct net_device *dev,switch (bytes) {case 1 : - data32 =rtw_read8 (padapter, addr); + data32 =usb_read8 (padapter, addr);sprintf (extra,"0x%02X" , data32);break ;case 2 :
@@ -2353,7 +2353,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le RegRWStruct = (struct mp_rw_reg *)pdata;switch (RegRWStruct->width) {case 1 : - RegRWStruct->value =rtw_read8 (padapter, RegRWStruct->offset); + RegRWStruct->value =usb_read8 (padapter, RegRWStruct->offset);break ;case 2 : RegRWStruct->value =usb_read16 (padapter, RegRWStruct->offset);
@@ -4109,7 +4109,7 @@ static int rtw_dbg_port(struct net_device *dev,case 0x70 :/* read_reg */ switch (minor_cmd) {case 1 : -DBG_88E ("rtw_read8(0x%x) = 0x%02x\n" , arg,rtw_read8 (padapter, arg)); +DBG_88E ("usb_read8(0x%x) = 0x%02x\n" , arg,usb_read8 (padapter, arg));break ;case 2 :DBG_88E ("usb_read16(0x%x) = 0x%04x\n" , arg,usb_read16 (padapter, arg));
@@ -4123,7 +4123,7 @@ static int rtw_dbg_port(struct net_device *dev,switch (minor_cmd) {case 1 :usb_write8 (padapter, arg, extra_arg); -DBG_88E ("usb_write8(0x%x) = 0x%02x\n" , arg,rtw_read8 (padapter, arg)); +DBG_88E ("usb_write8(0x%x) = 0x%02x\n" , arg,usb_read8 (padapter, arg));break ;case 2 :usb_write16 (padapter, arg, extra_arg);
@@ -4227,7 +4227,7 @@ static int rtw_dbg_port(struct net_device *dev,if (_SUCCESS !=rtw_IOL_exec_cmds_sync (padapter, xmit_frame,5000 ,0 )) ret = -EPERM ; - final =rtw_read8 (padapter, reg); + final =usb_read8 (padapter, reg);if (start_value+write_num-1 == final)DBG_88E ("continuous IOL_CMD_WB_REG to 0x%x %u times Success, start:%u, final:%u\n" , reg, write_num, start_value, final);else
@@ -4577,13 +4577,13 @@ static int rtw_dbg_port(struct net_device *dev,case 0xfd :usb_write8 (padapter,0xc50 , arg); -DBG_88E ("wr(0xc50) = 0x%x\n" ,rtw_read8 (padapter,0xc50 )); +DBG_88E ("wr(0xc50) = 0x%x\n" ,usb_read8 (padapter,0xc50 ));usb_write8 (padapter,0xc58 , arg); -DBG_88E ("wr(0xc58) = 0x%x\n" ,rtw_read8 (padapter,0xc58 )); +DBG_88E ("wr(0xc58) = 0x%x\n" ,usb_read8 (padapter,0xc58 ));break ;case 0xfe : -DBG_88E ("rd(0xc50) = 0x%x\n" ,rtw_read8 (padapter,0xc50 )); -DBG_88E ("rd(0xc58) = 0x%x\n" ,rtw_read8 (padapter,0xc58 )); +DBG_88E ("rd(0xc50) = 0x%x\n" ,usb_read8 (padapter,0xc50 )); +DBG_88E ("rd(0xc58) = 0x%x\n" ,usb_read8 (padapter,0xc58 ));break ;case 0xff :DBG_88E ("dbg(0x210) = 0x%x\n" ,usb_read32 (padapter,0x210 ));
@@ -6494,7 +6494,7 @@ static int rtw_mp_read_reg(struct net_device *dev,switch (width) {case 'b' :/* 1 byte */ -sprintf (extra,"%d\n" ,rtw_read8 (padapter, addr)); +sprintf (extra,"%d\n" ,usb_read8 (padapter, addr)); wrqu->length =strlen (extra);break ;case 'w' :
@@ -7078,7 +7078,7 @@ static int rtw_mp_arx(struct net_device *dev,OFDM_FA =read_bbreg (padapter,0xda4 ,0x0000FFFF );OFDM_FA =read_bbreg (padapter,0xda4 ,0xFFFF0000 );OFDM_FA =read_bbreg (padapter,0xda8 ,0x0000FFFF ); -CCK_FA = (rtw_read8 (padapter,0xa5b )<<8 ) | (rtw_read8 (padapter,0xa5c )); +CCK_FA = (usb_read8 (padapter,0xa5b )<<8 ) | (usb_read8 (padapter,0xa5c ));sprintf (extra,"Phy Received packet OK:%d CRC error:%d FA Counter: %d" , cckok+ofdmok+htok, cckcrc+ofdmcrc+htcrc,OFDM_FA +CCK_FA ); }
Signature · 1 line
1.7.10.4
PATCH 18/22 staging: rtl8188eu: Remove functions initialize rtw_[read,write] wrapper
In reply to navin patidarwe have removed all rtw_[read,write]() function calls, so no need to initialize structures used to build rtw_[read,write] abstraction.
--- drivers/staging/rtl8188eu/core/rtw_io.c | 16 ---------------- drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 4 ---- drivers/staging/rtl8188eu/include/rtw_io.h | 4 ---- drivers/staging/rtl8188eu/include/usb_ops.h | 2 -- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 3 --- 5 files changed, 29 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -16
@@ -51,19 +51,3 @@ [email protected]#define rtw_cpu_to_le16 (val) cpu_to_le16(val)#define rtw_cpu_to_le32 (val) cpu_to_le32(val) -int rtw_init_io_priv (struct adapter *padapter,void (*set_intf_ops)(struct _io_ops *pops)) -{ -struct io_priv *piopriv = &padapter->iopriv; -struct intf_hdl *pintf = &piopriv->intf; - -if (set_intf_ops ==NULL ) -return _FAIL; - - piopriv->padapter = padapter; - pintf->padapter = padapter; - pintf->pintf_dev =adapter_to_dvobj (padapter); - -set_intf_ops (&pintf->io_ops); - -return _SUCCESS; -}
drivers/staging/rtl8188eu/hal/usb_ops_linux.c +0 -4
@@ -663,7 +663,3 @@ void rtl8188eu_xmit_tasklet(void *priv) } } -void rtl8188eu_set_intf_ops (struct _io_ops *pops) -{ -_rtw_memset ((u8 *)pops,0 ,sizeof (struct _io_ops )); -}
drivers/staging/rtl8188eu/include/rtw_io.h +0 -4
@@ -89,8 +89,4 @@ int usb_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata);u32 usb_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem);void usb_write_port_cancel (struct adapter *adapter); - -int rtw_init_io_priv (struct adapter *padapter, -void (*set_intf_ops)(struct _io_ops *pops)); -#endif /* _RTL8711_IO_H_ */
drivers/staging/rtl8188eu/include/usb_ops.h +0 -2
@@ -63,8 +63,6 @@ enum{#include <usb_ops_linux.h> void rtl8188eu_set_hw_type (struct adapter *padapter); -void rtl8188eu_set_intf_ops (struct _io_ops *pops); -#define usb_set_intf_ops rtl8188eu_set_intf_ops/* * Increase and check if the continual_urb_error of this @param dvobjprivei
drivers/staging/rtl8188eu/os_dep/usb_intf.c +0 -3
@@ -396,9 +396,6 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, padapter->intf_start = &usb_intf_start; padapter->intf_stop = &usb_intf_stop; -/* step init_io_priv */ -rtw_init_io_priv (padapter, usb_set_intf_ops); -/* step read_chip_version */ rtw_hal_read_chip_version (padapter);
Signature · 1 line
1.7.10.4
PATCH 19/22 staging: rtl8188eu: usb_ops_linux.h: Remove unused function declarations
In reply to navin patidar--- drivers/staging/rtl8188eu/include/usb_ops_linux.h | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8188eu/include/usb_ops_linux.h +0 -3
@@ -44,9 +44,6 @@unsigned int ffaddr2pipehdl (struct dvobj_priv *pdvobj,u32 addr); -void usb_read_mem (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *rmem); -void usb_write_mem (struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *wmem); -void usb_read_port_cancel (struct adapter *padapter);u32 usb_write_port (struct adapter *padapter,u32 addr,u32 cnt,u8 *wmem);
Signature · 1 line
1.7.10.4
PATCH 20/22 staging: rtl8188eu: rtw_io.h: Remove unused structures and macros
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 1 - drivers/staging/rtl8188eu/include/rtw_io.h | 42 ------------------------- 2 files changed, 43 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -1
@@ -196,7 +196,6 @@ struct adapter {struct mlme_ext_priv mlmeextpriv;struct cmd_priv cmdpriv;struct evt_priv evtpriv; -struct io_priv iopriv;struct xmit_priv xmitpriv;struct recv_priv recvpriv;struct sta_priv stapriv;
drivers/staging/rtl8188eu/include/rtw_io.h +0 -42
48 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 21/22 staging: rtl8188eu: Move usb_[read,write]() declarations to usb_ops_linux.h
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_debug.c | 1 + drivers/staging/rtl8188eu/core/rtw_efuse.c | 3 +-- drivers/staging/rtl8188eu/core/rtw_mp.c | 2 +- drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c | 2 +- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 1 + drivers/staging/rtl8188eu/core/rtw_sreset.c | 1 + drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c | 1 + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 1 + drivers/staging/rtl8188eu/include/odm_precomp.h | 1 + drivers/staging/rtl8188eu/include/rtw_io.h | 14 -------------- drivers/staging/rtl8188eu/include/usb_ops_linux.h | 16 +++++++++++++--- 11 files changed, 22 insertions(+), 21 deletions(-)
drivers/staging/rtl8188eu/core/rtw_debug.c +1 -0
@@ -20,6 +20,7 @@#define _RTW_DEBUG_C_#include <rtw_debug.h> +#include <usb_ops_linux.h> int proc_get_drv_version(char *page, char **start, off_t offset, int count,
drivers/staging/rtl8188eu/core/rtw_efuse.c +1 -2
@@ -22,8 +22,7 @@#include <osdep_service.h> #include <drv_types.h> #include <rtw_efuse.h> - - +#include <usb_ops_linux.h> /*------------------------Define local variable------------------------------*/ u8 fakeEfuseBank;
drivers/staging/rtl8188eu/core/rtw_mp.c +1 -1
@@ -20,7 +20,7 @@#define _RTW_MP_C_#include <drv_types.h> - +#include <usb_ops_linux.h> #include "rtl8188e_hal.h" #include <linux/vmalloc.h>
drivers/staging/rtl8188eu/core/rtw_mp_ioctl.c +1 -1
@@ -22,7 +22,7 @@#include <osdep_service.h> #include <drv_types.h> #include <mlme_osdep.h> - +#include <usb_ops_linux.h> /* include <rtw_mp.h> */ #include <rtw_mp_ioctl.h>
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +1 -0
@@ -22,6 +22,7 @@#include <osdep_service.h> #include <drv_types.h> #include <osdep_intf.h> +#include <usb_ops_linux.h> #include <linux/usb.h> #include <usb_osintf.h>
drivers/staging/rtl8188eu/core/rtw_sreset.c +1 -0
@@ -19,6 +19,7 @@******************************************************************************/ #include <rtw_sreset.h> +#include <usb_ops_linux.h> void sreset_init_value (struct adapter *padapter) {
drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c +1 -0
@@ -35,6 +35,7 @@ Major Change History:--*/ #include <HalPwrSeqCmd.h> +#include <usb_ops_linux.h> /* Description: */ /* This routine deals with the Power Configuration CMDs parsing
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c +1 -0
@@ -22,6 +22,7 @@#include <drv_types.h> #include <rtl8188e_hal.h> #include <rtl8188e_led.h> +#include <usb_ops_linux.h> /* LED object. */
drivers/staging/rtl8188eu/include/odm_precomp.h +1 -0
@@ -30,6 +30,7 @@#include <osdep_service.h> #include <drv_types.h> #include <hal_intf.h> +#include <usb_ops_linux.h> /* 2 OutSrc Header Files */
drivers/staging/rtl8188eu/include/rtw_io.h +0 -14
@@ -33,18 +33,4 @@#include <linux/usb.h> #include <linux/usb/ch9.h> -u8 usb_read8 (struct adapter *adapter,u32 addr); -u16 usb_read16 (struct adapter *adapter,u32 addr); -u32 usb_read32 (struct adapter *adapter,u32 addr); -u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -void usb_read_port_cancel (struct adapter *adapter); - -int usb_write8 (struct adapter *adapter,u32 addr,u8 val); -int usb_write16 (struct adapter *adapter,u32 addr,u16 val); -int usb_write32 (struct adapter *adapter,u32 addr,u32 val); -int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); - -u32 usb_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); -void usb_write_port_cancel (struct adapter *adapter); -#endif /* _RTL8711_IO_H_ */
drivers/staging/rtl8188eu/include/usb_ops_linux.h +13 -3
@@ -44,9 +44,19 @@unsigned int ffaddr2pipehdl (struct dvobj_priv *pdvobj,u32 addr); -void usb_read_port_cancel (struct adapter *padapter); +u8 usb_read8 (struct adapter *adapter,u32 addr); +u16 usb_read16 (struct adapter *adapter,u32 addr); +u32 usb_read32 (struct adapter *adapter,u32 addr); -u32 usb_write_port (struct adapter *padapter,u32 addr,u32 cnt,u8 *wmem); -void usb_write_port_cancel (struct adapter *padapter); +u32 usb_read_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); +void usb_read_port_cancel (struct adapter *adapter); + +int usb_write8 (struct adapter *adapter,u32 addr,u8 val); +int usb_write16 (struct adapter *adapter,u32 addr,u16 val); +int usb_write32 (struct adapter *adapter,u32 addr,u32 val); +int usb_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata); + +u32 usb_write_port (struct adapter *adapter,u32 addr,u32 cnt,u8 *pmem); +void usb_write_port_cancel (struct adapter *adapter);#endif
Signature · 1 line
1.7.10.4
PATCH 22/22 staging: rtl8188eu: Remove empty files rtw_io.[c,h]
In reply to navin patidar--- drivers/staging/rtl8188eu/Makefile | 1 - drivers/staging/rtl8188eu/core/rtw_io.c | 53 ---------------------- drivers/staging/rtl8188eu/include/drv_types.h | 1 - drivers/staging/rtl8188eu/include/rtw_io.h | 36 --------------- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 1 + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 1 + 6 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/core/rtw_io.c delete mode 100644 drivers/staging/rtl8188eu/include/rtw_io.h
drivers/staging/rtl8188eu/Makefile +0 -1
@@ -20,7 +20,6 @@ r8188eu-y := \ core/rtw_debug.o \ core/rtw_efuse.o \ core/rtw_ieee80211.o \ - core/rtw_io.o \ core/rtw_ioctl_set.o \ core/rtw_iol.o \ core/rtw_led.o \
drivers/staging/rtl8188eu/core/rtw_io.c deleted +0 -53
53 lines not on this page · raw message
drivers/staging/rtl8188eu/include/drv_types.h +0 -1
@@ -40,7 +40,6 @@#include <rtw_qos.h> #include <rtw_security.h> #include <rtw_pwrctrl.h> -#include <rtw_io.h> #include <rtw_eeprom.h> #include <sta_info.h> #include <rtw_mlme.h>
drivers/staging/rtl8188eu/include/rtw_io.h deleted +0 -36
@@ -1,36 +0,0 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* -******************************************************************************/ - -#ifndef _RTW_IO_H_ -#define _RTW_IO_H_ - -#include <osdep_service.h> -#include <osdep_intf.h> - -#include <asm/byteorder.h> -#include <linux/semaphore.h> -#include <linux/list.h> -#include <linux/spinlock.h> -#include <linux/atomic.h> - -#include <linux/usb.h> -#include <linux/usb/ch9.h> - -#endif /* _RTL8711_IO_H_ */
drivers/staging/rtl8188eu/os_dep/os_intfs.c +1 -0
@@ -20,6 +20,7 @@#define _OS_INTFS_C_#include <osdep_service.h> +#include <osdep_intf.h> #include <drv_types.h> #include <xmit_osdep.h> #include <recv_osdep.h>
drivers/staging/rtl8188eu/os_dep/osdep_service.c +1 -0
@@ -22,6 +22,7 @@#define _OSDEP_SERVICE_C_#include <osdep_service.h> +#include <osdep_intf.h> #include <drv_types.h> #include <recv_osdep.h> #include <linux/vmalloc.h>
Signature · 1 line
1.7.10.4