![Linus Torvalds](/assets/img/avatar_default.png)
Here is the big USB pull request for 3.7-rc1
There are lots of gadget driver changes (including copying a bunch of
files into the drivers/staging/ccg/ directory so that the other gadget
drivers can be fixed up properly without breaking that driver), and we
remove the old obsolete ub.c driver from the tree. There are also the
usual XHCI set of updates, and other various driver changes and updates.
We also are trying hard to remove the old dbg() macro, but the final
bits of that removal will be coming in through the networking tree
before we can delete it for good.
All of these patches have been in the linux-next tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlBp3+AACgkQMUfUDdst+ym5vwCfe93FyJyXn/RDkGz7iBemvWFd
vrwAoIxjaOa4/yWZWcgrWc5bP4aO3ssc
=jYDr
-----END PGP SIGNATURE-----
Merge tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB changes from Greg Kroah-Hartman:
"Here is the big USB pull request for 3.7-rc1
There are lots of gadget driver changes (including copying a bunch of
files into the drivers/staging/ccg/ directory so that the other gadget
drivers can be fixed up properly without breaking that driver), and we
remove the old obsolete ub.c driver from the tree.
There are also the usual XHCI set of updates, and other various driver
changes and updates. We also are trying hard to remove the old dbg()
macro, but the final bits of that removal will be coming in through
the networking tree before we can delete it for good.
All of these patches have been in the linux-next tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fix up several annoying - but fairly mindless - conflicts due to the
termios structure having moved into the tty device, and often clashing
with dbg -> dev_dbg conversion.
* tag 'usb-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (339 commits)
USB: ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc
USB: uas: fix gcc warning
USB: uas: fix locking
USB: Fix race condition when removing host controllers
USB: uas: add locking
USB: uas: fix abort
USB: uas: remove aborted field, replace with status bit.
USB: uas: fix task management
USB: uas: keep track of command urbs
xhci: Intel Panther Point BEI quirk.
powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
USB: ftdi_sio: add TIAO USB Multi-Protocol Adapter (TUMPA) support
Revert "usb : Add sysfs files to control port power."
USB: serial: remove vizzini driver
usb: host: xhci: Fix Null pointer dereferencing with 71c731a
for non-x86 systems
Increase XHCI suspend timeout to 16ms
USB: ohci-at91: fix null pointer in ohci_hcd_at91_overcurrent_irq
USB: sierra_ms: don't keep unused variable
fsl/usb: Add support for USB controller version 2.4
USB: qcaux: add Pantech vendor class match
...
135 lines
3.7 KiB
C
135 lines
3.7 KiB
C
/*
|
|
* USB Empeg empeg-car player driver
|
|
*
|
|
* Copyright (C) 2000, 2001
|
|
* Gary Brubaker (xavyer@ix.netcom.com)
|
|
*
|
|
* Copyright (C) 1999 - 2001
|
|
* Greg Kroah-Hartman (greg@kroah.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License, as published by
|
|
* the Free Software Foundation, version 2.
|
|
*
|
|
* See Documentation/usb/usb-serial.txt for more information on using this
|
|
* driver
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/init.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/tty_driver.h>
|
|
#include <linux/tty_flip.h>
|
|
#include <linux/module.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/serial.h>
|
|
|
|
/*
|
|
* Version Information
|
|
*/
|
|
#define DRIVER_VERSION "v1.3"
|
|
#define DRIVER_AUTHOR "Greg Kroah-Hartman <greg@kroah.com>, Gary Brubaker <xavyer@ix.netcom.com>"
|
|
#define DRIVER_DESC "USB Empeg Mark I/II Driver"
|
|
|
|
#define EMPEG_VENDOR_ID 0x084f
|
|
#define EMPEG_PRODUCT_ID 0x0001
|
|
|
|
/* function prototypes for an empeg-car player */
|
|
static int empeg_startup(struct usb_serial *serial);
|
|
static void empeg_init_termios(struct tty_struct *tty);
|
|
|
|
static const struct usb_device_id id_table[] = {
|
|
{ USB_DEVICE(EMPEG_VENDOR_ID, EMPEG_PRODUCT_ID) },
|
|
{ } /* Terminating entry */
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(usb, id_table);
|
|
|
|
static struct usb_serial_driver empeg_device = {
|
|
.driver = {
|
|
.owner = THIS_MODULE,
|
|
.name = "empeg",
|
|
},
|
|
.id_table = id_table,
|
|
.num_ports = 1,
|
|
.bulk_out_size = 256,
|
|
.throttle = usb_serial_generic_throttle,
|
|
.unthrottle = usb_serial_generic_unthrottle,
|
|
.attach = empeg_startup,
|
|
.init_termios = empeg_init_termios,
|
|
};
|
|
|
|
static struct usb_serial_driver * const serial_drivers[] = {
|
|
&empeg_device, NULL
|
|
};
|
|
|
|
static int empeg_startup(struct usb_serial *serial)
|
|
{
|
|
int r;
|
|
|
|
if (serial->dev->actconfig->desc.bConfigurationValue != 1) {
|
|
dev_err(&serial->dev->dev, "active config #%d != 1 ??\n",
|
|
serial->dev->actconfig->desc.bConfigurationValue);
|
|
return -ENODEV;
|
|
}
|
|
|
|
r = usb_reset_configuration(serial->dev);
|
|
|
|
/* continue on with initialization */
|
|
return r;
|
|
}
|
|
|
|
static void empeg_init_termios(struct tty_struct *tty)
|
|
{
|
|
struct ktermios *termios = &tty->termios;
|
|
|
|
/*
|
|
* The empeg-car player wants these particular tty settings.
|
|
* You could, for example, change the baud rate, however the
|
|
* player only supports 115200 (currently), so there is really
|
|
* no point in support for changes to the tty settings.
|
|
* (at least for now)
|
|
*
|
|
* The default requirements for this device are:
|
|
*/
|
|
termios->c_iflag
|
|
&= ~(IGNBRK /* disable ignore break */
|
|
| BRKINT /* disable break causes interrupt */
|
|
| PARMRK /* disable mark parity errors */
|
|
| ISTRIP /* disable clear high bit of input characters */
|
|
| INLCR /* disable translate NL to CR */
|
|
| IGNCR /* disable ignore CR */
|
|
| ICRNL /* disable translate CR to NL */
|
|
| IXON); /* disable enable XON/XOFF flow control */
|
|
|
|
termios->c_oflag
|
|
&= ~OPOST; /* disable postprocess output characters */
|
|
|
|
termios->c_lflag
|
|
&= ~(ECHO /* disable echo input characters */
|
|
| ECHONL /* disable echo new line */
|
|
| ICANON /* disable erase, kill, werase, and rprnt special characters */
|
|
| ISIG /* disable interrupt, quit, and suspend special characters */
|
|
| IEXTEN); /* disable non-POSIX special characters */
|
|
|
|
termios->c_cflag
|
|
&= ~(CSIZE /* no size */
|
|
| PARENB /* disable parity bit */
|
|
| CBAUD); /* clear current baud rate */
|
|
|
|
termios->c_cflag
|
|
|= CS8; /* character size 8 bits */
|
|
|
|
tty_encode_baud_rate(tty, 115200, 115200);
|
|
}
|
|
|
|
module_usb_serial_driver(serial_drivers, id_table);
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
MODULE_LICENSE("GPL");
|