2005-05-24 00:00:48 +00:00
|
|
|
/*
|
2006-06-02 09:48:56 +00:00
|
|
|
USB Driver for GSM modems
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
Copyright (C) 2005 Matthias Urlichs <smurf@smurf.noris.de>
|
|
|
|
|
|
|
|
|
|
This driver 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.
|
|
|
|
|
|
|
|
|
|
Portions copied from the Keyspan driver by Hugh Blemings <hugh@blemings.org>
|
|
|
|
|
|
2006-08-02 23:41:41 +00:00
|
|
|
History: see the git log.
|
2005-07-14 07:33:47 +00:00
|
|
|
|
|
|
|
|
Work sponsored by: Sigos GmbH, Germany <info@sigos.de>
|
|
|
|
|
|
2006-06-02 09:48:56 +00:00
|
|
|
This driver exists because the "normal" serial driver doesn't work too well
|
|
|
|
|
with GSM modems. Issues:
|
|
|
|
|
- data loss -- one single Receive URB is not nearly enough
|
2006-07-20 02:56:00 +00:00
|
|
|
- nonstandard flow (Option devices) control
|
2006-06-02 09:48:56 +00:00
|
|
|
- controlling the baud rate doesn't make sense
|
|
|
|
|
|
|
|
|
|
This driver is named "option" because the most common device it's
|
|
|
|
|
used for is a PC-Card (with an internal OHCI-USB interface, behind
|
|
|
|
|
which the GSM interface sits), made by Option Inc.
|
|
|
|
|
|
|
|
|
|
Some of the "one port" devices actually exhibit multiple USB instances
|
|
|
|
|
on the USB bus. This is not a bug, these ports are used for different
|
|
|
|
|
device features.
|
2005-05-24 00:00:48 +00:00
|
|
|
*/
|
2005-07-14 07:33:47 +00:00
|
|
|
|
2008-04-10 08:15:53 +00:00
|
|
|
#define DRIVER_VERSION "v0.7.2"
|
2005-05-24 00:00:48 +00:00
|
|
|
#define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>"
|
2006-06-02 09:48:56 +00:00
|
|
|
#define DRIVER_DESC "USB Driver for GSM modems"
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
#include <linux/jiffies.h>
|
|
|
|
|
#include <linux/errno.h>
|
|
|
|
|
#include <linux/tty.h>
|
|
|
|
|
#include <linux/tty_flip.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2005-05-24 00:00:48 +00:00
|
|
|
#include <linux/module.h>
|
2007-06-05 23:46:26 +00:00
|
|
|
#include <linux/bitops.h>
|
2005-05-24 00:00:48 +00:00
|
|
|
#include <linux/usb.h>
|
2006-07-12 04:22:58 +00:00
|
|
|
#include <linux/usb/serial.h>
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
/* Function prototypes */
|
2009-04-16 17:00:45 +00:00
|
|
|
static int option_probe(struct usb_serial *serial,
|
|
|
|
|
const struct usb_device_id *id);
|
2009-09-19 20:13:26 +00:00
|
|
|
static int option_open(struct tty_struct *tty, struct usb_serial_port *port);
|
2009-06-11 11:26:29 +00:00
|
|
|
static void option_close(struct usb_serial_port *port);
|
|
|
|
|
static void option_dtr_rts(struct usb_serial_port *port, int on);
|
|
|
|
|
|
2005-07-27 08:08:30 +00:00
|
|
|
static int option_startup(struct usb_serial *serial);
|
2009-06-02 15:53:55 +00:00
|
|
|
static void option_disconnect(struct usb_serial *serial);
|
|
|
|
|
static void option_release(struct usb_serial *serial);
|
2008-07-22 10:09:07 +00:00
|
|
|
static int option_write_room(struct tty_struct *tty);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 13:55:46 +00:00
|
|
|
static void option_instat_callback(struct urb *urb);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-07-22 10:09:07 +00:00
|
|
|
static int option_write(struct tty_struct *tty, struct usb_serial_port *port,
|
2005-07-27 08:08:30 +00:00
|
|
|
const unsigned char *buf, int count);
|
2008-07-22 10:09:07 +00:00
|
|
|
static int option_chars_in_buffer(struct tty_struct *tty);
|
|
|
|
|
static void option_set_termios(struct tty_struct *tty,
|
|
|
|
|
struct usb_serial_port *port, struct ktermios *old);
|
|
|
|
|
static int option_tiocmget(struct tty_struct *tty, struct file *file);
|
|
|
|
|
static int option_tiocmset(struct tty_struct *tty, struct file *file,
|
2005-07-27 08:08:30 +00:00
|
|
|
unsigned int set, unsigned int clear);
|
2009-06-11 11:26:29 +00:00
|
|
|
static int option_send_setup(struct usb_serial_port *port);
|
2009-07-13 21:24:10 +00:00
|
|
|
#ifdef CONFIG_PM
|
2009-01-27 16:21:40 +00:00
|
|
|
static int option_suspend(struct usb_serial *serial, pm_message_t message);
|
|
|
|
|
static int option_resume(struct usb_serial *serial);
|
2009-07-13 21:24:10 +00:00
|
|
|
#endif
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
/* Vendor and product IDs */
|
2007-02-21 20:53:17 +00:00
|
|
|
#define OPTION_VENDOR_ID 0x0AF0
|
|
|
|
|
#define OPTION_PRODUCT_COLT 0x5000
|
|
|
|
|
#define OPTION_PRODUCT_RICOLA 0x6000
|
|
|
|
|
#define OPTION_PRODUCT_RICOLA_LIGHT 0x6100
|
|
|
|
|
#define OPTION_PRODUCT_RICOLA_QUAD 0x6200
|
|
|
|
|
#define OPTION_PRODUCT_RICOLA_QUAD_LIGHT 0x6300
|
|
|
|
|
#define OPTION_PRODUCT_RICOLA_NDIS 0x6050
|
|
|
|
|
#define OPTION_PRODUCT_RICOLA_NDIS_LIGHT 0x6150
|
|
|
|
|
#define OPTION_PRODUCT_RICOLA_NDIS_QUAD 0x6250
|
|
|
|
|
#define OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT 0x6350
|
|
|
|
|
#define OPTION_PRODUCT_COBRA 0x6500
|
|
|
|
|
#define OPTION_PRODUCT_COBRA_BUS 0x6501
|
|
|
|
|
#define OPTION_PRODUCT_VIPER 0x6600
|
|
|
|
|
#define OPTION_PRODUCT_VIPER_BUS 0x6601
|
|
|
|
|
#define OPTION_PRODUCT_GT_MAX_READY 0x6701
|
|
|
|
|
#define OPTION_PRODUCT_FUJI_MODEM_LIGHT 0x6721
|
|
|
|
|
#define OPTION_PRODUCT_FUJI_MODEM_GT 0x6741
|
|
|
|
|
#define OPTION_PRODUCT_FUJI_MODEM_EX 0x6761
|
|
|
|
|
#define OPTION_PRODUCT_KOI_MODEM 0x6800
|
|
|
|
|
#define OPTION_PRODUCT_SCORPION_MODEM 0x6901
|
|
|
|
|
#define OPTION_PRODUCT_ETNA_MODEM 0x7001
|
|
|
|
|
#define OPTION_PRODUCT_ETNA_MODEM_LITE 0x7021
|
|
|
|
|
#define OPTION_PRODUCT_ETNA_MODEM_GT 0x7041
|
|
|
|
|
#define OPTION_PRODUCT_ETNA_MODEM_EX 0x7061
|
|
|
|
|
#define OPTION_PRODUCT_ETNA_KOI_MODEM 0x7100
|
2009-03-16 14:35:02 +00:00
|
|
|
#define OPTION_PRODUCT_GTM380_MODEM 0x7201
|
2007-02-21 20:53:17 +00:00
|
|
|
|
|
|
|
|
#define HUAWEI_VENDOR_ID 0x12D1
|
|
|
|
|
#define HUAWEI_PRODUCT_E600 0x1001
|
|
|
|
|
#define HUAWEI_PRODUCT_E220 0x1003
|
2007-09-07 18:06:39 +00:00
|
|
|
#define HUAWEI_PRODUCT_E220BIS 0x1004
|
2008-04-10 06:51:06 +00:00
|
|
|
#define HUAWEI_PRODUCT_E1401 0x1401
|
2008-10-15 06:15:36 +00:00
|
|
|
#define HUAWEI_PRODUCT_E1402 0x1402
|
2008-04-10 06:51:06 +00:00
|
|
|
#define HUAWEI_PRODUCT_E1403 0x1403
|
2008-10-15 06:15:36 +00:00
|
|
|
#define HUAWEI_PRODUCT_E1404 0x1404
|
2008-04-10 06:51:06 +00:00
|
|
|
#define HUAWEI_PRODUCT_E1405 0x1405
|
|
|
|
|
#define HUAWEI_PRODUCT_E1406 0x1406
|
2008-10-15 06:15:36 +00:00
|
|
|
#define HUAWEI_PRODUCT_E1407 0x1407
|
2008-04-10 06:51:06 +00:00
|
|
|
#define HUAWEI_PRODUCT_E1408 0x1408
|
|
|
|
|
#define HUAWEI_PRODUCT_E1409 0x1409
|
2008-10-15 06:15:36 +00:00
|
|
|
#define HUAWEI_PRODUCT_E140A 0x140A
|
|
|
|
|
#define HUAWEI_PRODUCT_E140B 0x140B
|
|
|
|
|
#define HUAWEI_PRODUCT_E140C 0x140C
|
|
|
|
|
#define HUAWEI_PRODUCT_E140D 0x140D
|
|
|
|
|
#define HUAWEI_PRODUCT_E140E 0x140E
|
|
|
|
|
#define HUAWEI_PRODUCT_E140F 0x140F
|
2008-04-10 06:51:06 +00:00
|
|
|
#define HUAWEI_PRODUCT_E1410 0x1410
|
|
|
|
|
#define HUAWEI_PRODUCT_E1411 0x1411
|
|
|
|
|
#define HUAWEI_PRODUCT_E1412 0x1412
|
|
|
|
|
#define HUAWEI_PRODUCT_E1413 0x1413
|
|
|
|
|
#define HUAWEI_PRODUCT_E1414 0x1414
|
|
|
|
|
#define HUAWEI_PRODUCT_E1415 0x1415
|
|
|
|
|
#define HUAWEI_PRODUCT_E1416 0x1416
|
|
|
|
|
#define HUAWEI_PRODUCT_E1417 0x1417
|
|
|
|
|
#define HUAWEI_PRODUCT_E1418 0x1418
|
|
|
|
|
#define HUAWEI_PRODUCT_E1419 0x1419
|
2008-10-15 06:15:36 +00:00
|
|
|
#define HUAWEI_PRODUCT_E141A 0x141A
|
|
|
|
|
#define HUAWEI_PRODUCT_E141B 0x141B
|
|
|
|
|
#define HUAWEI_PRODUCT_E141C 0x141C
|
|
|
|
|
#define HUAWEI_PRODUCT_E141D 0x141D
|
|
|
|
|
#define HUAWEI_PRODUCT_E141E 0x141E
|
|
|
|
|
#define HUAWEI_PRODUCT_E141F 0x141F
|
|
|
|
|
#define HUAWEI_PRODUCT_E1420 0x1420
|
|
|
|
|
#define HUAWEI_PRODUCT_E1421 0x1421
|
|
|
|
|
#define HUAWEI_PRODUCT_E1422 0x1422
|
|
|
|
|
#define HUAWEI_PRODUCT_E1423 0x1423
|
|
|
|
|
#define HUAWEI_PRODUCT_E1424 0x1424
|
|
|
|
|
#define HUAWEI_PRODUCT_E1425 0x1425
|
|
|
|
|
#define HUAWEI_PRODUCT_E1426 0x1426
|
|
|
|
|
#define HUAWEI_PRODUCT_E1427 0x1427
|
|
|
|
|
#define HUAWEI_PRODUCT_E1428 0x1428
|
|
|
|
|
#define HUAWEI_PRODUCT_E1429 0x1429
|
|
|
|
|
#define HUAWEI_PRODUCT_E142A 0x142A
|
|
|
|
|
#define HUAWEI_PRODUCT_E142B 0x142B
|
|
|
|
|
#define HUAWEI_PRODUCT_E142C 0x142C
|
|
|
|
|
#define HUAWEI_PRODUCT_E142D 0x142D
|
|
|
|
|
#define HUAWEI_PRODUCT_E142E 0x142E
|
|
|
|
|
#define HUAWEI_PRODUCT_E142F 0x142F
|
|
|
|
|
#define HUAWEI_PRODUCT_E1430 0x1430
|
|
|
|
|
#define HUAWEI_PRODUCT_E1431 0x1431
|
|
|
|
|
#define HUAWEI_PRODUCT_E1432 0x1432
|
|
|
|
|
#define HUAWEI_PRODUCT_E1433 0x1433
|
|
|
|
|
#define HUAWEI_PRODUCT_E1434 0x1434
|
|
|
|
|
#define HUAWEI_PRODUCT_E1435 0x1435
|
|
|
|
|
#define HUAWEI_PRODUCT_E1436 0x1436
|
|
|
|
|
#define HUAWEI_PRODUCT_E1437 0x1437
|
|
|
|
|
#define HUAWEI_PRODUCT_E1438 0x1438
|
|
|
|
|
#define HUAWEI_PRODUCT_E1439 0x1439
|
|
|
|
|
#define HUAWEI_PRODUCT_E143A 0x143A
|
|
|
|
|
#define HUAWEI_PRODUCT_E143B 0x143B
|
|
|
|
|
#define HUAWEI_PRODUCT_E143C 0x143C
|
|
|
|
|
#define HUAWEI_PRODUCT_E143D 0x143D
|
|
|
|
|
#define HUAWEI_PRODUCT_E143E 0x143E
|
|
|
|
|
#define HUAWEI_PRODUCT_E143F 0x143F
|
2009-09-21 19:20:55 +00:00
|
|
|
#define HUAWEI_PRODUCT_E14AC 0x14AC
|
2007-02-21 20:53:17 +00:00
|
|
|
|
2009-01-22 08:01:57 +00:00
|
|
|
#define QUANTA_VENDOR_ID 0x0408
|
|
|
|
|
#define QUANTA_PRODUCT_Q101 0xEA02
|
|
|
|
|
#define QUANTA_PRODUCT_Q111 0xEA03
|
|
|
|
|
#define QUANTA_PRODUCT_GLX 0xEA04
|
|
|
|
|
#define QUANTA_PRODUCT_GKE 0xEA05
|
|
|
|
|
#define QUANTA_PRODUCT_GLE 0xEA06
|
|
|
|
|
|
2007-02-21 20:53:17 +00:00
|
|
|
#define NOVATELWIRELESS_VENDOR_ID 0x1410
|
2008-03-05 08:26:18 +00:00
|
|
|
|
2008-11-12 17:10:07 +00:00
|
|
|
/* YISO PRODUCTS */
|
|
|
|
|
|
|
|
|
|
#define YISO_VENDOR_ID 0x0EAB
|
|
|
|
|
#define YISO_PRODUCT_U893 0xC893
|
|
|
|
|
|
2008-03-05 08:26:18 +00:00
|
|
|
/* MERLIN EVDO PRODUCTS */
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_V640 0x1100
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_V620 0x1110
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_V740 0x1120
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_V720 0x1130
|
|
|
|
|
|
|
|
|
|
/* MERLIN HSDPA/HSPA PRODUCTS */
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_U730 0x1400
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_U740 0x1410
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_U870 0x1420
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_XU870 0x1430
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_X950D 0x1450
|
|
|
|
|
|
|
|
|
|
/* EXPEDITE PRODUCTS */
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_EV620 0x2100
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_ES720 0x2110
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_E725 0x2120
|
2008-04-10 08:13:32 +00:00
|
|
|
#define NOVATELWIRELESS_PRODUCT_ES620 0x2130
|
2008-03-05 08:26:18 +00:00
|
|
|
#define NOVATELWIRELESS_PRODUCT_EU730 0x2400
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_EU740 0x2410
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_EU870D 0x2420
|
|
|
|
|
|
|
|
|
|
/* OVATION PRODUCTS */
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_MC727 0x4100
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_MC950D 0x4400
|
2009-03-15 03:47:39 +00:00
|
|
|
#define NOVATELWIRELESS_PRODUCT_U727 0x5010
|
2009-07-17 13:55:36 +00:00
|
|
|
#define NOVATELWIRELESS_PRODUCT_MC727_NEW 0x5100
|
2009-04-27 01:56:20 +00:00
|
|
|
#define NOVATELWIRELESS_PRODUCT_MC760 0x6000
|
2009-06-30 20:09:28 +00:00
|
|
|
#define NOVATELWIRELESS_PRODUCT_OVMC760 0x6002
|
2008-03-05 08:26:18 +00:00
|
|
|
|
|
|
|
|
/* FUTURE NOVATEL PRODUCTS */
|
2009-02-06 20:48:34 +00:00
|
|
|
#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED 0X6001
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED 0X7000
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED 0X7001
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED 0X8000
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED 0X8001
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0X9000
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0X9001
|
|
|
|
|
#define NOVATELWIRELESS_PRODUCT_GLOBAL 0XA001
|
2008-03-05 08:26:18 +00:00
|
|
|
|
2008-04-14 02:06:35 +00:00
|
|
|
/* AMOI PRODUCTS */
|
|
|
|
|
#define AMOI_VENDOR_ID 0x1614
|
|
|
|
|
#define AMOI_PRODUCT_H01 0x0800
|
|
|
|
|
#define AMOI_PRODUCT_H01A 0x7002
|
|
|
|
|
#define AMOI_PRODUCT_H02 0x0802
|
|
|
|
|
|
2007-08-07 02:46:05 +00:00
|
|
|
#define DELL_VENDOR_ID 0x413C
|
2007-02-21 20:53:17 +00:00
|
|
|
|
2009-02-06 20:48:34 +00:00
|
|
|
/* Dell modems */
|
|
|
|
|
#define DELL_PRODUCT_5700_MINICARD 0x8114
|
|
|
|
|
#define DELL_PRODUCT_5500_MINICARD 0x8115
|
|
|
|
|
#define DELL_PRODUCT_5505_MINICARD 0x8116
|
|
|
|
|
#define DELL_PRODUCT_5700_EXPRESSCARD 0x8117
|
|
|
|
|
#define DELL_PRODUCT_5510_EXPRESSCARD 0x8118
|
|
|
|
|
|
|
|
|
|
#define DELL_PRODUCT_5700_MINICARD_SPRINT 0x8128
|
|
|
|
|
#define DELL_PRODUCT_5700_MINICARD_TELUS 0x8129
|
|
|
|
|
|
|
|
|
|
#define DELL_PRODUCT_5720_MINICARD_VZW 0x8133
|
|
|
|
|
#define DELL_PRODUCT_5720_MINICARD_SPRINT 0x8134
|
|
|
|
|
#define DELL_PRODUCT_5720_MINICARD_TELUS 0x8135
|
|
|
|
|
#define DELL_PRODUCT_5520_MINICARD_CINGULAR 0x8136
|
|
|
|
|
#define DELL_PRODUCT_5520_MINICARD_GENERIC_L 0x8137
|
|
|
|
|
#define DELL_PRODUCT_5520_MINICARD_GENERIC_I 0x8138
|
|
|
|
|
|
|
|
|
|
#define DELL_PRODUCT_5730_MINICARD_SPRINT 0x8180
|
|
|
|
|
#define DELL_PRODUCT_5730_MINICARD_TELUS 0x8181
|
|
|
|
|
#define DELL_PRODUCT_5730_MINICARD_VZW 0x8182
|
|
|
|
|
|
2008-02-19 18:15:30 +00:00
|
|
|
#define KYOCERA_VENDOR_ID 0x0c88
|
2008-06-19 18:21:16 +00:00
|
|
|
#define KYOCERA_PRODUCT_KPC650 0x17da
|
2008-02-19 18:15:30 +00:00
|
|
|
#define KYOCERA_PRODUCT_KPC680 0x180a
|
|
|
|
|
|
2007-02-21 20:53:17 +00:00
|
|
|
#define ANYDATA_VENDOR_ID 0x16d5
|
2008-08-19 08:58:25 +00:00
|
|
|
#define ANYDATA_PRODUCT_ADU_620UW 0x6202
|
2007-06-19 21:48:10 +00:00
|
|
|
#define ANYDATA_PRODUCT_ADU_E100A 0x6501
|
|
|
|
|
#define ANYDATA_PRODUCT_ADU_500A 0x6502
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 17:54:53 +00:00
|
|
|
#define AXESSTEL_VENDOR_ID 0x1726
|
|
|
|
|
#define AXESSTEL_PRODUCT_MV110H 0x1000
|
|
|
|
|
|
2007-04-26 07:38:02 +00:00
|
|
|
#define BANDRICH_VENDOR_ID 0x1A8D
|
|
|
|
|
#define BANDRICH_PRODUCT_C100_1 0x1002
|
|
|
|
|
#define BANDRICH_PRODUCT_C100_2 0x1003
|
2008-08-01 03:40:12 +00:00
|
|
|
#define BANDRICH_PRODUCT_1004 0x1004
|
|
|
|
|
#define BANDRICH_PRODUCT_1005 0x1005
|
|
|
|
|
#define BANDRICH_PRODUCT_1006 0x1006
|
|
|
|
|
#define BANDRICH_PRODUCT_1007 0x1007
|
|
|
|
|
#define BANDRICH_PRODUCT_1008 0x1008
|
|
|
|
|
#define BANDRICH_PRODUCT_1009 0x1009
|
|
|
|
|
#define BANDRICH_PRODUCT_100A 0x100a
|
|
|
|
|
|
|
|
|
|
#define BANDRICH_PRODUCT_100B 0x100b
|
|
|
|
|
#define BANDRICH_PRODUCT_100C 0x100c
|
|
|
|
|
#define BANDRICH_PRODUCT_100D 0x100d
|
|
|
|
|
#define BANDRICH_PRODUCT_100E 0x100e
|
|
|
|
|
|
|
|
|
|
#define BANDRICH_PRODUCT_100F 0x100f
|
|
|
|
|
#define BANDRICH_PRODUCT_1010 0x1010
|
|
|
|
|
#define BANDRICH_PRODUCT_1011 0x1011
|
|
|
|
|
#define BANDRICH_PRODUCT_1012 0x1012
|
2007-04-26 07:38:02 +00:00
|
|
|
|
2008-04-10 08:13:32 +00:00
|
|
|
#define AMOI_VENDOR_ID 0x1614
|
|
|
|
|
#define AMOI_PRODUCT_9508 0x0800
|
|
|
|
|
|
2008-02-14 21:35:16 +00:00
|
|
|
#define QUALCOMM_VENDOR_ID 0x05C6
|
|
|
|
|
|
2010-03-11 18:09:24 +00:00
|
|
|
#define CMOTECH_VENDOR_ID 0x16d8
|
2010-03-11 18:09:26 +00:00
|
|
|
#define CMOTECH_PRODUCT_6008 0x6008
|
2010-03-11 18:01:17 +00:00
|
|
|
#define CMOTECH_PRODUCT_6280 0x6280
|
2008-04-09 08:59:13 +00:00
|
|
|
|
2008-05-15 17:07:44 +00:00
|
|
|
#define TELIT_VENDOR_ID 0x1bc7
|
|
|
|
|
#define TELIT_PRODUCT_UC864E 0x1003
|
2009-09-01 07:04:35 +00:00
|
|
|
#define TELIT_PRODUCT_UC864G 0x1004
|
2008-05-15 17:07:44 +00:00
|
|
|
|
2008-08-09 02:49:26 +00:00
|
|
|
/* ZTE PRODUCTS */
|
|
|
|
|
#define ZTE_VENDOR_ID 0x19d2
|
2009-03-01 08:37:52 +00:00
|
|
|
#define ZTE_PRODUCT_MF622 0x0001
|
2008-08-09 02:49:26 +00:00
|
|
|
#define ZTE_PRODUCT_MF628 0x0015
|
2008-10-18 11:20:02 +00:00
|
|
|
#define ZTE_PRODUCT_MF626 0x0031
|
2008-09-17 17:40:46 +00:00
|
|
|
#define ZTE_PRODUCT_CDMA_TECH 0xfffe
|
2009-07-22 09:54:48 +00:00
|
|
|
#define ZTE_PRODUCT_AC8710 0xfff1
|
2009-09-01 04:37:41 +00:00
|
|
|
#define ZTE_PRODUCT_AC2726 0xfff5
|
2010-04-12 17:07:02 +00:00
|
|
|
#define ZTE_PRODUCT_AC8710T 0xffff
|
2008-08-09 02:49:26 +00:00
|
|
|
|
2010-04-14 19:36:42 +00:00
|
|
|
/* ZTE PRODUCTS -- alternate vendor ID */
|
|
|
|
|
#define ZTE_VENDOR_ID2 0x1d6b
|
|
|
|
|
#define ZTE_PRODUCT_MF_330 0x0002
|
|
|
|
|
|
2009-02-21 05:13:45 +00:00
|
|
|
#define BENQ_VENDOR_ID 0x04a5
|
|
|
|
|
#define BENQ_PRODUCT_H10 0x4068
|
|
|
|
|
|
2009-04-07 12:40:42 +00:00
|
|
|
#define DLINK_VENDOR_ID 0x1186
|
|
|
|
|
#define DLINK_PRODUCT_DWM_652 0x3e04
|
2009-11-04 15:22:59 +00:00
|
|
|
#define DLINK_PRODUCT_DWM_652_U5 0xce16
|
2010-02-28 05:51:29 +00:00
|
|
|
#define DLINK_PRODUCT_DWM_652_U5A 0xce1e
|
2009-04-07 12:40:42 +00:00
|
|
|
|
2009-06-16 10:04:00 +00:00
|
|
|
#define QISDA_VENDOR_ID 0x1da5
|
|
|
|
|
#define QISDA_PRODUCT_H21_4512 0x4512
|
|
|
|
|
#define QISDA_PRODUCT_H21_4523 0x4523
|
|
|
|
|
#define QISDA_PRODUCT_H20_4515 0x4515
|
|
|
|
|
#define QISDA_PRODUCT_H20_4519 0x4519
|
|
|
|
|
|
2009-10-22 07:00:36 +00:00
|
|
|
/* TLAYTECH PRODUCTS */
|
|
|
|
|
#define TLAYTECH_VENDOR_ID 0x20B9
|
|
|
|
|
#define TLAYTECH_PRODUCT_TEU800 0x1682
|
2009-04-07 12:40:42 +00:00
|
|
|
|
2009-05-26 22:09:12 +00:00
|
|
|
/* TOSHIBA PRODUCTS */
|
|
|
|
|
#define TOSHIBA_VENDOR_ID 0x0930
|
|
|
|
|
#define TOSHIBA_PRODUCT_HSDPA_MINICARD 0x1302
|
2009-10-07 14:22:17 +00:00
|
|
|
#define TOSHIBA_PRODUCT_G450 0x0d45
|
2009-05-26 22:09:12 +00:00
|
|
|
|
2009-07-06 16:08:59 +00:00
|
|
|
#define ALINK_VENDOR_ID 0x1e0e
|
|
|
|
|
#define ALINK_PRODUCT_3GU 0x9200
|
|
|
|
|
|
2009-07-23 02:03:43 +00:00
|
|
|
/* ALCATEL PRODUCTS */
|
|
|
|
|
#define ALCATEL_VENDOR_ID 0x1bbb
|
|
|
|
|
#define ALCATEL_PRODUCT_X060S 0x0000
|
|
|
|
|
|
2010-03-05 06:18:05 +00:00
|
|
|
#define PIRELLI_VENDOR_ID 0x1266
|
|
|
|
|
#define PIRELLI_PRODUCT_C100_1 0x1002
|
|
|
|
|
#define PIRELLI_PRODUCT_C100_2 0x1003
|
|
|
|
|
#define PIRELLI_PRODUCT_1004 0x1004
|
|
|
|
|
#define PIRELLI_PRODUCT_1005 0x1005
|
|
|
|
|
#define PIRELLI_PRODUCT_1006 0x1006
|
|
|
|
|
#define PIRELLI_PRODUCT_1007 0x1007
|
|
|
|
|
#define PIRELLI_PRODUCT_1008 0x1008
|
|
|
|
|
#define PIRELLI_PRODUCT_1009 0x1009
|
|
|
|
|
#define PIRELLI_PRODUCT_100A 0x100a
|
|
|
|
|
#define PIRELLI_PRODUCT_100B 0x100b
|
|
|
|
|
#define PIRELLI_PRODUCT_100C 0x100c
|
|
|
|
|
#define PIRELLI_PRODUCT_100D 0x100d
|
|
|
|
|
#define PIRELLI_PRODUCT_100E 0x100e
|
|
|
|
|
#define PIRELLI_PRODUCT_100F 0x100f
|
|
|
|
|
#define PIRELLI_PRODUCT_1011 0x1011
|
|
|
|
|
#define PIRELLI_PRODUCT_1012 0x1012
|
|
|
|
|
|
2009-10-12 09:04:45 +00:00
|
|
|
/* Airplus products */
|
|
|
|
|
#define AIRPLUS_VENDOR_ID 0x1011
|
|
|
|
|
#define AIRPLUS_PRODUCT_MCD650 0x3198
|
2009-07-23 02:03:43 +00:00
|
|
|
|
2010-02-17 02:43:29 +00:00
|
|
|
/* Longcheer/Longsung vendor ID; makes whitelabel devices that
|
|
|
|
|
* many other vendors like 4G Systems, Alcatel, ChinaBird,
|
|
|
|
|
* Mobidata, etc sell under their own brand names.
|
|
|
|
|
*/
|
|
|
|
|
#define LONGCHEER_VENDOR_ID 0x1c9e
|
|
|
|
|
|
2009-11-27 12:49:23 +00:00
|
|
|
/* 4G Systems products */
|
2010-01-11 08:06:44 +00:00
|
|
|
/* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick *
|
|
|
|
|
* It seems to contain a Qualcomm QSC6240/6290 chipset */
|
2009-11-27 12:49:23 +00:00
|
|
|
#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603
|
|
|
|
|
|
2009-12-23 12:03:12 +00:00
|
|
|
/* Haier products */
|
|
|
|
|
#define HAIER_VENDOR_ID 0x201e
|
|
|
|
|
#define HAIER_PRODUCT_CE100 0x2009
|
|
|
|
|
|
2010-01-11 08:30:00 +00:00
|
|
|
/* some devices interfaces need special handling due to a number of reasons */
|
|
|
|
|
enum option_blacklist_reason {
|
|
|
|
|
OPTION_BLACKLIST_NONE = 0,
|
|
|
|
|
OPTION_BLACKLIST_SENDSETUP = 1,
|
|
|
|
|
OPTION_BLACKLIST_RESERVED_IF = 2
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct option_blacklist_info {
|
|
|
|
|
const u32 infolen; /* number of interface numbers on blacklist */
|
|
|
|
|
const u8 *ifaceinfo; /* pointer to the array holding the numbers */
|
|
|
|
|
enum option_blacklist_reason reason;
|
|
|
|
|
};
|
|
|
|
|
|
2010-01-11 08:35:17 +00:00
|
|
|
static const u8 four_g_w14_no_sendsetup[] = { 0, 1 };
|
|
|
|
|
static const struct option_blacklist_info four_g_w14_blacklist = {
|
|
|
|
|
.infolen = ARRAY_SIZE(four_g_w14_no_sendsetup),
|
|
|
|
|
.ifaceinfo = four_g_w14_no_sendsetup,
|
|
|
|
|
.reason = OPTION_BLACKLIST_SENDSETUP
|
|
|
|
|
};
|
|
|
|
|
|
2010-01-10 14:34:24 +00:00
|
|
|
static const struct usb_device_id option_ids[] = {
|
2007-02-21 20:53:17 +00:00
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD_LIGHT) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_LIGHT) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_NDIS_QUAD_LIGHT) },
|
2006-06-02 09:48:56 +00:00
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
|
2007-02-21 20:53:17 +00:00
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA_BUS) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_VIPER_BUS) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GT_MAX_READY) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_LIGHT) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_GT) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUJI_MODEM_EX) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_KOI_MODEM) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_SCORPION_MODEM) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_LITE) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },
|
|
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },
|
2009-03-16 14:35:02 +00:00
|
|
|
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTM380_MODEM) },
|
2009-01-22 08:01:57 +00:00
|
|
|
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_Q101) },
|
|
|
|
|
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_Q111) },
|
|
|
|
|
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
|
|
|
|
|
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
|
|
|
|
|
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
|
2008-05-28 21:58:18 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },
|
2007-11-30 16:30:11 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
|
2008-05-28 21:58:18 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1401, 0xff, 0xff, 0xff) },
|
2008-10-15 06:15:36 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1402, 0xff, 0xff, 0xff) },
|
2008-05-28 21:58:18 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1403, 0xff, 0xff, 0xff) },
|
2008-10-15 06:15:36 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1404, 0xff, 0xff, 0xff) },
|
2008-05-28 21:58:18 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1405, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1406, 0xff, 0xff, 0xff) },
|
2008-10-15 06:15:36 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1407, 0xff, 0xff, 0xff) },
|
2008-05-28 21:58:18 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1408, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1409, 0xff, 0xff, 0xff) },
|
2008-10-15 06:15:36 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140A, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140B, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140C, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140D, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140E, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140F, 0xff, 0xff, 0xff) },
|
2008-05-28 21:58:18 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1410, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1411, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1412, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1413, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1414, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1415, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1416, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1417, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1418, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1419, 0xff, 0xff, 0xff) },
|
2008-10-15 06:15:36 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141A, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141B, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141C, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141D, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141E, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141F, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1420, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1421, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1422, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1423, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1424, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1425, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1426, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1427, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1428, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1429, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142A, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142B, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142C, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142D, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142E, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142F, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1430, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1431, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1432, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1433, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1434, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1435, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1436, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1437, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1438, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1439, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143A, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143B, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143C, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
|
2009-09-21 19:20:55 +00:00
|
|
|
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },
|
2008-04-10 08:13:32 +00:00
|
|
|
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
|
2008-03-05 08:26:18 +00:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V720) }, /* Novatel Merlin V720/S720/PC720 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U730) }, /* Novatel U730/U740 (VF version) */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U740) }, /* Novatel U740 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U870) }, /* Novatel U870 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_XU870) }, /* Novatel Merlin XU870 HSDPA/3G */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_X950D) }, /* Novatel X950D */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, /* Novatel EV620/ES620 CDMA/EV-DO */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, /* Novatel ES620/ES720/U720/USB720 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, /* Novatel E725/E726 */
|
2008-04-10 08:13:32 +00:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES620) }, /* Novatel Merlin ES620 SM Bus */
|
2008-03-05 08:26:18 +00:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, /* Novatel EU730 and Vodafone EU740 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, /* Novatel non-Vodafone EU740 */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */
|
2009-07-17 13:55:36 +00:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727_NEW) }, /* Novatel MC727/U727/USB727 refresh */
|
2009-03-15 03:47:39 +00:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel MC727/U727/USB727 */
|
2009-04-27 01:56:20 +00:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC760) }, /* Novatel MC760/U760/USB760 */
|
2009-06-30 20:09:28 +00:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_OVMC760) }, /* Novatel Ovation MC760 */
|
2009-02-06 20:48:34 +00:00
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) }, /* Novatel HSPA Embedded product */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) }, /* Novatel EVDO product */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) }, /* Novatel HSPA product */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, /* Novatel EVDO Embedded product */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, /* Novatel HSPA Embedded product */
|
|
|
|
|
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL) }, /* Novatel Global product */
|
2008-03-05 08:26:18 +00:00
|
|
|
|
2008-04-14 02:06:35 +00:00
|
|
|
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
|
|
|
|
|
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
|
|
|
|
|
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) },
|
|
|
|
|
|
2009-02-06 20:48:34 +00:00
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5500_MINICARD) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5505_MINICARD) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_EXPRESSCARD) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5510_EXPRESSCARD) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_SPRINT) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_TELUS) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite ET620 CDMA/EV-DO */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_VZW) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_SPRINT) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_TELUS) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) }, /* Dell Wireless HSDPA 5520 */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
|
|
|
|
|
{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
|
2008-10-03 08:36:16 +00:00
|
|
|
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */
|
2007-06-19 21:48:10 +00:00
|
|
|
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
|
2008-08-19 08:58:25 +00:00
|
|
|
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
|
2008-03-04 17:54:53 +00:00
|
|
|
{ USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },
|
2008-11-12 17:10:07 +00:00
|
|
|
{ USB_DEVICE(YISO_VENDOR_ID, YISO_PRODUCT_U893) },
|
2007-04-26 07:38:02 +00:00
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
|
2008-08-01 03:40:12 +00:00
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1004) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1005) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1006) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1007) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1008) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1009) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100A) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100B) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100C) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100D) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100E) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_100F) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1010) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1011) },
|
|
|
|
|
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1012) },
|
2008-06-19 18:21:16 +00:00
|
|
|
{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) },
|
2008-02-19 18:15:30 +00:00
|
|
|
{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
|
2008-07-01 07:41:56 +00:00
|
|
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */
|
2008-02-14 21:35:16 +00:00
|
|
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
|
2010-03-11 18:01:17 +00:00
|
|
|
{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6280) }, /* BP3-USB & BP3-EXT HSDPA */
|
2010-03-11 18:09:26 +00:00
|
|
|
{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6008) },
|
2008-05-15 17:07:44 +00:00
|
|
|
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
|
2009-09-01 07:04:35 +00:00
|
|
|
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) },
|
2009-07-15 20:10:26 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0003, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0006, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0007, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0008, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0009, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000a, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000b, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000c, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000d, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000e, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x000f, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0010, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0011, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0013, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0016, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0022, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0023, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0024, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0026, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0043, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0048, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0051, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0054, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0057, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0061, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0062, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0064, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0066, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0069, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0076, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0078, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0082, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0086, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
|
2009-12-07 03:36:34 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0106, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0108, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0117, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0118, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0121, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0122, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0123, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0124, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0125, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0126, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0128, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0142, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0143, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0144, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0145, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0146, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0147, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0148, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0149, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0150, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0151, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0152, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0153, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0154, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0155, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0156, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0157, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0158, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0159, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0160, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0161, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0162, 0xff, 0xff, 0xff) },
|
2009-07-15 20:10:26 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) }, /* ZTE CDMA products */
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0027, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0059, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0060, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0070, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },
|
2009-12-07 03:36:34 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0141, 0xff, 0xff, 0xff) },
|
2009-07-15 20:10:26 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
|
2009-07-22 09:54:48 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
|
2009-09-01 04:37:41 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
|
2010-04-12 17:07:02 +00:00
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },
|
2010-04-14 19:36:42 +00:00
|
|
|
{ USB_DEVICE(ZTE_VENDOR_ID2, ZTE_PRODUCT_MF_330) },
|
2009-02-21 05:13:45 +00:00
|
|
|
{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
|
2009-04-07 12:40:42 +00:00
|
|
|
{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
|
2009-11-04 15:22:59 +00:00
|
|
|
{ USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */
|
2010-02-28 05:51:29 +00:00
|
|
|
{ USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5A) },
|
2009-06-16 10:04:00 +00:00
|
|
|
{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4512) },
|
|
|
|
|
{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4523) },
|
|
|
|
|
{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4515) },
|
|
|
|
|
{ USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4519) },
|
2009-10-07 14:22:17 +00:00
|
|
|
{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) },
|
2009-05-26 22:09:12 +00:00
|
|
|
{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */
|
2009-07-06 16:08:59 +00:00
|
|
|
{ USB_DEVICE(ALINK_VENDOR_ID, 0x9000) },
|
|
|
|
|
{ USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
|
2009-07-23 02:03:43 +00:00
|
|
|
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) },
|
2009-10-12 09:04:45 +00:00
|
|
|
{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
|
2009-10-22 07:00:36 +00:00
|
|
|
{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
|
2010-02-17 02:43:29 +00:00
|
|
|
{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
|
2010-01-11 08:35:17 +00:00
|
|
|
.driver_info = (kernel_ulong_t)&four_g_w14_blacklist
|
|
|
|
|
},
|
2009-12-23 12:03:12 +00:00
|
|
|
{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
|
2010-03-05 06:18:05 +00:00
|
|
|
/* Pirelli */
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_1)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_C100_2)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1004)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1005)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1006)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1007)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1008)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1009)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100A)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100B) },
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100C) },
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100D) },
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100E) },
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100F) },
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)},
|
|
|
|
|
{ USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)},
|
|
|
|
|
|
2006-06-02 09:48:56 +00:00
|
|
|
{ } /* Terminating entry */
|
|
|
|
|
};
|
2005-05-24 00:00:48 +00:00
|
|
|
MODULE_DEVICE_TABLE(usb, option_ids);
|
|
|
|
|
|
|
|
|
|
static struct usb_driver option_driver = {
|
|
|
|
|
.name = "option",
|
|
|
|
|
.probe = usb_serial_probe,
|
|
|
|
|
.disconnect = usb_serial_disconnect,
|
2009-07-13 21:24:10 +00:00
|
|
|
#ifdef CONFIG_PM
|
2009-01-27 16:21:40 +00:00
|
|
|
.suspend = usb_serial_suspend,
|
|
|
|
|
.resume = usb_serial_resume,
|
2009-07-01 14:00:32 +00:00
|
|
|
.supports_autosuspend = 1,
|
2009-07-13 21:24:10 +00:00
|
|
|
#endif
|
2005-05-24 00:00:48 +00:00
|
|
|
.id_table = option_ids,
|
2005-11-16 21:41:28 +00:00
|
|
|
.no_dynamic_id = 1,
|
2005-05-24 00:00:48 +00:00
|
|
|
};
|
|
|
|
|
|
2006-03-24 17:23:14 +00:00
|
|
|
/* The card has three separate interfaces, which the serial driver
|
2005-05-24 00:00:48 +00:00
|
|
|
* recognizes separately, thus num_port=1.
|
|
|
|
|
*/
|
2006-06-02 09:48:56 +00:00
|
|
|
|
|
|
|
|
static struct usb_serial_driver option_1port_device = {
|
|
|
|
|
.driver = {
|
|
|
|
|
.owner = THIS_MODULE,
|
2006-08-02 23:41:41 +00:00
|
|
|
.name = "option1",
|
2006-06-02 09:48:56 +00:00
|
|
|
},
|
|
|
|
|
.description = "GSM modem (1-port)",
|
2006-12-17 20:50:24 +00:00
|
|
|
.usb_driver = &option_driver,
|
2007-02-21 20:53:17 +00:00
|
|
|
.id_table = option_ids,
|
2006-06-02 09:48:56 +00:00
|
|
|
.num_ports = 1,
|
2009-04-16 17:00:45 +00:00
|
|
|
.probe = option_probe,
|
2005-07-14 07:33:47 +00:00
|
|
|
.open = option_open,
|
|
|
|
|
.close = option_close,
|
2009-06-11 11:26:29 +00:00
|
|
|
.dtr_rts = option_dtr_rts,
|
2005-07-14 07:33:47 +00:00
|
|
|
.write = option_write,
|
|
|
|
|
.write_room = option_write_room,
|
|
|
|
|
.chars_in_buffer = option_chars_in_buffer,
|
|
|
|
|
.set_termios = option_set_termios,
|
|
|
|
|
.tiocmget = option_tiocmget,
|
|
|
|
|
.tiocmset = option_tiocmset,
|
|
|
|
|
.attach = option_startup,
|
2009-06-02 15:53:55 +00:00
|
|
|
.disconnect = option_disconnect,
|
|
|
|
|
.release = option_release,
|
2005-07-14 07:33:47 +00:00
|
|
|
.read_int_callback = option_instat_callback,
|
2009-07-13 21:24:10 +00:00
|
|
|
#ifdef CONFIG_PM
|
2009-01-27 16:21:40 +00:00
|
|
|
.suspend = option_suspend,
|
|
|
|
|
.resume = option_resume,
|
2009-07-13 21:24:10 +00:00
|
|
|
#endif
|
2005-05-24 00:00:48 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int debug;
|
2005-07-14 07:33:47 +00:00
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
/* per port private data */
|
|
|
|
|
|
2005-07-14 07:33:47 +00:00
|
|
|
#define N_IN_URB 4
|
2008-12-16 21:26:07 +00:00
|
|
|
#define N_OUT_URB 4
|
2005-09-22 07:49:33 +00:00
|
|
|
#define IN_BUFLEN 4096
|
2008-12-16 21:26:07 +00:00
|
|
|
#define OUT_BUFLEN 4096
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2009-07-01 14:00:32 +00:00
|
|
|
struct option_intf_private {
|
|
|
|
|
spinlock_t susp_lock;
|
|
|
|
|
unsigned int suspended:1;
|
|
|
|
|
int in_flight;
|
2010-01-11 08:30:00 +00:00
|
|
|
struct option_blacklist_info *blacklist_info;
|
2009-07-01 14:00:32 +00:00
|
|
|
};
|
|
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
struct option_port_private {
|
|
|
|
|
/* Input endpoints and buffer for this port */
|
2005-07-14 07:33:47 +00:00
|
|
|
struct urb *in_urbs[N_IN_URB];
|
2008-02-01 12:58:52 +00:00
|
|
|
u8 *in_buffer[N_IN_URB];
|
2005-05-24 00:00:48 +00:00
|
|
|
/* Output endpoints and buffer for this port */
|
2005-07-14 07:33:47 +00:00
|
|
|
struct urb *out_urbs[N_OUT_URB];
|
2008-02-01 12:58:52 +00:00
|
|
|
u8 *out_buffer[N_OUT_URB];
|
2007-06-05 23:46:26 +00:00
|
|
|
unsigned long out_busy; /* Bit vector of URBs in use */
|
2009-07-01 14:00:32 +00:00
|
|
|
int opened;
|
|
|
|
|
struct usb_anchor delayed;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
/* Settings for the port */
|
2005-07-14 07:33:47 +00:00
|
|
|
int rts_state; /* Handshaking pins (outputs) */
|
|
|
|
|
int dtr_state;
|
|
|
|
|
int cts_state; /* Handshaking pins (inputs) */
|
|
|
|
|
int dsr_state;
|
|
|
|
|
int dcd_state;
|
|
|
|
|
int ri_state;
|
|
|
|
|
|
|
|
|
|
unsigned long tx_start_time[N_OUT_URB];
|
2005-05-24 00:00:48 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Functions used by new usb-serial code. */
|
2005-07-27 08:08:30 +00:00
|
|
|
static int __init option_init(void)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
|
|
|
|
int retval;
|
2006-06-02 09:48:56 +00:00
|
|
|
retval = usb_serial_register(&option_1port_device);
|
|
|
|
|
if (retval)
|
|
|
|
|
goto failed_1port_device_register;
|
2005-05-24 00:00:48 +00:00
|
|
|
retval = usb_register(&option_driver);
|
|
|
|
|
if (retval)
|
|
|
|
|
goto failed_driver_register;
|
|
|
|
|
|
2008-08-18 20:21:04 +00:00
|
|
|
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
|
|
|
|
|
DRIVER_DESC "\n");
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
failed_driver_register:
|
2008-07-22 10:15:45 +00:00
|
|
|
usb_serial_deregister(&option_1port_device);
|
2006-06-02 09:48:56 +00:00
|
|
|
failed_1port_device_register:
|
2005-05-24 00:00:48 +00:00
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-27 08:08:30 +00:00
|
|
|
static void __exit option_exit(void)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2008-07-22 10:15:45 +00:00
|
|
|
usb_deregister(&option_driver);
|
|
|
|
|
usb_serial_deregister(&option_1port_device);
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
module_init(option_init);
|
|
|
|
|
module_exit(option_exit);
|
|
|
|
|
|
2009-04-16 17:00:45 +00:00
|
|
|
static int option_probe(struct usb_serial *serial,
|
|
|
|
|
const struct usb_device_id *id)
|
|
|
|
|
{
|
2009-07-01 14:00:32 +00:00
|
|
|
struct option_intf_private *data;
|
2010-03-05 06:18:05 +00:00
|
|
|
|
2009-04-16 17:00:45 +00:00
|
|
|
/* D-Link DWM 652 still exposes CD-Rom emulation interface in modem mode */
|
|
|
|
|
if (serial->dev->descriptor.idVendor == DLINK_VENDOR_ID &&
|
|
|
|
|
serial->dev->descriptor.idProduct == DLINK_PRODUCT_DWM_652 &&
|
|
|
|
|
serial->interface->cur_altsetting->desc.bInterfaceClass == 0x8)
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
2010-03-05 06:18:05 +00:00
|
|
|
/* Bandrich modem and AT command interface is 0xff */
|
|
|
|
|
if ((serial->dev->descriptor.idVendor == BANDRICH_VENDOR_ID ||
|
|
|
|
|
serial->dev->descriptor.idVendor == PIRELLI_VENDOR_ID) &&
|
|
|
|
|
serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff)
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
2009-07-01 14:00:32 +00:00
|
|
|
data = serial->private = kzalloc(sizeof(struct option_intf_private), GFP_KERNEL);
|
|
|
|
|
if (!data)
|
|
|
|
|
return -ENOMEM;
|
|
|
|
|
spin_lock_init(&data->susp_lock);
|
2010-01-11 08:30:00 +00:00
|
|
|
data->blacklist_info = (struct option_blacklist_info*) id->driver_info;
|
2009-04-16 17:00:45 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-01-11 08:30:00 +00:00
|
|
|
static enum option_blacklist_reason is_blacklisted(const u8 ifnum,
|
|
|
|
|
const struct option_blacklist_info *blacklist)
|
|
|
|
|
{
|
|
|
|
|
const u8 *info;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (blacklist) {
|
|
|
|
|
info = blacklist->ifaceinfo;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < blacklist->infolen; i++) {
|
|
|
|
|
if (info[i] == ifnum)
|
|
|
|
|
return blacklist->reason;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return OPTION_BLACKLIST_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-22 10:09:07 +00:00
|
|
|
static void option_set_termios(struct tty_struct *tty,
|
|
|
|
|
struct usb_serial_port *port, struct ktermios *old_termios)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s", __func__);
|
2007-10-18 08:24:21 +00:00
|
|
|
/* Doesn't support option setting */
|
2008-07-22 10:09:07 +00:00
|
|
|
tty_termios_copy_hw(tty->termios, old_termios);
|
2009-06-11 11:26:29 +00:00
|
|
|
option_send_setup(port);
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
|
2008-07-22 10:09:07 +00:00
|
|
|
static int option_tiocmget(struct tty_struct *tty, struct file *file)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2008-07-22 10:09:07 +00:00
|
|
|
struct usb_serial_port *port = tty->driver_data;
|
2005-07-14 07:33:47 +00:00
|
|
|
unsigned int value;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
value = ((portdata->rts_state) ? TIOCM_RTS : 0) |
|
|
|
|
|
((portdata->dtr_state) ? TIOCM_DTR : 0) |
|
|
|
|
|
((portdata->cts_state) ? TIOCM_CTS : 0) |
|
|
|
|
|
((portdata->dsr_state) ? TIOCM_DSR : 0) |
|
|
|
|
|
((portdata->dcd_state) ? TIOCM_CAR : 0) |
|
|
|
|
|
((portdata->ri_state) ? TIOCM_RNG : 0);
|
|
|
|
|
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-22 10:09:07 +00:00
|
|
|
static int option_tiocmset(struct tty_struct *tty, struct file *file,
|
2005-07-27 08:08:30 +00:00
|
|
|
unsigned int set, unsigned int clear)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2008-07-22 10:09:07 +00:00
|
|
|
struct usb_serial_port *port = tty->driver_data;
|
2005-07-14 07:33:47 +00:00
|
|
|
struct option_port_private *portdata;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
2008-02-20 20:51:45 +00:00
|
|
|
/* FIXME: what locks portdata fields ? */
|
2005-05-24 00:00:48 +00:00
|
|
|
if (set & TIOCM_RTS)
|
|
|
|
|
portdata->rts_state = 1;
|
|
|
|
|
if (set & TIOCM_DTR)
|
|
|
|
|
portdata->dtr_state = 1;
|
|
|
|
|
|
|
|
|
|
if (clear & TIOCM_RTS)
|
|
|
|
|
portdata->rts_state = 0;
|
|
|
|
|
if (clear & TIOCM_DTR)
|
|
|
|
|
portdata->dtr_state = 0;
|
2009-06-11 11:26:29 +00:00
|
|
|
return option_send_setup(port);
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write */
|
2008-07-22 10:09:07 +00:00
|
|
|
static int option_write(struct tty_struct *tty, struct usb_serial_port *port,
|
2005-07-27 08:08:30 +00:00
|
|
|
const unsigned char *buf, int count)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2005-07-14 07:33:47 +00:00
|
|
|
struct option_port_private *portdata;
|
2009-07-01 14:00:32 +00:00
|
|
|
struct option_intf_private *intfdata;
|
2005-07-14 07:33:47 +00:00
|
|
|
int i;
|
|
|
|
|
int left, todo;
|
|
|
|
|
struct urb *this_urb = NULL; /* spurious */
|
|
|
|
|
int err;
|
2009-07-01 14:00:32 +00:00
|
|
|
unsigned long flags;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
2009-07-01 14:00:32 +00:00
|
|
|
intfdata = port->serial->private;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: write (%d chars)", __func__, count);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
left = count;
|
2008-07-22 10:15:45 +00:00
|
|
|
for (i = 0; left > 0 && i < N_OUT_URB; i++) {
|
2005-05-24 00:00:48 +00:00
|
|
|
todo = left;
|
|
|
|
|
if (todo > OUT_BUFLEN)
|
|
|
|
|
todo = OUT_BUFLEN;
|
|
|
|
|
|
2005-07-14 07:33:47 +00:00
|
|
|
this_urb = portdata->out_urbs[i];
|
2007-06-05 23:46:26 +00:00
|
|
|
if (test_and_set_bit(i, &portdata->out_busy)) {
|
2005-07-27 08:08:30 +00:00
|
|
|
if (time_before(jiffies,
|
|
|
|
|
portdata->tx_start_time[i] + 10 * HZ))
|
2005-05-24 00:00:48 +00:00
|
|
|
continue;
|
|
|
|
|
usb_unlink_urb(this_urb);
|
2005-07-14 07:33:47 +00:00
|
|
|
continue;
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: endpoint %d buf %d", __func__,
|
2005-07-27 08:08:30 +00:00
|
|
|
usb_pipeendpoint(this_urb->pipe), i);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2009-07-01 14:00:32 +00:00
|
|
|
err = usb_autopm_get_interface_async(port->serial->interface);
|
|
|
|
|
if (err < 0)
|
|
|
|
|
break;
|
|
|
|
|
|
2005-07-14 07:33:47 +00:00
|
|
|
/* send the data */
|
2008-07-22 10:15:45 +00:00
|
|
|
memcpy(this_urb->transfer_buffer, buf, todo);
|
2005-05-24 00:00:48 +00:00
|
|
|
this_urb->transfer_buffer_length = todo;
|
|
|
|
|
|
2009-07-01 14:00:32 +00:00
|
|
|
spin_lock_irqsave(&intfdata->susp_lock, flags);
|
|
|
|
|
if (intfdata->suspended) {
|
|
|
|
|
usb_anchor_urb(this_urb, &portdata->delayed);
|
|
|
|
|
spin_unlock_irqrestore(&intfdata->susp_lock, flags);
|
|
|
|
|
} else {
|
|
|
|
|
intfdata->in_flight++;
|
|
|
|
|
spin_unlock_irqrestore(&intfdata->susp_lock, flags);
|
|
|
|
|
err = usb_submit_urb(this_urb, GFP_ATOMIC);
|
|
|
|
|
if (err) {
|
|
|
|
|
dbg("usb_submit_urb %p (write bulk) failed "
|
|
|
|
|
"(%d)", this_urb, err);
|
|
|
|
|
clear_bit(i, &portdata->out_busy);
|
|
|
|
|
spin_lock_irqsave(&intfdata->susp_lock, flags);
|
|
|
|
|
intfdata->in_flight--;
|
|
|
|
|
spin_unlock_irqrestore(&intfdata->susp_lock, flags);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
2009-07-01 14:00:32 +00:00
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
portdata->tx_start_time[i] = jiffies;
|
|
|
|
|
buf += todo;
|
|
|
|
|
left -= todo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
count -= left;
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: wrote (did %d)", __func__, count);
|
2005-05-24 00:00:48 +00:00
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 13:55:46 +00:00
|
|
|
static void option_indat_callback(struct urb *urb)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 04:54:13 +00:00
|
|
|
int err;
|
2005-05-24 00:00:48 +00:00
|
|
|
int endpoint;
|
|
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct tty_struct *tty;
|
|
|
|
|
unsigned char *data = urb->transfer_buffer;
|
2007-06-15 22:44:13 +00:00
|
|
|
int status = urb->status;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: %p", __func__, urb);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
endpoint = usb_pipeendpoint(urb->pipe);
|
2008-02-24 10:41:47 +00:00
|
|
|
port = urb->context;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2007-06-15 22:44:13 +00:00
|
|
|
if (status) {
|
2005-05-24 00:00:48 +00:00
|
|
|
dbg("%s: nonzero status: %d on endpoint %02x.",
|
2008-03-04 00:08:34 +00:00
|
|
|
__func__, status, endpoint);
|
2005-05-24 00:00:48 +00:00
|
|
|
} else {
|
2008-10-13 09:39:46 +00:00
|
|
|
tty = tty_port_tty_get(&port->port);
|
2005-05-24 00:00:48 +00:00
|
|
|
if (urb->actual_length) {
|
[PATCH] TTY layer buffering revamp
The API and code have been through various bits of initial review by
serial driver people but they definitely need to live somewhere for a
while so the unconverted drivers can get knocked into shape, existing
drivers that have been updated can be better tuned and bugs whacked out.
This replaces the tty flip buffers with kmalloc objects in rings. In the
normal situation for an IRQ driven serial port at typical speeds the
behaviour is pretty much the same, two buffers end up allocated and the
kernel cycles between them as before.
When there are delays or at high speed we now behave far better as the
buffer pool can grow a bit rather than lose characters. This also means
that we can operate at higher speeds reliably.
For drivers that receive characters in blocks (DMA based, USB and
especially virtualisation) the layer allows a lot of driver specific
code that works around the tty layer with private secondary queues to be
removed. The IBM folks need this sort of layer, the smart serial port
people do, the virtualisers do (because a virtualised tty typically
operates at infinite speed rather than emulating 9600 baud).
Finally many drivers had invalid and unsafe attempts to avoid buffer
overflows by directly invoking tty methods extracted out of the innards
of work queue structs. These are no longer needed and all go away. That
fixes various random hangs with serial ports on overflow.
The other change in here is to optimise the receive_room path that is
used by some callers. It turns out that only one ldisc uses receive room
except asa constant and it updates it far far less than the value is
read. We thus make it a variable not a function call.
I expect the code to contain bugs due to the size alone but I'll be
watching and squashing them and feeding out new patches as it goes.
Because the buffers now dynamically expand you should only run out of
buffering when the kernel runs out of memory for real. That means a lot of
the horrible hacks high performance drivers used to do just aren't needed any
more.
Description:
tty_insert_flip_char is an old API and continues to work as before, as does
tty_flip_buffer_push() [this is why many drivers dont need modification]. It
does now also return the number of chars inserted
There are also
tty_buffer_request_room(tty, len)
which asks for a buffer block of the length requested and returns the space
found. This improves efficiency with hardware that knows how much to
transfer.
and tty_insert_flip_string_flags(tty, str, flags, len)
to insert a string of characters and flags
For a smart interface the usual code is
len = tty_request_buffer_room(tty, amount_hardware_says);
tty_insert_flip_string(tty, buffer_from_card, len);
More description!
At the moment tty buffers are attached directly to the tty. This is causing a
lot of the problems related to tty layer locking, also problems at high speed
and also with bursty data (such as occurs in virtualised environments)
I'm working on ripping out the flip buffers and replacing them with a pool of
dynamically allocated buffers. This allows both for old style "byte I/O"
devices and also helps virtualisation and smart devices where large blocks of
data suddenely materialise and need storing.
So far so good. Lots of drivers reference tty->flip.*. Several of them also
call directly and unsafely into function pointers it provides. This will all
break. Most drivers can use tty_insert_flip_char which can be kept as an API
but others need more.
At the moment I've added the following interfaces, if people think more will
be needed now is a good time to say
int tty_buffer_request_room(tty, size)
Try and ensure at least size bytes are available, returns actual room (may be
zero). At the moment it just uses the flipbuf space but that will change.
Repeated calls without characters being added are not cumulative. (ie if you
call it with 1, 1, 1, and then 4 you'll have four characters of space. The
other functions will also try and grow buffers in future but this will be a
more efficient way when you know block sizes.
int tty_insert_flip_char(tty, ch, flag)
As before insert a character if there is room. Now returns 1 for success, 0
for failure.
int tty_insert_flip_string(tty, str, len)
Insert a block of non error characters. Returns the number inserted.
int tty_prepare_flip_string(tty, strptr, len)
Adjust the buffer to allow len characters to be added. Returns a buffer
pointer in strptr and the length available. This allows for hardware that
needs to use functions like insl or mencpy_fromio.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 04:54:13 +00:00
|
|
|
tty_insert_flip_string(tty, data, urb->actual_length);
|
2005-05-24 00:00:48 +00:00
|
|
|
tty_flip_buffer_push(tty);
|
2008-10-13 09:39:46 +00:00
|
|
|
} else
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: empty read urb received", __func__);
|
2008-10-13 09:39:46 +00:00
|
|
|
tty_kref_put(tty);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
/* Resubmit urb so we continue receiving */
|
2010-02-17 15:05:47 +00:00
|
|
|
if (status != -ESHUTDOWN) {
|
2005-05-24 00:00:48 +00:00
|
|
|
err = usb_submit_urb(urb, GFP_ATOMIC);
|
2010-02-17 15:05:47 +00:00
|
|
|
if (err && err != -EPERM)
|
2005-07-27 08:08:30 +00:00
|
|
|
printk(KERN_ERR "%s: resubmit read urb failed. "
|
2008-03-04 00:08:34 +00:00
|
|
|
"(%d)", __func__, err);
|
2009-07-01 14:00:32 +00:00
|
|
|
else
|
|
|
|
|
usb_mark_last_busy(port->serial->dev);
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
2009-07-01 14:00:32 +00:00
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 13:55:46 +00:00
|
|
|
static void option_outdat_callback(struct urb *urb)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
|
|
|
|
struct usb_serial_port *port;
|
2007-06-05 23:46:26 +00:00
|
|
|
struct option_port_private *portdata;
|
2009-07-01 14:00:32 +00:00
|
|
|
struct option_intf_private *intfdata;
|
2007-06-05 23:46:26 +00:00
|
|
|
int i;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s", __func__);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-02-24 10:41:47 +00:00
|
|
|
port = urb->context;
|
2009-07-01 14:00:32 +00:00
|
|
|
intfdata = port->serial->private;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2006-05-23 04:58:49 +00:00
|
|
|
usb_serial_port_softint(port);
|
2009-07-01 14:00:32 +00:00
|
|
|
usb_autopm_put_interface_async(port->serial->interface);
|
2007-06-05 23:46:26 +00:00
|
|
|
portdata = usb_get_serial_port_data(port);
|
2009-07-01 14:00:32 +00:00
|
|
|
spin_lock(&intfdata->susp_lock);
|
|
|
|
|
intfdata->in_flight--;
|
|
|
|
|
spin_unlock(&intfdata->susp_lock);
|
|
|
|
|
|
2007-06-05 23:46:26 +00:00
|
|
|
for (i = 0; i < N_OUT_URB; ++i) {
|
|
|
|
|
if (portdata->out_urbs[i] == urb) {
|
|
|
|
|
smp_mb__before_clear_bit();
|
|
|
|
|
clear_bit(i, &portdata->out_busy);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 13:55:46 +00:00
|
|
|
static void option_instat_callback(struct urb *urb)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
|
|
|
|
int err;
|
2007-06-15 22:44:13 +00:00
|
|
|
int status = urb->status;
|
2008-02-24 10:41:47 +00:00
|
|
|
struct usb_serial_port *port = urb->context;
|
2005-05-24 00:00:48 +00:00
|
|
|
struct option_port_private *portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s", __func__);
|
2008-07-22 10:15:45 +00:00
|
|
|
dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2007-06-15 22:44:13 +00:00
|
|
|
if (status == 0) {
|
2005-05-24 00:00:48 +00:00
|
|
|
struct usb_ctrlrequest *req_pkt =
|
|
|
|
|
(struct usb_ctrlrequest *)urb->transfer_buffer;
|
|
|
|
|
|
|
|
|
|
if (!req_pkt) {
|
2010-02-06 00:50:08 +00:00
|
|
|
dbg("%s: NULL req_pkt", __func__);
|
2005-05-24 00:00:48 +00:00
|
|
|
return;
|
|
|
|
|
}
|
2005-07-27 08:08:30 +00:00
|
|
|
if ((req_pkt->bRequestType == 0xA1) &&
|
|
|
|
|
(req_pkt->bRequest == 0x20)) {
|
2005-05-24 00:00:48 +00:00
|
|
|
int old_dcd_state;
|
|
|
|
|
unsigned char signals = *((unsigned char *)
|
2005-07-27 08:08:30 +00:00
|
|
|
urb->transfer_buffer +
|
|
|
|
|
sizeof(struct usb_ctrlrequest));
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: signal x%x", __func__, signals);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
old_dcd_state = portdata->dcd_state;
|
|
|
|
|
portdata->cts_state = 1;
|
|
|
|
|
portdata->dcd_state = ((signals & 0x01) ? 1 : 0);
|
|
|
|
|
portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
|
|
|
|
|
portdata->ri_state = ((signals & 0x08) ? 1 : 0);
|
|
|
|
|
|
2008-10-13 09:39:46 +00:00
|
|
|
if (old_dcd_state && !portdata->dcd_state) {
|
|
|
|
|
struct tty_struct *tty =
|
|
|
|
|
tty_port_tty_get(&port->port);
|
|
|
|
|
if (tty && !C_CLOCAL(tty))
|
|
|
|
|
tty_hangup(tty);
|
|
|
|
|
tty_kref_put(tty);
|
|
|
|
|
}
|
2005-07-27 08:08:30 +00:00
|
|
|
} else {
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: type %x req %x", __func__,
|
2008-07-22 10:15:45 +00:00
|
|
|
req_pkt->bRequestType, req_pkt->bRequest);
|
2005-07-27 08:08:30 +00:00
|
|
|
}
|
2005-05-24 00:00:48 +00:00
|
|
|
} else
|
2009-01-27 16:21:40 +00:00
|
|
|
err("%s: error %d", __func__, status);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
/* Resubmit urb so we continue receiving IRQ data */
|
2009-01-27 16:21:40 +00:00
|
|
|
if (status != -ESHUTDOWN && status != -ENOENT) {
|
2005-05-24 00:00:48 +00:00
|
|
|
err = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
|
if (err)
|
2005-07-27 08:08:30 +00:00
|
|
|
dbg("%s: resubmit intr urb failed. (%d)",
|
2008-03-04 00:08:34 +00:00
|
|
|
__func__, err);
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-22 10:09:07 +00:00
|
|
|
static int option_write_room(struct tty_struct *tty)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2008-07-22 10:09:07 +00:00
|
|
|
struct usb_serial_port *port = tty->driver_data;
|
2005-05-24 00:00:48 +00:00
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
int i;
|
|
|
|
|
int data_len = 0;
|
|
|
|
|
struct urb *this_urb;
|
|
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
2008-07-22 10:15:45 +00:00
|
|
|
for (i = 0; i < N_OUT_URB; i++) {
|
2005-05-24 00:00:48 +00:00
|
|
|
this_urb = portdata->out_urbs[i];
|
2007-06-05 23:46:26 +00:00
|
|
|
if (this_urb && !test_bit(i, &portdata->out_busy))
|
2005-05-24 00:00:48 +00:00
|
|
|
data_len += OUT_BUFLEN;
|
2005-07-14 07:33:47 +00:00
|
|
|
}
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: %d", __func__, data_len);
|
2005-05-24 00:00:48 +00:00
|
|
|
return data_len;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-22 10:09:07 +00:00
|
|
|
static int option_chars_in_buffer(struct tty_struct *tty)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2008-07-22 10:09:07 +00:00
|
|
|
struct usb_serial_port *port = tty->driver_data;
|
2005-05-24 00:00:48 +00:00
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
int i;
|
|
|
|
|
int data_len = 0;
|
|
|
|
|
struct urb *this_urb;
|
|
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
2008-07-22 10:15:45 +00:00
|
|
|
for (i = 0; i < N_OUT_URB; i++) {
|
2005-05-24 00:00:48 +00:00
|
|
|
this_urb = portdata->out_urbs[i];
|
2008-04-08 16:16:06 +00:00
|
|
|
/* FIXME: This locking is insufficient as this_urb may
|
|
|
|
|
go unused during the test */
|
2007-06-05 23:46:26 +00:00
|
|
|
if (this_urb && test_bit(i, &portdata->out_busy))
|
2005-05-24 00:00:48 +00:00
|
|
|
data_len += this_urb->transfer_buffer_length;
|
2005-07-14 07:33:47 +00:00
|
|
|
}
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: %d", __func__, data_len);
|
2005-05-24 00:00:48 +00:00
|
|
|
return data_len;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-19 20:13:26 +00:00
|
|
|
static int option_open(struct tty_struct *tty, struct usb_serial_port *port)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2005-07-14 07:33:47 +00:00
|
|
|
struct option_port_private *portdata;
|
2009-07-01 14:00:32 +00:00
|
|
|
struct option_intf_private *intfdata;
|
|
|
|
|
struct usb_serial *serial = port->serial;
|
2005-07-14 07:33:47 +00:00
|
|
|
int i, err;
|
|
|
|
|
struct urb *urb;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
2009-07-01 14:00:32 +00:00
|
|
|
intfdata = serial->private;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s", __func__);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2009-07-09 16:58:43 +00:00
|
|
|
/* Start reading from the IN endpoint */
|
2005-05-24 00:00:48 +00:00
|
|
|
for (i = 0; i < N_IN_URB; i++) {
|
|
|
|
|
urb = portdata->in_urbs[i];
|
2008-07-22 10:15:45 +00:00
|
|
|
if (!urb)
|
2005-05-24 00:00:48 +00:00
|
|
|
continue;
|
|
|
|
|
err = usb_submit_urb(urb, GFP_KERNEL);
|
|
|
|
|
if (err) {
|
2005-07-27 08:08:30 +00:00
|
|
|
dbg("%s: submit urb %d failed (%d) %d",
|
2008-03-04 00:08:34 +00:00
|
|
|
__func__, i, err,
|
2005-05-24 00:00:48 +00:00
|
|
|
urb->transfer_buffer_length);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-11 11:26:29 +00:00
|
|
|
option_send_setup(port);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2009-07-01 14:00:32 +00:00
|
|
|
serial->interface->needs_remote_wakeup = 1;
|
|
|
|
|
spin_lock_irq(&intfdata->susp_lock);
|
|
|
|
|
portdata->opened = 1;
|
|
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
|
|
|
|
usb_autopm_put_interface(serial->interface);
|
|
|
|
|
|
2008-07-22 10:15:45 +00:00
|
|
|
return 0;
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
|
2009-06-11 11:26:29 +00:00
|
|
|
static void option_dtr_rts(struct usb_serial_port *port, int on)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2005-07-14 07:33:47 +00:00
|
|
|
struct usb_serial *serial = port->serial;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s", __func__);
|
2005-05-24 00:00:48 +00:00
|
|
|
portdata = usb_get_serial_port_data(port);
|
2009-06-11 11:26:29 +00:00
|
|
|
mutex_lock(&serial->disc_mutex);
|
|
|
|
|
portdata->rts_state = on;
|
|
|
|
|
portdata->dtr_state = on;
|
|
|
|
|
if (serial->dev)
|
|
|
|
|
option_send_setup(port);
|
|
|
|
|
mutex_unlock(&serial->disc_mutex);
|
|
|
|
|
}
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
|
2009-06-11 11:26:29 +00:00
|
|
|
static void option_close(struct usb_serial_port *port)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct usb_serial *serial = port->serial;
|
|
|
|
|
struct option_port_private *portdata;
|
2009-07-01 14:00:32 +00:00
|
|
|
struct option_intf_private *intfdata = port->serial->private;
|
2009-06-11 11:26:29 +00:00
|
|
|
|
|
|
|
|
dbg("%s", __func__);
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2009-06-11 11:26:29 +00:00
|
|
|
if (serial->dev) {
|
2005-05-24 00:00:48 +00:00
|
|
|
/* Stop reading/writing urbs */
|
2009-07-01 14:00:32 +00:00
|
|
|
spin_lock_irq(&intfdata->susp_lock);
|
|
|
|
|
portdata->opened = 0;
|
|
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
|
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
for (i = 0; i < N_IN_URB; i++)
|
2007-03-20 12:41:21 +00:00
|
|
|
usb_kill_urb(portdata->in_urbs[i]);
|
2005-05-24 00:00:48 +00:00
|
|
|
for (i = 0; i < N_OUT_URB; i++)
|
2007-03-20 12:41:21 +00:00
|
|
|
usb_kill_urb(portdata->out_urbs[i]);
|
2009-07-01 14:00:32 +00:00
|
|
|
usb_autopm_get_interface(serial->interface);
|
|
|
|
|
serial->interface->needs_remote_wakeup = 0;
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper functions used by option_setup_urbs */
|
2005-07-27 08:08:30 +00:00
|
|
|
static struct urb *option_setup_urb(struct usb_serial *serial, int endpoint,
|
|
|
|
|
int dir, void *ctx, char *buf, int len,
|
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
of passing regs around manually through all ~1800 interrupt handlers in the
Linux kernel.
The regs pointer is used in few places, but it potentially costs both stack
space and code to pass it around. On the FRV arch, removing the regs parameter
from all the genirq function results in a 20% speed up of the IRQ exit path
(ie: from leaving timer_interrupt() to leaving do_IRQ()).
Where appropriate, an arch may override the generic storage facility and do
something different with the variable. On FRV, for instance, the address is
maintained in GR28 at all times inside the kernel as part of general exception
handling.
Having looked over the code, it appears that the parameter may be handed down
through up to twenty or so layers of functions. Consider a USB character
device attached to a USB hub, attached to a USB controller that posts its
interrupts through a cascaded auxiliary interrupt controller. A character
device driver may want to pass regs to the sysrq handler through the input
layer which adds another few layers of parameter passing.
I've build this code with allyesconfig for x86_64 and i386. I've runtested the
main part of the code on FRV and i386, though I can't test most of the drivers.
I've also done partial conversion for powerpc and MIPS - these at least compile
with minimal configurations.
This will affect all archs. Mostly the changes should be relatively easy.
Take do_IRQ(), store the regs pointer at the beginning, saving the old one:
struct pt_regs *old_regs = set_irq_regs(regs);
And put the old one back at the end:
set_irq_regs(old_regs);
Don't pass regs through to generic_handle_irq() or __do_IRQ().
In timer_interrupt(), this sort of change will be necessary:
- update_process_times(user_mode(regs));
- profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(get_irq_regs()));
+ profile_tick(CPU_PROFILING);
I'd like to move update_process_times()'s use of get_irq_regs() into itself,
except that i386, alone of the archs, uses something other than user_mode().
Some notes on the interrupt handling in the drivers:
(*) input_dev() is now gone entirely. The regs pointer is no longer stored in
the input_dev struct.
(*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
something different depending on whether it's been supplied with a regs
pointer or not.
(*) Various IRQ handler function pointers have been moved to type
irq_handler_t.
Signed-Off-By: David Howells <dhowells@redhat.com>
(cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
2006-10-05 13:55:46 +00:00
|
|
|
void (*callback)(struct urb *))
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
|
|
|
|
struct urb *urb;
|
|
|
|
|
|
|
|
|
|
if (endpoint == -1)
|
|
|
|
|
return NULL; /* endpoint not needed */
|
|
|
|
|
|
|
|
|
|
urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */
|
|
|
|
|
if (urb == NULL) {
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s: alloc for endpoint %d failed.", __func__, endpoint);
|
2005-05-24 00:00:48 +00:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Fill URB using supplied data. */
|
|
|
|
|
usb_fill_bulk_urb(urb, serial->dev,
|
|
|
|
|
usb_sndbulkpipe(serial->dev, endpoint) | dir,
|
|
|
|
|
buf, len, callback, ctx);
|
|
|
|
|
|
|
|
|
|
return urb;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Setup urbs */
|
2005-07-27 08:08:30 +00:00
|
|
|
static void option_setup_urbs(struct usb_serial *serial)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2008-07-22 10:15:45 +00:00
|
|
|
int i, j;
|
2005-07-14 07:33:47 +00:00
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s", __func__);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2006-06-02 09:48:56 +00:00
|
|
|
for (i = 0; i < serial->num_ports; i++) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-07-22 10:15:45 +00:00
|
|
|
/* Do indat endpoints first */
|
2006-06-02 09:48:56 +00:00
|
|
|
for (j = 0; j < N_IN_URB; ++j) {
|
2008-07-22 10:15:45 +00:00
|
|
|
portdata->in_urbs[j] = option_setup_urb(serial,
|
|
|
|
|
port->bulk_in_endpointAddress,
|
|
|
|
|
USB_DIR_IN, port,
|
|
|
|
|
portdata->in_buffer[j],
|
|
|
|
|
IN_BUFLEN, option_indat_callback);
|
2006-06-02 09:48:56 +00:00
|
|
|
}
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2006-06-02 09:48:56 +00:00
|
|
|
/* outdat endpoints */
|
|
|
|
|
for (j = 0; j < N_OUT_URB; ++j) {
|
2008-07-22 10:15:45 +00:00
|
|
|
portdata->out_urbs[j] = option_setup_urb(serial,
|
|
|
|
|
port->bulk_out_endpointAddress,
|
|
|
|
|
USB_DIR_OUT, port,
|
|
|
|
|
portdata->out_buffer[j],
|
|
|
|
|
OUT_BUFLEN, option_outdat_callback);
|
2006-06-02 09:48:56 +00:00
|
|
|
}
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2008-04-10 08:15:53 +00:00
|
|
|
|
|
|
|
|
/** send RTS/DTR state to the port.
|
|
|
|
|
*
|
|
|
|
|
* This is exactly the same as SET_CONTROL_LINE_STATE from the PSTN
|
|
|
|
|
* CDC.
|
|
|
|
|
*/
|
2009-06-11 11:26:29 +00:00
|
|
|
static int option_send_setup(struct usb_serial_port *port)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
|
|
|
|
struct usb_serial *serial = port->serial;
|
2010-01-11 08:30:00 +00:00
|
|
|
struct option_intf_private *intfdata =
|
|
|
|
|
(struct option_intf_private *) serial->private;
|
2005-05-24 00:00:48 +00:00
|
|
|
struct option_port_private *portdata;
|
2008-04-10 08:15:53 +00:00
|
|
|
int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
|
2009-06-11 11:26:29 +00:00
|
|
|
int val = 0;
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s", __func__);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2010-01-11 08:30:00 +00:00
|
|
|
if (is_blacklisted(ifNum, intfdata->blacklist_info) ==
|
|
|
|
|
OPTION_BLACKLIST_SENDSETUP) {
|
|
|
|
|
dbg("No send_setup on blacklisted interface #%d\n", ifNum);
|
|
|
|
|
return -EIO;
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
2009-06-11 11:26:29 +00:00
|
|
|
if (portdata->dtr_state)
|
|
|
|
|
val |= 0x01;
|
|
|
|
|
if (portdata->rts_state)
|
|
|
|
|
val |= 0x02;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2009-06-11 11:26:29 +00:00
|
|
|
return usb_control_msg(serial->dev,
|
|
|
|
|
usb_rcvctrlpipe(serial->dev, 0),
|
|
|
|
|
0x22, 0x21, val, ifNum, NULL, 0, USB_CTRL_SET_TIMEOUT);
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
|
2005-07-27 08:08:30 +00:00
|
|
|
static int option_startup(struct usb_serial *serial)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2008-02-01 12:58:52 +00:00
|
|
|
int i, j, err;
|
2005-07-14 07:33:47 +00:00
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct option_port_private *portdata;
|
2008-02-01 12:58:52 +00:00
|
|
|
u8 *buffer;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-03-04 00:08:34 +00:00
|
|
|
dbg("%s", __func__);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
/* Now setup per port private data */
|
|
|
|
|
for (i = 0; i < serial->num_ports; i++) {
|
|
|
|
|
port = serial->port[i];
|
2006-02-27 20:29:43 +00:00
|
|
|
portdata = kzalloc(sizeof(*portdata), GFP_KERNEL);
|
2005-05-24 00:00:48 +00:00
|
|
|
if (!portdata) {
|
2005-07-27 08:08:30 +00:00
|
|
|
dbg("%s: kmalloc for option_port_private (%d) failed!.",
|
2008-03-04 00:08:34 +00:00
|
|
|
__func__, i);
|
2008-07-22 10:15:45 +00:00
|
|
|
return 1;
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
2009-07-01 14:00:32 +00:00
|
|
|
init_usb_anchor(&portdata->delayed);
|
2005-05-24 00:00:48 +00:00
|
|
|
|
2008-02-01 12:58:52 +00:00
|
|
|
for (j = 0; j < N_IN_URB; j++) {
|
|
|
|
|
buffer = (u8 *)__get_free_page(GFP_KERNEL);
|
|
|
|
|
if (!buffer)
|
|
|
|
|
goto bail_out_error;
|
|
|
|
|
portdata->in_buffer[j] = buffer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < N_OUT_URB; j++) {
|
|
|
|
|
buffer = kmalloc(OUT_BUFLEN, GFP_KERNEL);
|
|
|
|
|
if (!buffer)
|
|
|
|
|
goto bail_out_error2;
|
|
|
|
|
portdata->out_buffer[j] = buffer;
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
usb_set_serial_port_data(port, portdata);
|
|
|
|
|
|
2008-07-22 10:15:45 +00:00
|
|
|
if (!port->interrupt_in_urb)
|
2005-05-24 00:00:48 +00:00
|
|
|
continue;
|
|
|
|
|
err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
|
|
|
|
|
if (err)
|
2005-07-27 08:08:30 +00:00
|
|
|
dbg("%s: submit irq_in urb failed %d",
|
2008-03-04 00:08:34 +00:00
|
|
|
__func__, err);
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
option_setup_urbs(serial);
|
2008-07-22 10:15:45 +00:00
|
|
|
return 0;
|
2008-02-01 12:58:52 +00:00
|
|
|
|
|
|
|
|
bail_out_error2:
|
|
|
|
|
for (j = 0; j < N_OUT_URB; j++)
|
|
|
|
|
kfree(portdata->out_buffer[j]);
|
|
|
|
|
bail_out_error:
|
|
|
|
|
for (j = 0; j < N_IN_URB; j++)
|
|
|
|
|
if (portdata->in_buffer[j])
|
|
|
|
|
free_page((unsigned long)portdata->in_buffer[j]);
|
|
|
|
|
kfree(portdata);
|
|
|
|
|
return 1;
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
|
|
|
|
|
2009-01-27 16:21:40 +00:00
|
|
|
static void stop_read_write_urbs(struct usb_serial *serial)
|
2005-05-24 00:00:48 +00:00
|
|
|
{
|
2005-07-14 07:33:47 +00:00
|
|
|
int i, j;
|
|
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct option_port_private *portdata;
|
2005-05-24 00:00:48 +00:00
|
|
|
|
|
|
|
|
/* Stop reading/writing urbs */
|
|
|
|
|
for (i = 0; i < serial->num_ports; ++i) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
for (j = 0; j < N_IN_URB; j++)
|
2007-03-20 12:41:21 +00:00
|
|
|
usb_kill_urb(portdata->in_urbs[j]);
|
2005-05-24 00:00:48 +00:00
|
|
|
for (j = 0; j < N_OUT_URB; j++)
|
2007-03-20 12:41:21 +00:00
|
|
|
usb_kill_urb(portdata->out_urbs[j]);
|
2005-05-24 00:00:48 +00:00
|
|
|
}
|
2009-01-27 16:21:40 +00:00
|
|
|
}
|
|
|
|
|
|
2009-06-02 15:53:55 +00:00
|
|
|
static void option_disconnect(struct usb_serial *serial)
|
|
|
|
|
{
|
|
|
|
|
dbg("%s", __func__);
|
|
|
|
|
|
|
|
|
|
stop_read_write_urbs(serial);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void option_release(struct usb_serial *serial)
|
2009-01-27 16:21:40 +00:00
|
|
|
{
|
|
|
|
|
int i, j;
|
|
|
|
|
struct usb_serial_port *port;
|
|
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
|
|
|
|
|
dbg("%s", __func__);
|
|
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
/* Now free them */
|
|
|
|
|
for (i = 0; i < serial->num_ports; ++i) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < N_IN_URB; j++) {
|
|
|
|
|
if (portdata->in_urbs[j]) {
|
|
|
|
|
usb_free_urb(portdata->in_urbs[j]);
|
2008-07-22 10:15:45 +00:00
|
|
|
free_page((unsigned long)
|
|
|
|
|
portdata->in_buffer[j]);
|
2005-05-24 00:00:48 +00:00
|
|
|
portdata->in_urbs[j] = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (j = 0; j < N_OUT_URB; j++) {
|
|
|
|
|
if (portdata->out_urbs[j]) {
|
|
|
|
|
usb_free_urb(portdata->out_urbs[j]);
|
2008-02-01 12:58:52 +00:00
|
|
|
kfree(portdata->out_buffer[j]);
|
2005-05-24 00:00:48 +00:00
|
|
|
portdata->out_urbs[j] = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now free per port private data */
|
|
|
|
|
for (i = 0; i < serial->num_ports; i++) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
kfree(usb_get_serial_port_data(port));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-13 21:24:10 +00:00
|
|
|
#ifdef CONFIG_PM
|
2009-01-27 16:21:40 +00:00
|
|
|
static int option_suspend(struct usb_serial *serial, pm_message_t message)
|
|
|
|
|
{
|
2009-07-01 14:00:32 +00:00
|
|
|
struct option_intf_private *intfdata = serial->private;
|
|
|
|
|
int b;
|
|
|
|
|
|
2009-01-27 16:21:40 +00:00
|
|
|
dbg("%s entered", __func__);
|
2009-07-01 14:00:32 +00:00
|
|
|
|
2009-11-13 16:53:59 +00:00
|
|
|
if (message.event & PM_EVENT_AUTO) {
|
2009-07-01 14:00:32 +00:00
|
|
|
spin_lock_irq(&intfdata->susp_lock);
|
|
|
|
|
b = intfdata->in_flight;
|
|
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
|
|
|
|
|
|
|
|
|
if (b)
|
|
|
|
|
return -EBUSY;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
spin_lock_irq(&intfdata->susp_lock);
|
|
|
|
|
intfdata->suspended = 1;
|
|
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
2009-01-27 16:21:40 +00:00
|
|
|
stop_read_write_urbs(serial);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-01 14:00:32 +00:00
|
|
|
static void play_delayed(struct usb_serial_port *port)
|
|
|
|
|
{
|
|
|
|
|
struct option_intf_private *data;
|
|
|
|
|
struct option_port_private *portdata;
|
|
|
|
|
struct urb *urb;
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
data = port->serial->private;
|
|
|
|
|
while ((urb = usb_get_from_anchor(&portdata->delayed))) {
|
|
|
|
|
err = usb_submit_urb(urb, GFP_ATOMIC);
|
|
|
|
|
if (!err)
|
|
|
|
|
data->in_flight++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2009-01-27 16:21:40 +00:00
|
|
|
static int option_resume(struct usb_serial *serial)
|
|
|
|
|
{
|
2009-07-01 14:00:32 +00:00
|
|
|
int i, j;
|
2009-01-27 16:21:40 +00:00
|
|
|
struct usb_serial_port *port;
|
2009-07-01 14:00:32 +00:00
|
|
|
struct option_intf_private *intfdata = serial->private;
|
2009-01-27 16:21:40 +00:00
|
|
|
struct option_port_private *portdata;
|
2009-07-01 14:00:32 +00:00
|
|
|
struct urb *urb;
|
|
|
|
|
int err = 0;
|
2009-01-27 16:21:40 +00:00
|
|
|
|
|
|
|
|
dbg("%s entered", __func__);
|
|
|
|
|
/* get the interrupt URBs resubmitted unconditionally */
|
|
|
|
|
for (i = 0; i < serial->num_ports; i++) {
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
if (!port->interrupt_in_urb) {
|
2010-02-06 00:50:08 +00:00
|
|
|
dbg("%s: No interrupt URB for port %d", __func__, i);
|
2009-01-27 16:21:40 +00:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
err = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
|
|
|
|
|
dbg("Submitted interrupt URB for port %d (result %d)", i, err);
|
|
|
|
|
if (err < 0) {
|
|
|
|
|
err("%s: Error %d for interrupt URB of port%d",
|
|
|
|
|
__func__, err, i);
|
2009-07-01 14:00:32 +00:00
|
|
|
goto err_out;
|
2009-01-27 16:21:40 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < serial->num_ports; i++) {
|
|
|
|
|
/* walk all ports */
|
|
|
|
|
port = serial->port[i];
|
|
|
|
|
portdata = usb_get_serial_port_data(port);
|
|
|
|
|
|
|
|
|
|
/* skip closed ports */
|
2009-07-01 14:00:32 +00:00
|
|
|
spin_lock_irq(&intfdata->susp_lock);
|
|
|
|
|
if (!portdata->opened) {
|
|
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
2009-01-27 16:21:40 +00:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < N_IN_URB; j++) {
|
|
|
|
|
urb = portdata->in_urbs[j];
|
2009-07-01 14:00:32 +00:00
|
|
|
err = usb_submit_urb(urb, GFP_ATOMIC);
|
2009-01-27 16:21:40 +00:00
|
|
|
if (err < 0) {
|
|
|
|
|
err("%s: Error %d for bulk URB %d",
|
|
|
|
|
__func__, err, i);
|
2009-07-01 14:00:32 +00:00
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
|
|
|
|
goto err_out;
|
2009-01-27 16:21:40 +00:00
|
|
|
}
|
|
|
|
|
}
|
2009-07-01 14:00:32 +00:00
|
|
|
play_delayed(port);
|
|
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
2009-01-27 16:21:40 +00:00
|
|
|
}
|
2009-07-01 14:00:32 +00:00
|
|
|
spin_lock_irq(&intfdata->susp_lock);
|
|
|
|
|
intfdata->suspended = 0;
|
|
|
|
|
spin_unlock_irq(&intfdata->susp_lock);
|
|
|
|
|
err_out:
|
|
|
|
|
return err;
|
2009-01-27 16:21:40 +00:00
|
|
|
}
|
2009-07-13 21:24:10 +00:00
|
|
|
#endif
|
2009-01-27 16:21:40 +00:00
|
|
|
|
2005-05-24 00:00:48 +00:00
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
|
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
|
|
|
MODULE_VERSION(DRIVER_VERSION);
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
|
|
|
|
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
|
|
|
|
MODULE_PARM_DESC(debug, "Debug messages");
|
