Skip to contentSkip to conversation

staging: rtl8188eu: Consolidate usb operation code.

PATCH New navin patidar 1 participant 8 messages Jun 21, 2014 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8188eu: Consolidate usb operation code.

navin patidar (7):
staging: rtl8188eu: Merge hal/usb_ops_linux.c into
os_dep/usb_ops_linux.c
staging: rtl8188eu: Remove macros specific to kernel version < 2.6.12 staging:rtl8188eu:usb_ops.h:Remove unused enum, macros and function
declaration
staging: rtl8188eu: usb_ops.h: Remove macro rtw_usb_control_msg()
staging: rtl8188eu: Remove inline function
rtw_inc_and_chk_continual_urb_error()
staging: rtl8188eu: Remove continual_urb_error from struct dvobj_priv
staging: rtl8188eu: Merge usb_ops.h into usb_ops_linux.h

 drivers/staging/rtl8188eu/Makefile                |    1 -
 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c    |    1 -
 drivers/staging/rtl8188eu/core/rtw_recv.c         |    1 -
 drivers/staging/rtl8188eu/core/rtw_xmit.c         |    1 -
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c |    2 -
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c    |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c    |    2 +-
 drivers/staging/rtl8188eu/hal/usb_halinit.c       |    1 -
 drivers/staging/rtl8188eu/hal/usb_ops_linux.c     |  665 ---------------------
 drivers/staging/rtl8188eu/include/drv_types.h     |    2 -
 drivers/staging/rtl8188eu/include/usb_ops.h       |  112 ----
 drivers/staging/rtl8188eu/include/usb_ops_linux.h |   25 +
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c    |    1 -
 drivers/staging/rtl8188eu/os_dep/recv_linux.c     |    2 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c       |    4 +-
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c  |  630 ++++++++++++++++++-
 16 files changed, 658 insertions(+), 794 deletions(-)
 delete mode 100644 drivers/staging/rtl8188eu/hal/usb_ops_linux.c
 delete mode 100644 drivers/staging/rtl8188eu/include/usb_ops.h

--
1.7.10.4

#1 lore raw

PATCH 1/7 staging: rtl8188eu: Merge hal/usb_ops_linux.c into os_dep/usb_ops_linux.c

Consolidate all usb operation related functions in one file.

---
 drivers/staging/rtl8188eu/Makefile               |    1 -
 drivers/staging/rtl8188eu/hal/usb_ops_linux.c    |  665 ----------------------
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c |  642 ++++++++++++++++++++-
 3 files changed, 641 insertions(+), 667 deletions(-)
 delete mode 100644 drivers/staging/rtl8188eu/hal/usb_ops_linux.c
drivers/staging/rtl8188eu/Makefile +0 -1
index 74a032c..2745076 100644
@@ -46,7 +46,6 @@ r8188eu-y :=				\
 		hal/rtl8188eu_recv.o	\
 		hal/rtl8188eu_xmit.o	\
 		hal/usb_halinit.o	\
-		hal/usb_ops_linux.o	\
 		os_dep/ioctl_linux.o	\
 		os_dep/mlme_linux.o	\
 		os_dep/os_intfs.o	\
drivers/staging/rtl8188eu/hal/usb_ops_linux.c deleted +0 -665

665 lines not on this page · raw message

drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +641 -1

665 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/7 staging: rtl8188eu: Remove macros specific to kernel version < 2.6.12

In reply to navin patidar
---
 drivers/staging/rtl8188eu/include/usb_ops.h |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/staging/rtl8188eu/include/usb_ops.h +1 -15
