---

yaml --- r: 289663 b: refs/heads/master c: 159d4d8 h: refs/heads/master i: 289661: 4ce01d3 289659: e2ab4d5 289655: 7ac3a97 289647: 7298887 289631: ff0f06d 289599: 8de4422 289535: e97f628 v: v3
git-mirror · Mar 8, 2012 · bc9c1a2 · bc9c1a2
1 parent dde5ce5
commit bc9c1a2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 55 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1935e357bb2a3031772730293a3725e3cca07778
+refs/heads/master: 159d4d8d5e9416dba78b84d4be10d7b1172728ee
diff --git a/trunk/drivers/usb/serial/metro-usb.c b/trunk/drivers/usb/serial/metro-usb.c
@@ -40,15 +40,34 @@
 #include <linux/tty_flip.h>
 #include <linux/moduleparam.h>
 #include <linux/spinlock.h>
-#include <asm/uaccess.h>
 #include <linux/errno.h>
-#include "metro-usb.h"
 #include <linux/usb/serial.h>
+#include <asm/uaccess.h>
 
 /* Version Information */
 #define DRIVER_VERSION "v1.2.0.0"
 #define DRIVER_DESC "Metrologic Instruments Inc. - USB-POS driver"
 
+/* Product information. */
+#define FOCUS_VENDOR_ID			0x0C2E
+#define FOCUS_PRODUCT_ID		0x0720
+#define FOCUS_PRODUCT_ID_UNI		0x0710
+
+#define METROUSB_SET_REQUEST_TYPE	0x40
+#define METROUSB_SET_MODEM_CTRL_REQUEST	10
+#define METROUSB_SET_BREAK_REQUEST	0x40
+#define METROUSB_MCR_NONE		0x08	/* Deactivate DTR and RTS. */
+#define METROUSB_MCR_RTS		0x0a	/* Activate RTS. */
+#define METROUSB_MCR_DTR		0x09	/* Activate DTR. */
+#define WDR_TIMEOUT			5000 	/* default urb timeout. */
+
+/* Private data structure. */
+struct metrousb_private {
+	spinlock_t lock;
+	int throttled;
+	unsigned long control_state;
+};
+
 /* Device table list. */
 static struct usb_device_id id_table [] = {
 	{ USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID) },

diff --git a/trunk/drivers/usb/serial/metro-usb.h b/trunk/drivers/usb/serial/metro-usb.h