1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
|
--- linux/drivers/usb/acm.c.orig 2006-04-07 13:56:33.837683000 +0200
+++ linux/drivers/usb/acm.c 2006-04-07 12:14:37.995466750 +0200
@@ -155,6 +155,11 @@
unsigned char clocal; /* termios CLOCAL */
};
+/* global params controlling max sizes for read, write, control */
+static int maxszr = 0;
+static int maxszw = 0;
+static int maxszc = 0;
+
static struct usb_driver acm_driver;
static struct tty_driver acm_tty_driver;
static struct acm *acm_table[ACM_TTY_MINORS];
@@ -573,9 +578,13 @@
}
memset(acm, 0, sizeof(struct acm));
- ctrlsize = epctrl->wMaxPacketSize;
- readsize = epread->wMaxPacketSize;
- acm->writesize = epwrite->wMaxPacketSize;
+ ctrlsize = (epctrl->wMaxPacketSize > maxszc)?
+ epctrl->wMaxPacketSize: maxszc;
+ readsize = (epread->wMaxPacketSize > maxszr)?
+ epread->wMaxPacketSize: maxszr;
+ acm->writesize = (epwrite->wMaxPacketSize > maxszw)?
+ epwrite->wMaxPacketSize: maxszw;
+
acm->iface = cfacm->interface + j;
acm->minor = minor;
acm->dev = dev;
@@ -740,6 +749,16 @@
module_init(acm_init);
module_exit(acm_exit);
+
+MODULE_PARM(maxszr, "i");
+MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size");
+
+MODULE_PARM(maxszw, "i");
+MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size");
+
+MODULE_PARM(maxszc, "i");
+MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size");
+
MODULE_AUTHOR( DRIVER_AUTHOR );
MODULE_DESCRIPTION( DRIVER_DESC );
MODULE_LICENSE("GPL");
--- linux/drivers/usb/serial/usbserial.c-orig 2009-02-27 23:34:48.000000000 +0100
+++ linux/drivers/usb/serial/usbserial.c 2009-02-27 23:34:54.000000000 +0100
@@ -332,6 +332,9 @@
static __u16 vendor = 0x05f9;
static __u16 product = 0xffff;
+static int count_smaller64 = 0;
+static int count_bigger64 = 0;
+
static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
/* All of the device info needed for the Generic Serial Converter */
@@ -396,6 +399,10 @@
drivers depend on it.
*/
+/* global params controlling max sizes for read, write, control */
+static int maxszr = 0;
+static int maxszw = 0;
+static int maxszc = 0;
static int serial_refcount;
static struct tty_driver serial_tty_driver;
@@ -1272,6 +1279,14 @@
tty_flip_buffer_push(tty);
}
+ if (urb->actual_length>64) {
+ count_bigger64++;
+ } else {
+ count_smaller64++;
+ }
+
+ /*printk("*** %d\n", urb->actual_length);*/
+
/* Continue trying to always read */
usb_fill_bulk_urb (port->read_urb, serial->dev,
usb_rcvbulkpipe (serial->dev,
@@ -1505,7 +1520,8 @@
err("No free urbs available");
goto probe_error;
}
- buffer_size = endpoint->wMaxPacketSize;
+ buffer_size = (endpoint->wMaxPacketSize > maxszr)?
+ endpoint->wMaxPacketSize: maxszr;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
if (!port->bulk_in_buffer) {
@@ -1530,7 +1546,8 @@
err("No free urbs available");
goto probe_error;
}
- buffer_size = endpoint->wMaxPacketSize;
+ buffer_size = (endpoint->wMaxPacketSize > maxszw)?
+ endpoint->wMaxPacketSize: maxszw;
port->bulk_out_size = buffer_size;
port->bulk_out_endpointAddress = endpoint->bEndpointAddress;
port->bulk_out_buffer = kmalloc (buffer_size, GFP_KERNEL);
@@ -1556,7 +1573,8 @@
err("No free urbs available");
goto probe_error;
}
- buffer_size = endpoint->wMaxPacketSize;
+ buffer_size = (endpoint->wMaxPacketSize > maxszc)?
+ endpoint->wMaxPacketSize: maxszc;
port->interrupt_in_endpointAddress = endpoint->bEndpointAddress;
port->interrupt_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
if (!port->interrupt_in_buffer) {
@@ -1798,6 +1816,7 @@
static void __exit usb_serial_exit(void)
{
+ printk("*** received packets\n< 64: %d\n> 64: %d\n", count_smaller64, count_bigger64);
#ifdef CONFIG_USB_SERIAL_GENERIC
/* remove our generic driver */
@@ -1865,6 +1884,15 @@
MODULE_PARM(debug, "i");
MODULE_PARM_DESC(debug, "Debug enabled or not");
+MODULE_PARM(maxszr, "i");
+MODULE_PARM_DESC(maxszr, "User specified USB endpoint read size");
+
+MODULE_PARM(maxszw, "i");
+MODULE_PARM_DESC(maxszw, "User specified USB endpoint write size");
+
+MODULE_PARM(maxszc, "i");
+MODULE_PARM_DESC(maxszc, "User specified USB endpoint control size");
+
#ifdef CONFIG_USB_SERIAL_GENERIC
MODULE_PARM(vendor, "h");
MODULE_PARM_DESC(vendor, "User specified USB idVendor");
|