index ff730f4..e10b711 100644
@@ -38,7 +38,6 @@ enum{
 #define MAX_VENDOR_REQ_CMD_SIZE	254	/* 8188cu SIE Support */
 #define MAX_USB_IO_CTL_SIZE	(MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT)
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 #define rtw_usb_control_msg(dev, pipe, request, requesttype,		\
 			    value, index, data, size, timeout_ms)	\
 	usb_control_msg((dev), (pipe), (request), (requesttype), (value),\
@@ -46,20 +45,7 @@ enum{
 #define rtw_usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout_ms) \
 	usb_bulk_msg((usb_dev), (pipe), (data), (len),			\
 		     (actual_length), (timeout_ms))
-#else
-#define rtw_usb_control_msg(dev, pipe, request, requesttype,		\
-			    value, index, data, size, timeout_ms)	\
-	usb_control_msg((dev), (pipe), (request), (requesttype),	\
-			(value), (index), (data), (size),		\
-			((timeout_ms) == 0) ||				\
-			((timeout_ms)*HZ/1000 > 0) ?			\
-			((timeout_ms)*HZ/1000) : 1)
-#define rtw_usb_bulk_msg(usb_dev, pipe, data, len,			\
-			 actual_length, timeout_ms) \
-	usb_bulk_msg((usb_dev), (pipe), (data), (len), (actual_length), \
-		     ((timeout_ms) == 0) || ((timeout_ms)*HZ/1000 > 0) ?\
-		     ((timeout_ms)*HZ/1000) : 1)
-#endif
+
 #include <usb_ops_linux.h>
 
 void rtl8188eu_set_hw_type(struct adapter *padapter);
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/7 staging:rtl8188eu:usb_ops.h:Remove unused enum, macros and function declaration

In reply to navin patidar
---
 drivers/staging/rtl8188eu/include/usb_ops.h |   11 -----------
 1 file changed, 11 deletions(-)
drivers/staging/rtl8188eu/include/usb_ops.h +0 -11
index e10b711..74009ca 100644
@@ -27,13 +27,7 @@
 
 #define REALTEK_USB_VENQT_READ		0xC0
 #define REALTEK_USB_VENQT_WRITE		0x40
-#define REALTEK_USB_VENQT_CMD_REQ	0x05
-#define REALTEK_USB_VENQT_CMD_IDX	0x00
 
-enum{
-	VENDOR_WRITE = 0x00,
-	VENDOR_READ = 0x01,
-};
 #define ALIGNMENT_UNIT			16
 #define MAX_VENDOR_REQ_CMD_SIZE	254	/* 8188cu SIE Support */
 #define MAX_USB_IO_CTL_SIZE	(MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT)
@@ -42,14 +36,9 @@ enum{
 			    value, index, data, size, timeout_ms)	\
 	usb_control_msg((dev), (pipe), (request), (requesttype), (value),\
 			(index), (data), (size), (timeout_ms))
-#define rtw_usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout_ms) \
-	usb_bulk_msg((usb_dev), (pipe), (data), (len),			\
-		     (actual_length), (timeout_ms))
 
 #include <usb_ops_linux.h>
 
-void rtl8188eu_set_hw_type(struct adapter *padapter);
-
 /*
  * Increase and check if the continual_urb_error of this @param dvobjprivei
  * is larger than MAX_CONTINUAL_URB_ERR
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH 4/7 staging: rtl8188eu: usb_ops.h: Remove macro rtw_usb_control_msg()

In reply to navin patidar
---
 drivers/staging/rtl8188eu/include/usb_ops.h      |    5 -----
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8188eu/include/usb_ops.h +0 -5
index 74009ca..79d206e 100644
@@ -32,11 +32,6 @@
 #define MAX_VENDOR_REQ_CMD_SIZE	254	/* 8188cu SIE Support */
 #define MAX_USB_IO_CTL_SIZE	(MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT)
 
-#define rtw_usb_control_msg(dev, pipe, request, requesttype,		\
-			    value, index, data, size, timeout_ms)	\
-	usb_control_msg((dev), (pipe), (request), (requesttype), (value),\
-			(index), (data), (size), (timeout_ms))
-
 #include <usb_ops_linux.h>
 
 /*
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +1 -1
index 7563188..363f7f5 100644
@@ -273,7 +273,7 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i
 			memcpy(pIo_buf, pdata, len);
 		}
 
-		status = rtw_usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
+		status = usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
 
 		if (status == len) {   /*  Success this control transfer. */
 			rtw_reset_continual_urb_error(dvobjpriv);
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH 5/7 staging: rtl8188eu: Remove inline function rtw_inc_and_chk_continual_urb_error()

In reply to navin patidar

rtw_inc_and_chk_continual_urb_error() is used to check if device is removed unexpectedly, to do that we can just check status of urb in usb_read_port_complete() and usbctrl_vendorreq() doed that by checking return value of usb_control_msg().

---
 drivers/staging/rtl8188eu/include/usb_ops.h      |   19 -------------------
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c |   10 +---------
 2 files changed, 1 insertion(+), 28 deletions(-)
drivers/staging/rtl8188eu/include/usb_ops.h +0 -19
index 79d206e..eb934bf 100644
@@ -35,25 +35,6 @@
 #include <usb_ops_linux.h>
 
 /*
- * Increase and check if the continual_urb_error of this @param dvobjprivei
- * is larger than MAX_CONTINUAL_URB_ERR
- * @return true:
- * @return false:
- */
-static inline int rtw_inc_and_chk_continual_urb_error(struct dvobj_priv *dvobj)
-{
-	int ret = false;
-	int value;
-	value = atomic_inc_return(&dvobj->continual_urb_error);
-	if (value > MAX_CONTINUAL_URB_ERR) {
-		DBG_88E("[dvobj:%p][ERROR] continual_urb_error:%d > %d\n",
-			dvobj, value, MAX_CONTINUAL_URB_ERR);
-		ret = true;
-	}
-	return ret;
-}
-
-/*
 * Set the continual_urb_error of this @param dvobjprive to 0
 */
 static inline void rtw_reset_continual_urb_error(struct dvobj_priv *dvobj)
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +1 -9
index 363f7f5..9f9bb06 100644
@@ -300,11 +300,6 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i
 				}
 			}
 
-			if (rtw_inc_and_chk_continual_urb_error(dvobjpriv)) {
-				adapt->bSurpriseRemoved = true;
-				break;
-			}
-
 		}
 
 		/*  firmware download is checksumed, don't retry */
@@ -432,15 +427,12 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 		skb_put(precvbuf->pskb, purb->actual_length);
 		precvbuf->pskb = NULL;
 
-		if (rtw_inc_and_chk_continual_urb_error(adapter_to_dvobj(adapt)))
-			adapt->bSurpriseRemoved = true;
-
 		switch (purb->status) {
 		case -EINVAL:
 		case -EPIPE:
 		case -ENODEV:
 		case -ESHUTDOWN:
-			RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bSurpriseRemoved=true\n"));
+			adapt->bSurpriseRemoved = true;
 		case -ENOENT:
 			adapt->bDriverStopped = true;
 			RT_TRACE(_module_hci_ops_os_c_, _drv_err_, ("usb_read_port_complete:bDriverStopped=true\n"));
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH 6/7 staging: rtl8188eu: Remove continual_urb_error from struct dvobj_priv

In reply to navin patidar

rtw_inc_and_chk_continual_urb_error() was only user of continual_urb_error, which has been removed.

---
 drivers/staging/rtl8188eu/include/drv_types.h    |    2 --
 drivers/staging/rtl8188eu/include/usb_ops.h      |    8 --------
 drivers/staging/rtl8188eu/os_dep/usb_intf.c      |    2 --
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c |    3 ---
 4 files changed, 15 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -2
index 6750135..097fcc9 100644
@@ -174,8 +174,6 @@ struct dvobj_priv {
 
 	struct usb_interface *pusbintf;
 	struct usb_device *pusbdev;
-
-	atomic_t continual_urb_error;
 };
 
 static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)
drivers/staging/rtl8188eu/include/usb_ops.h +0 -8
index eb934bf..ea23b459 100644
@@ -34,14 +34,6 @@
 
 #include <usb_ops_linux.h>
 
-/*
-* Set the continual_urb_error of this @param dvobjprive to 0
-*/
-static inline void rtw_reset_continual_urb_error(struct dvobj_priv *dvobj)
-{
-	atomic_set(&dvobj->continual_urb_error, 0);
-}
-
 #define USB_HIGH_SPEED_BULK_SIZE	512
 #define USB_FULL_SPEED_BULK_SIZE	64
 
drivers/staging/rtl8188eu/os_dep/usb_intf.c +0 -2
index c4a4880..4af2c95 100644
@@ -121,8 +121,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
 	if (!pdvobjpriv->usb_vendor_req_buf)
 		goto free_dvobj;
 
-	rtw_reset_continual_urb_error(pdvobjpriv);
-
 	usb_get_dev(pusbd);
 
 	status = _SUCCESS;
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +0 -3
index 9f9bb06..ad7c48e 100644
@@ -276,7 +276,6 @@ static int usbctrl_vendorreq(struct adapter *adapt, u8 request, u16 value, u16 i
 		status = usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
 
 		if (status == len) {   /*  Success this control transfer. */
-			rtw_reset_continual_urb_error(dvobjpriv);
 			if (requesttype == 0x01)
 				memcpy(pdata, pIo_buf,  len);
 		} else { /*  error cases */
@@ -408,8 +407,6 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
 			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));
-
 			skb_put(precvbuf->pskb, purb->actual_length);
 			skb_queue_tail(&precvpriv->rx_skb_queue, precvbuf->pskb);
 
Signature · 1 line
1.7.10.4
#7 lore raw

PATCH 7/7 staging: rtl8188eu: Merge usb_ops.h into usb_ops_linux.h

In reply to navin patidar
---
 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c    |    1 -
 drivers/staging/rtl8188eu/core/rtw_recv.c         |    1 -
 drivers/staging/rtl8188eu/core/rtw_xmit.c         |    1 -
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c |    2 -
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c    |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c    |    2 +-
 drivers/staging/rtl8188eu/hal/usb_halinit.c       |    1 -
 drivers/staging/rtl8188eu/include/usb_ops.h       |   55 ---------------------
 drivers/staging/rtl8188eu/include/usb_ops_linux.h |   25 ++++++++++
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c    |    1 -
 drivers/staging/rtl8188eu/os_dep/recv_linux.c     |    2 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c       |    2 +-
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c  |    1 -
 13 files changed, 29 insertions(+), 67 deletions(-)
 delete mode 100644 drivers/staging/rtl8188eu/include/usb_ops.h
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +0 -1
index f1398ab..3dea17f 100644
@@ -26,7 +26,6 @@
 #include <hal_intf.h>
 
 #include <usb_osintf.h>
-#include <usb_ops.h>
 
 extern void indicate_wx_scan_complete_event(struct adapter *padapter);
 
drivers/staging/rtl8188eu/core/rtw_recv.c +0 -1
index 0e73df5..eaf43f2 100644
@@ -23,7 +23,6 @@
 #include <drv_types.h>
 #include <recv_osdep.h>
 #include <mlme_osdep.h>
-#include <usb_ops.h>
 #include <wifi.h>
 #include <linux/vmalloc.h>
 
drivers/staging/rtl8188eu/core/rtw_xmit.c +0 -1
index a113f0f..eb938a5 100644
@@ -23,7 +23,6 @@
 #include <drv_types.h>
 #include <wifi.h>
 #include <osdep_intf.h>
-#include <usb_ops.h>
 #include <usb_osintf.h>
 #include <linux/vmalloc.h>
 
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -2
index 7ea0320..4d3ea7c 100644
@@ -28,8 +28,6 @@
 
 #include <rtw_iol.h>
 
-#include <usb_ops.h>
-
 void iol_mode_enable(struct adapter *padapter, u8 enable)
 {
 	u8 reg_0xf0 = 0;
drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c +1 -1
index 0f6222d..32e59c5 100644
@@ -23,7 +23,7 @@
 #include <recv_osdep.h>
 #include <mlme_osdep.h>
 
-#include <usb_ops.h>
+#include <usb_ops_linux.h>
 #include <wifi.h>
 
 #include <rtl8188e_hal.h>
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +1 -1
index 4bc2ce0..3112e6c 100644
@@ -22,7 +22,7 @@
 #include <drv_types.h>
 #include <wifi.h>
 #include <osdep_intf.h>
-#include <usb_ops.h>
+#include <usb_ops_linux.h>
 #include <rtl8188e_hal.h>
 
 s32	rtl8188eu_init_xmit_priv(struct adapter *adapt)
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -1
index 03701ca..8c26d0a 100644
@@ -26,7 +26,6 @@
 #include <rtl8188e_hal.h>
 #include <rtl8188e_led.h>
 #include <rtw_iol.h>
-#include <usb_ops.h>
 #include <usb_hal.h>
 #include <usb_osintf.h>
 
drivers/staging/rtl8188eu/include/usb_ops.h deleted +0 -55

55 lines not on this page · raw message

drivers/staging/rtl8188eu/include/usb_ops_linux.h +25 -0
index 5fc4247..01b3810 100644
@@ -29,6 +29,16 @@
 
 #define RTW_USB_BULKOUT_TIME	5000/* ms */
 
+#define REALTEK_USB_VENQT_READ		0xC0
+#define REALTEK_USB_VENQT_WRITE		0x40
+
+#define ALIGNMENT_UNIT			16
+#define MAX_VENDOR_REQ_CMD_SIZE	254	/* 8188cu SIE Support */
+#define MAX_USB_IO_CTL_SIZE	(MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT)
+
+#define USB_HIGH_SPEED_BULK_SIZE	512
+#define USB_FULL_SPEED_BULK_SIZE	64
+
 #define _usbctrl_vendorreq_async_callback(urb, regs)	\
 	_usbctrl_vendorreq_async_callback(urb)
 #define usb_bulkout_zero_complete(purb, regs)		\
@@ -42,6 +52,21 @@
 #define usb_read_interrupt_complete(purb, regs)		\
 	usb_read_interrupt_complete(purb)
 
+static inline u8 rtw_usb_bulk_size_boundary(struct adapter *padapter,
+					    int buf_len)
+{
+	u8 rst = true;
+	struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
+
+	if (pdvobjpriv->ishighspeed)
+		rst = (0 == (buf_len) % USB_HIGH_SPEED_BULK_SIZE) ?
+		      true : false;
+	else
+		rst = (0 == (buf_len) % USB_FULL_SPEED_BULK_SIZE) ?
+		      true : false;
+	return rst;
+}
+
 unsigned int ffaddr2pipehdl(struct dvobj_priv *pdvobj, u32 addr);
 
 u8 usb_read8(struct adapter *adapter, u32 addr);
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +0 -1
index 56e24fa..9b5c549 100644
@@ -29,7 +29,6 @@
 #include <rtw_ioctl.h>
 #include <rtw_ioctl_set.h>
 #include <rtw_mp_ioctl.h>
-#include <usb_ops.h>
 #include <rtl8188e_hal.h>
 
 #include <rtw_mp.h>
drivers/staging/rtl8188eu/os_dep/recv_linux.c +1 -1
index 64dfc02..632ed82 100644
@@ -26,7 +26,7 @@
 #include <recv_osdep.h>
 
 #include <osdep_intf.h>
-#include <usb_ops.h>
+#include <usb_ops_linux.h>
 
 /* alloc os related resource in struct recv_frame */
 int rtw_os_recv_resource_alloc(struct adapter *padapter,
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -1
index 4af2c95..714c14e 100644
@@ -28,7 +28,7 @@
 #include <linux/vmalloc.h>
 #include <osdep_intf.h>
 
-#include <usb_ops.h>
+#include <usb_ops_linux.h>
 #include <usb_osintf.h>
 #include <usb_hal.h>
 #include <rtw_ioctl.h>
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +0 -1
index ad7c48e..9e8b8c1 100644
@@ -19,7 +19,6 @@
 #define _USB_OPS_LINUX_C_
 
 #include <drv_types.h>
-#include <usb_ops.h>
 #include <recv_osdep.h>
 #include <rtw_sreset.h>
 
Signature · 1 line
1.7.10.4