Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (30 commits)
  USB: Fix a bug on appledisplay.c regarding signedness
  USB: option: support hi speed for modem Haier CE100
  USB: audio gadget: free alsa devices when unloading
  USB: audio gadget: fix wTotalLength calculation
  usb: otg: isp1301_omap: fix compile error
  USB: musb: workaround Blackfin FIFO anomalies
  USB: musb: Fix array index out of bounds issue
  USB: musb: Fix null pointer dereference issue
  USB: musb: correct DMA address for tx
  USB: musb: gadget_ep0: avoid SetupEnd interrupt
  USB: musb: fix for crash in DM646x USB when (CPPI)DMA is enabled
  USB: musb: do not work if no gadget driver is loaded
  USB: musb: gadget: set otg tranceiver to idle when registering gadget
  USB: musb: Populate the VBUS GPIO with the correct GPIO number
  USB: musb: MAINTAINERS: Fix my tree's address
  USB: musb: fix compiling warning with min() macro
  USB: musb: move musb_remove to __exit
  USB: musb_gadget: fix kernel oops in txstate()
  USB: ftdi_sio: sort PID/VID entries in new ftdi_sio_ids.h header
  USB: ftdi_sio: isolate all device IDs to new ftdi_sio_ids.h header
  ...
This commit is contained in:
Linus Torvalds 2009-12-23 13:35:19 -08:00
commit 17a3be341e
28 changed files with 1226 additions and 1097 deletions

View file

@ -21,25 +21,27 @@ Contact: Alan Stern <stern@rowland.harvard.edu>
Description:
Each USB device directory will contain a file named
power/level. This file holds a power-level setting for
the device, one of "on", "auto", or "suspend".
the device, either "on" or "auto".
"on" means that the device is not allowed to autosuspend,
although normal suspends for system sleep will still
be honored. "auto" means the device will autosuspend
and autoresume in the usual manner, according to the
capabilities of its driver. "suspend" means the device
is forced into a suspended state and it will not autoresume
in response to I/O requests. However remote-wakeup requests
from the device may still be enabled (the remote-wakeup
setting is controlled separately by the power/wakeup
attribute).
capabilities of its driver.
During normal use, devices should be left in the "auto"
level. The other levels are meant for administrative uses.
level. The "on" level is meant for administrative uses.
If you want to suspend a device immediately but leave it
free to wake up in response to I/O requests, you should
write "0" to power/autosuspend.
Device not capable of proper suspend and resume should be
left in the "on" level. Although the USB spec requires
devices to support suspend/resume, many of them do not.
In fact so many don't that by default, the USB core
initializes all non-hub devices in the "on" level. Some
drivers may change this setting when they are bound.
What: /sys/bus/usb/devices/.../power/persist
Date: May 2007
KernelVersion: 2.6.23

View file

@ -71,12 +71,10 @@ being accessed through sysfs, then it definitely is idle.
Forms of dynamic PM
-------------------
Dynamic suspends can occur in two ways: manual and automatic.
"Manual" means that the user has told the kernel to suspend a device,
whereas "automatic" means that the kernel has decided all by itself to
suspend a device. Automatic suspend is called "autosuspend" for
short. In general, a device won't be autosuspended unless it has been
idle for some minimum period of time, the so-called idle-delay time.
Dynamic suspends occur when the kernel decides to suspend an idle
device. This is called "autosuspend" for short. In general, a device
won't be autosuspended unless it has been idle for some minimum period
of time, the so-called idle-delay time.
Of course, nothing the kernel does on its own initiative should
prevent the computer or its devices from working properly. If a
@ -96,10 +94,11 @@ idle.
We can categorize power management events in two broad classes:
external and internal. External events are those triggered by some
agent outside the USB stack: system suspend/resume (triggered by
userspace), manual dynamic suspend/resume (also triggered by
userspace), and remote wakeup (triggered by the device). Internal
events are those triggered within the USB stack: autosuspend and
autoresume.
userspace), manual dynamic resume (also triggered by userspace), and
remote wakeup (triggered by the device). Internal events are those
triggered within the USB stack: autosuspend and autoresume. Note that
all dynamic suspend events are internal; external agents are not
allowed to issue dynamic suspends.
The user interface for dynamic PM
@ -145,9 +144,9 @@ relevant attribute files are: wakeup, level, and autosuspend.
number of seconds the device should remain idle before
the kernel will autosuspend it (the idle-delay time).
The default is 2. 0 means to autosuspend as soon as
the device becomes idle, and -1 means never to
autosuspend. You can write a number to the file to
change the autosuspend idle-delay time.
the device becomes idle, and negative values mean
never to autosuspend. You can write a number to the
file to change the autosuspend idle-delay time.
Writing "-1" to power/autosuspend and writing "on" to power/level do
essentially the same thing -- they both prevent the device from being
@ -377,9 +376,9 @@ the device hasn't been idle for long enough, a delayed workqueue
routine is automatically set up to carry out the operation when the
autosuspend idle-delay has expired.
Autoresume attempts also can fail. This will happen if power/level is
set to "suspend" or if the device doesn't manage to resume properly.
Unlike autosuspend, there's no delay for an autoresume.
Autoresume attempts also can fail, although failure would mean that
the device is no longer present or operating properly. Unlike
autosuspend, there's no delay for an autoresume.
Other parts of the driver interface
@ -527,13 +526,3 @@ succeed, it may still remain active and thus cause the system to
resume as soon as the system suspend is complete. Or the remote
wakeup may fail and get lost. Which outcome occurs depends on timing
and on the hardware and firmware design.
More interestingly, a device might undergo a manual resume or
autoresume during system suspend. With current kernels this shouldn't
happen, because manual resumes must be initiated by userspace and
autoresumes happen in response to I/O requests, but all user processes
and I/O should be quiescent during a system suspend -- thanks to the
freezer. However there are plans to do away with the freezer, which
would mean these things would become possible. If and when this comes
about, the USB core will carefully arrange matters so that either type
of resume will block until the entire system has resumed.

View file

@ -3679,7 +3679,7 @@ F: include/linux/isicom.h
MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
M: Felipe Balbi <felipe.balbi@nokia.com>
L: linux-usb@vger.kernel.org
T: git git://gitorious.org/musb/mainline.git
T: git git://gitorious.org/usb/usb.git
S: Maintained
F: drivers/usb/musb/

View file

@ -44,5 +44,3 @@ obj-y += early/
obj-$(CONFIG_USB_ATM) += atm/
obj-$(CONFIG_USB_SPEEDTOUCH) += atm/
obj-$(CONFIG_USB_ULPI) += otg/

View file

@ -1597,7 +1597,9 @@ rescan:
}
/**
* Check whether a new bandwidth setting exceeds the bus bandwidth.
* usb_hcd_alloc_bandwidth - check whether a new bandwidth setting exceeds
* the bus bandwidth
* @udev: target &usb_device
* @new_config: new configuration to install
* @cur_alt: the current alternate interface setting
* @new_alt: alternate interface setting that is being installed

View file

@ -1658,12 +1658,12 @@ static inline void announce_device(struct usb_device *udev) { }
#endif
/**
* usb_configure_device_otg - FIXME (usbcore-internal)
* usb_enumerate_device_otg - FIXME (usbcore-internal)
* @udev: newly addressed device (in ADDRESS state)
*
* Do configuration for On-The-Go devices
* Finish enumeration for On-The-Go devices
*/
static int usb_configure_device_otg(struct usb_device *udev)
static int usb_enumerate_device_otg(struct usb_device *udev)
{
int err = 0;
@ -1734,7 +1734,7 @@ fail:
/**
* usb_configure_device - Detect and probe device intfs/otg (usbcore-internal)
* usb_enumerate_device - Read device configs/intfs/otg (usbcore-internal)
* @udev: newly addressed device (in ADDRESS state)
*
* This is only called by usb_new_device() and usb_authorize_device()
@ -1745,7 +1745,7 @@ fail:
* the string descriptors, as they will be errored out by the device
* until it has been authorized.
*/
static int usb_configure_device(struct usb_device *udev)
static int usb_enumerate_device(struct usb_device *udev)
{
int err;
@ -1769,7 +1769,7 @@ static int usb_configure_device(struct usb_device *udev)
udev->descriptor.iManufacturer);
udev->serial = usb_cache_string(udev, udev->descriptor.iSerialNumber);
}
err = usb_configure_device_otg(udev);
err = usb_enumerate_device_otg(udev);
fail:
return err;
}
@ -1779,8 +1779,8 @@ fail:
* usb_new_device - perform initial device setup (usbcore-internal)
* @udev: newly addressed device (in ADDRESS state)
*
* This is called with devices which have been enumerated, but not yet
* configured. The device descriptor is available, but not descriptors
* This is called with devices which have been detected but not fully
* enumerated. The device descriptor is available, but not descriptors
* for any device configuration. The caller must have locked either
* the parent hub (if udev is a normal device) or else the
* usb_bus_list_lock (if udev is a root hub). The parent's pointer to
@ -1803,8 +1803,8 @@ int usb_new_device(struct usb_device *udev)
if (udev->parent)
usb_autoresume_device(udev->parent);
usb_detect_quirks(udev); /* Determine quirks */
err = usb_configure_device(udev); /* detect & probe dev/intfs */
usb_detect_quirks(udev);
err = usb_enumerate_device(udev); /* Read descriptors */
if (err < 0)
goto fail;
dev_dbg(&udev->dev, "udev %d, busnum %d, minor = %d\n",
@ -1849,21 +1849,23 @@ fail:
*/
int usb_deauthorize_device(struct usb_device *usb_dev)
{
unsigned cnt;
usb_lock_device(usb_dev);
if (usb_dev->authorized == 0)
goto out_unauthorized;
usb_dev->authorized = 0;
usb_set_configuration(usb_dev, -1);
kfree(usb_dev->product);
usb_dev->product = kstrdup("n/a (unauthorized)", GFP_KERNEL);
kfree(usb_dev->manufacturer);
usb_dev->manufacturer = kstrdup("n/a (unauthorized)", GFP_KERNEL);
kfree(usb_dev->serial);
usb_dev->serial = kstrdup("n/a (unauthorized)", GFP_KERNEL);
kfree(usb_dev->config);
usb_dev->config = NULL;
for (cnt = 0; cnt < usb_dev->descriptor.bNumConfigurations; cnt++)
kfree(usb_dev->rawdescriptors[cnt]);
usb_destroy_configuration(usb_dev);
usb_dev->descriptor.bNumConfigurations = 0;
kfree(usb_dev->rawdescriptors);
out_unauthorized:
usb_unlock_device(usb_dev);
return 0;
@ -1873,15 +1875,11 @@ out_unauthorized:
int usb_authorize_device(struct usb_device *usb_dev)
{
int result = 0, c;
usb_lock_device(usb_dev);
if (usb_dev->authorized == 1)
goto out_authorized;
kfree(usb_dev->product);
usb_dev->product = NULL;
kfree(usb_dev->manufacturer);
usb_dev->manufacturer = NULL;
kfree(usb_dev->serial);
usb_dev->serial = NULL;
result = usb_autoresume_device(usb_dev);
if (result < 0) {
dev_err(&usb_dev->dev,
@ -1894,10 +1892,18 @@ int usb_authorize_device(struct usb_device *usb_dev)
"authorization: %d\n", result);
goto error_device_descriptor;
}
kfree(usb_dev->product);
usb_dev->product = NULL;
kfree(usb_dev->manufacturer);
usb_dev->manufacturer = NULL;
kfree(usb_dev->serial);
usb_dev->serial = NULL;
usb_dev->authorized = 1;
result = usb_configure_device(usb_dev);
result = usb_enumerate_device(usb_dev);
if (result < 0)
goto error_configure;
goto error_enumerate;
/* Choose and set the configuration. This registers the interfaces
* with the driver core and lets interface drivers bind to them.
*/
@ -1912,8 +1918,10 @@ int usb_authorize_device(struct usb_device *usb_dev)
}
}
dev_info(&usb_dev->dev, "authorized to connect\n");
error_configure:
error_enumerate:
error_device_descriptor:
usb_autosuspend_device(usb_dev);
error_autoresume:
out_authorized:
usb_unlock_device(usb_dev); // complements locktree

View file

@ -82,9 +82,13 @@ static ssize_t show_##name(struct device *dev, \
struct device_attribute *attr, char *buf) \
{ \
struct usb_device *udev; \
int retval; \
\
udev = to_usb_device(dev); \
return sprintf(buf, "%s\n", udev->name); \
usb_lock_device(udev); \
retval = sprintf(buf, "%s\n", udev->name); \
usb_unlock_device(udev); \
return retval; \
} \
static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL);

View file

@ -66,9 +66,9 @@ MODULE_PARM_DESC(autosuspend, "default autosuspend delay");
/**
* usb_find_alt_setting() - Given a configuration, find the alternate setting
* for the given interface.
* @config - the configuration to search (not necessarily the current config).
* @iface_num - interface number to search in
* @alt_num - alternate interface setting number to search for.
* @config: the configuration to search (not necessarily the current config).
* @iface_num: interface number to search in
* @alt_num: alternate interface setting number to search for.
*
* Search the configuration's interface cache for the given alt setting.
*/

View file

@ -613,7 +613,7 @@ err:
}
EXPORT_SYMBOL_GPL(dbgp_external_startup);
static int __init ehci_reset_port(int port)
static int ehci_reset_port(int port)
{
u32 portsc;
u32 delay_time, delay;

View file

@ -158,6 +158,7 @@ fail:
static int __exit audio_unbind(struct usb_composite_dev *cdev)
{
gaudio_cleanup();
return 0;
}

View file

@ -56,13 +56,16 @@ static struct usb_interface_descriptor ac_interface_desc __initdata = {
DECLARE_UAC_AC_HEADER_DESCRIPTOR(2);
#define UAC_DT_AC_HEADER_LENGTH UAC_DT_AC_HEADER_SIZE(F_AUDIO_NUM_INTERFACES)
/* 1 input terminal, 1 output terminal and 1 feature unit */
#define UAC_DT_TOTAL_LENGTH (UAC_DT_AC_HEADER_LENGTH + UAC_DT_INPUT_TERMINAL_SIZE \
+ UAC_DT_OUTPUT_TERMINAL_SIZE + UAC_DT_FEATURE_UNIT_SIZE(0))
/* B.3.2 Class-Specific AC Interface Descriptor */
static struct uac_ac_header_descriptor_2 ac_header_desc = {
.bLength = UAC_DT_AC_HEADER_LENGTH,
.bDescriptorType = USB_DT_CS_INTERFACE,
.bDescriptorSubtype = UAC_HEADER,
.bcdADC = __constant_cpu_to_le16(0x0100),
.wTotalLength = __constant_cpu_to_le16(UAC_DT_AC_HEADER_LENGTH),
.wTotalLength = __constant_cpu_to_le16(UAC_DT_TOTAL_LENGTH),
.bInCollection = F_AUDIO_NUM_INTERFACES,
.baInterfaceNr = {
[0] = F_AUDIO_AC_INTERFACE,
@ -252,12 +255,12 @@ static struct f_audio_buf *f_audio_buffer_alloc(int buf_size)
copy_buf = kzalloc(sizeof *copy_buf, GFP_ATOMIC);
if (!copy_buf)
return (struct f_audio_buf *)-ENOMEM;
return ERR_PTR(-ENOMEM);
copy_buf->buf = kzalloc(buf_size, GFP_ATOMIC);
if (!copy_buf->buf) {
kfree(copy_buf);
return (struct f_audio_buf *)-ENOMEM;
return ERR_PTR(-ENOMEM);
}
return copy_buf;
@ -332,7 +335,7 @@ static int f_audio_out_ep_complete(struct usb_ep *ep, struct usb_request *req)
list_add_tail(&copy_buf->list, &audio->play_queue);
schedule_work(&audio->playback_work);
copy_buf = f_audio_buffer_alloc(audio_buf_size);
if (copy_buf < 0)
if (IS_ERR(copy_buf))
return -ENOMEM;
}
@ -576,6 +579,8 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
usb_ep_enable(out_ep, audio->out_desc);
out_ep->driver_data = audio;
audio->copy_buf = f_audio_buffer_alloc(audio_buf_size);
if (IS_ERR(audio->copy_buf))
return -ENOMEM;
/*
* allocate a bunch of read buffers
@ -787,7 +792,7 @@ int __init audio_bind_config(struct usb_configuration *c)
return status;
add_fail:
gaudio_cleanup(&audio->card);
gaudio_cleanup();
setup_fail:
kfree(audio);
return status;

View file

@ -288,6 +288,7 @@ static int gaudio_close_snd_dev(struct gaudio *gau)
return 0;
}
static struct gaudio *the_card;
/**
* gaudio_setup - setup ALSA interface and preparing for USB transfer
*
@ -303,6 +304,9 @@ int __init gaudio_setup(struct gaudio *card)
if (ret)
ERROR(card, "we need at least one control device\n");
if (!the_card)
the_card = card;
return ret;
}
@ -312,9 +316,11 @@ int __init gaudio_setup(struct gaudio *card)
*
* This is called to free all resources allocated by @gaudio_setup().
*/
void gaudio_cleanup(struct gaudio *card)
void gaudio_cleanup(void)
{
if (card)
gaudio_close_snd_dev(card);
if (the_card) {
gaudio_close_snd_dev(the_card);
the_card = NULL;
}
}

View file

@ -51,6 +51,6 @@ struct gaudio {
};
int gaudio_setup(struct gaudio *card);
void gaudio_cleanup(struct gaudio *card);
void gaudio_cleanup(void);
#endif /* __U_AUDIO_H */

View file

@ -60,6 +60,7 @@
static struct usb_device_id appledisplay_table [] = {
{ APPLEDISPLAY_DEVICE(0x9218) },
{ APPLEDISPLAY_DEVICE(0x9219) },
{ APPLEDISPLAY_DEVICE(0x921c) },
{ APPLEDISPLAY_DEVICE(0x921d) },
/* Terminating entry */
@ -72,8 +73,8 @@ struct appledisplay {
struct usb_device *udev; /* usb device */
struct urb *urb; /* usb request block */
struct backlight_device *bd; /* backlight device */
char *urbdata; /* interrupt URB data buffer */
char *msgdata; /* control message data buffer */
u8 *urbdata; /* interrupt URB data buffer */
u8 *msgdata; /* control message data buffer */
struct delayed_work work;
int button_pressed;

View file

@ -167,7 +167,7 @@ static int emi62_load_firmware (struct usb_device *dev)
err("%s - error loading firmware: error = %d", __func__, err);
goto wraperr;
}
} while (i > 0);
} while (rec);
/* Assert reset (stop the CPU in the EMI) */
err = emi62_set_reset(dev,1);

View file

@ -29,6 +29,8 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
{
void __iomem *fifo = hw_ep->fifo;
void __iomem *epio = hw_ep->regs;
u8 epnum = hw_ep->epnum;
u16 dma_reg = 0;
prefetch((u8 *)src);
@ -39,67 +41,113 @@ void musb_write_fifo(struct musb_hw_ep *hw_ep, u16 len, const u8 *src)
dump_fifo_data(src, len);
if (unlikely((unsigned long)src & 0x01))
outsw_8((unsigned long)fifo, src,
len & 0x01 ? (len >> 1) + 1 : len >> 1);
else
outsw((unsigned long)fifo, src,
len & 0x01 ? (len >> 1) + 1 : len >> 1);
}
if (!ANOMALY_05000380 && epnum != 0) {
flush_dcache_range((unsigned int)src,
(unsigned int)(src + len));
/* Setup DMA address register */
dma_reg = (u16) ((u32) src & 0xFFFF);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_LOW), dma_reg);
SSYNC();
dma_reg = (u16) (((u32) src >> 16) & 0xFFFF);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_HIGH), dma_reg);
SSYNC();
/* Setup DMA count register */
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_COUNT_LOW), len);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_COUNT_HIGH), 0);
SSYNC();
/* Enable the DMA */
dma_reg = (epnum << 4) | DMA_ENA | INT_ENA | DIRECTION;
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_CTRL), dma_reg);
SSYNC();
/* Wait for compelete */
while (!(bfin_read_USB_DMA_INTERRUPT() & (1 << epnum)))
cpu_relax();
/* acknowledge dma interrupt */
bfin_write_USB_DMA_INTERRUPT(1 << epnum);
SSYNC();
/* Reset DMA */
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_CTRL), 0);
SSYNC();
} else {
SSYNC();
if (unlikely((unsigned long)src & 0x01))
outsw_8((unsigned long)fifo, src,
len & 0x01 ? (len >> 1) + 1 : len >> 1);
else
outsw((unsigned long)fifo, src,
len & 0x01 ? (len >> 1) + 1 : len >> 1);
}
}
/*
* Unload an endpoint's FIFO
*/
void musb_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
{
void __iomem *fifo = hw_ep->fifo;
#ifdef CONFIG_BF52x
u8 epnum = hw_ep->epnum;
u16 dma_reg = 0;
invalidate_dcache_range((unsigned int)dst,
(unsigned int)(dst + len));
if (ANOMALY_05000467 && epnum != 0) {
/* Setup DMA address register */
dma_reg = (u16) ((u32) dst & 0xFFFF);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_LOW), dma_reg);
SSYNC();
invalidate_dcache_range((unsigned int)dst,
(unsigned int)(dst + len));
dma_reg = (u16) (((u32) dst >> 16) & 0xFFFF);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_HIGH), dma_reg);
SSYNC();
/* Setup DMA address register */
dma_reg = (u16) ((u32) dst & 0xFFFF);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_LOW), dma_reg);
SSYNC();
/* Setup DMA count register */
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_COUNT_LOW), len);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_COUNT_HIGH), 0);
SSYNC();
dma_reg = (u16) (((u32) dst >> 16) & 0xFFFF);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_ADDR_HIGH), dma_reg);
SSYNC();
/* Enable the DMA */
dma_reg = (epnum << 4) | DMA_ENA | INT_ENA;
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_CTRL), dma_reg);
SSYNC();
/* Setup DMA count register */
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_COUNT_LOW), len);
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_COUNT_HIGH), 0);
SSYNC();
/* Wait for compelete */
while (!(bfin_read_USB_DMA_INTERRUPT() & (1 << epnum)))
cpu_relax();
/* Enable the DMA */
dma_reg = (epnum << 4) | DMA_ENA | INT_ENA;
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_CTRL), dma_reg);
SSYNC();
/* acknowledge dma interrupt */
bfin_write_USB_DMA_INTERRUPT(1 << epnum);
SSYNC();
/* Wait for compelete */
while (!(bfin_read_USB_DMA_INTERRUPT() & (1 << epnum)))
cpu_relax();
/* Reset DMA */
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_CTRL), 0);
SSYNC();
#else
if (unlikely((unsigned long)dst & 0x01))
insw_8((unsigned long)fifo, dst,
len & 0x01 ? (len >> 1) + 1 : len >> 1);
else
insw((unsigned long)fifo, dst,
len & 0x01 ? (len >> 1) + 1 : len >> 1);
#endif
/* acknowledge dma interrupt */
bfin_write_USB_DMA_INTERRUPT(1 << epnum);
SSYNC();
/* Reset DMA */
bfin_write16(USB_DMA_REG(epnum, USB_DMAx_CTRL), 0);
SSYNC();
} else {
SSYNC();
/* Read the last byte of packet with odd size from address fifo + 4
* to trigger 1 byte access to EP0 FIFO.
*/
if (len == 1)
*dst = (u8)inw((unsigned long)fifo + 4);
else {
if (unlikely((unsigned long)dst & 0x01))
insw_8((unsigned long)fifo, dst, len >> 1);
else
insw((unsigned long)fifo, dst, len >> 1);
if (len & 0x01)
*(dst + len - 1) = (u8)inw((unsigned long)fifo + 4);
}
}
DBG(4, "%cX ep%d fifo %p count %d buf %p\n",
'R', hw_ep->epnum, fifo, len, dst);

View file

@ -69,7 +69,6 @@ static void dump_fifo_data(u8 *buf, u16 len)
#define dump_fifo_data(buf, len) do {} while (0)
#endif
#ifdef CONFIG_BF52x
#define USB_DMA_BASE USB_DMA_INTERRUPT
#define USB_DMAx_CTRL 0x04
@ -79,7 +78,6 @@ static void dump_fifo_data(u8 *buf, u16 len)
#define USB_DMAx_COUNT_HIGH 0x14
#define USB_DMA_REG(ep, reg) (USB_DMA_BASE + 0x20 * ep + reg)
#endif
/* Almost 1 second */
#define TIMER_DELAY (1 * HZ)

View file

@ -1154,8 +1154,11 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
struct musb_hw_ep *hw_ep = NULL;
u32 rx, tx;
int i, index;
unsigned long flags;
cppi = container_of(musb->dma_controller, struct cppi, controller);
if (cppi->irq)
spin_lock_irqsave(&musb->lock, flags);
tibase = musb->ctrl_base;
@ -1285,6 +1288,9 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
/* write to CPPI EOI register to re-enable interrupts */
musb_writel(tibase, DAVINCI_CPPI_EOI_REG, 0);
if (cppi->irq)
spin_unlock_irqrestore(&musb->lock, flags);
return IRQ_HANDLED;
}

View file

@ -42,7 +42,7 @@
#include "musb_core.h"
#ifdef CONFIG_MACH_DAVINCI_EVM
#define GPIO_nVBUS_DRV 144
#define GPIO_nVBUS_DRV 160
#endif
#include "davinci.h"

View file

@ -1319,7 +1319,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
#endif
u8 reg;
char *type;
char aInfo[78], aRevision[32], aDate[12];
char aInfo[90], aRevision[32], aDate[12];
void __iomem *mbase = musb->mregs;
int status = 0;
int i;
@ -1521,6 +1521,14 @@ irqreturn_t musb_interrupt(struct musb *musb)
(devctl & MUSB_DEVCTL_HM) ? "host" : "peripheral",
musb->int_usb, musb->int_tx, musb->int_rx);
#ifdef CONFIG_USB_GADGET_MUSB_HDRC
if (is_otg_enabled(musb) || is_peripheral_enabled(musb))
if (!musb->gadget_driver) {
DBG(5, "No gadget driver loaded\n");
return IRQ_HANDLED;
}
#endif
/* the core can interrupt us for multiple reasons; docs have
* a generic interrupt flowchart to follow
*/
@ -2139,7 +2147,7 @@ static int __init musb_probe(struct platform_device *pdev)
return musb_init_controller(dev, irq, base);
}
static int __devexit musb_remove(struct platform_device *pdev)
static int __exit musb_remove(struct platform_device *pdev)
{
struct musb *musb = dev_to_musb(&pdev->dev);
void __iomem *ctrl_base = musb->ctrl_base;
@ -2231,7 +2239,7 @@ static struct platform_driver musb_driver = {
.owner = THIS_MODULE,
.pm = MUSB_DEV_PM_OPS,
},
.remove = __devexit_p(musb_remove),
.remove = __exit_p(musb_remove),
.shutdown = musb_shutdown,
};

View file

@ -309,7 +309,7 @@ static void txstate(struct musb *musb, struct musb_request *req)
size_t request_size;
/* setup DMA, then program endpoint CSR */
request_size = min(request->length,
request_size = min_t(size_t, request->length,
musb_ep->dma->max_len);
if (request_size < musb_ep->packet_sz)
musb_ep->dma->desired_mode = 0;
@ -319,7 +319,7 @@ static void txstate(struct musb *musb, struct musb_request *req)
use_dma = use_dma && c->channel_program(
musb_ep->dma, musb_ep->packet_sz,
musb_ep->dma->desired_mode,
request->dma, request_size);
request->dma + request->actual, request_size);
if (use_dma) {
if (musb_ep->dma->desired_mode == 0) {
/*
@ -515,12 +515,12 @@ void musb_g_tx(struct musb *musb, u8 epnum)
if (csr & MUSB_TXCSR_FIFONOTEMPTY)
return;
if (!musb_ep->desc) {
request = musb_ep->desc ? next_request(musb_ep) : NULL;
if (!request) {
DBG(4, "%s idle now\n",
musb_ep->end_point.name);
return;
} else
request = next_request(musb_ep);
}
}
txstate(musb, to_musb_request(request));
@ -746,6 +746,8 @@ void musb_g_rx(struct musb *musb, u8 epnum)
musb_ep_select(mbase, epnum);
request = next_request(musb_ep);
if (!request)
return;
csr = musb_readw(epio, MUSB_RXCSR);
dma = is_dma_capable() ? musb_ep->dma : NULL;
@ -1731,6 +1733,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
spin_lock_irqsave(&musb->lock, flags);
otg_set_peripheral(musb->xceiv, &musb->g);
musb->xceiv->state = OTG_STATE_B_IDLE;
musb->is_active = 1;
/* FIXME this ignores the softconnect flag. Drivers are

View file

@ -664,7 +664,7 @@ irqreturn_t musb_g_ep0_irq(struct musb *musb)
musb->ep0_state = MUSB_EP0_STAGE_STATUSIN;
break;
default:
ERR("SetupEnd came in a wrong ep0stage %s",
ERR("SetupEnd came in a wrong ep0stage %s\n",
decode_ep0stage(musb->ep0_state));
}
csr = musb_readw(regs, MUSB_CSR0);
@ -787,12 +787,18 @@ setup:
handled = service_zero_data_request(
musb, &setup);
/*
* We're expecting no data in any case, so
* always set the DATAEND bit -- doing this
* here helps avoid SetupEnd interrupt coming
* in the idle stage when we're stalling...
*/
musb->ackpend |= MUSB_CSR0_P_DATAEND;
/* status stage might be immediate */
if (handled > 0) {
musb->ackpend |= MUSB_CSR0_P_DATAEND;
if (handled > 0)
musb->ep0_state =
MUSB_EP0_STAGE_STATUSIN;
}
break;
/* sequence #1 (IN to host), includes GET_STATUS

View file

@ -843,7 +843,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)
static struct platform_device *otg_dev;
static int otg_init(struct isp1301 *isp)
static int isp1301_otg_init(struct isp1301 *isp)
{
u32 l;
@ -1275,7 +1275,7 @@ static int __exit isp1301_remove(struct i2c_client *i2c)
static int isp1301_otg_enable(struct isp1301 *isp)
{
power_up(isp);
otg_init(isp);
isp1301_otg_init(isp);
/* NOTE: since we don't change this, this provides
* a few more interrupts than are strictly needed.

View file

@ -44,6 +44,7 @@
#include <linux/serial.h>
#include <linux/usb/serial.h>
#include "ftdi_sio.h"
#include "ftdi_sio_ids.h"
/*
* Version Information

View file

@ -1,7 +1,10 @@
/*
* Definitions for the FTDI USB Single Port Serial Converter -
* Driver definitions for the FTDI USB Single Port Serial Converter -
* known as FTDI_SIO (Serial Input/Output application of the chipset)
*
* For USB vendor/product IDs (VID/PID), please see ftdi_sio_ids.h
*
*
* The example I have is known as the USC-1000 which is available from
* http://www.dse.co.nz - cat no XH4214 It looks similar to this:
* http://www.dansdata.com/usbser.htm but I can't be sure There are other
@ -17,881 +20,8 @@
* Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the
* FTDI_SIO implementation.
*
* Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais
* from Rudolf Gugler
*
*/
#define FTDI_VID 0x0403 /* Vendor Id */
#define FTDI_SIO_PID 0x8372 /* Product Id SIO application of 8U100AX */
#define FTDI_8U232AM_PID 0x6001 /* Similar device to SIO above */
#define FTDI_8U232AM_ALT_PID 0x6006 /* FTDI's alternate PID for above */
#define FTDI_8U2232C_PID 0x6010 /* Dual channel device */
#define FTDI_232RL_PID 0xFBFA /* Product ID for FT232RL */
#define FTDI_4232H_PID 0x6011 /* Quad channel hi-speed device */
#define FTDI_RELAIS_PID 0xFA10 /* Relais device from Rudolf Gugler */
#define FTDI_NF_RIC_VID 0x0DCD /* Vendor Id */
#define FTDI_NF_RIC_PID 0x0001 /* Product Id */
#define FTDI_USBX_707_PID 0xF857 /* ADSTech IR Blaster USBX-707 */
/* Larsen and Brusgaard AltiTrack/USBtrack */
#define LARSENBRUSGAARD_VID 0x0FD8
#define LB_ALTITRACK_PID 0x0001
/* www.canusb.com Lawicel CANUSB device */
#define FTDI_CANUSB_PID 0xFFA8 /* Product Id */
/* AlphaMicro Components AMC-232USB01 device */
#define FTDI_AMC232_PID 0xFF00 /* Product Id */
/* www.candapter.com Ewert Energy Systems CANdapter device */
#define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
/* SCS HF Radio Modems PID's (http://www.scs-ptc.com) */
/* the VID is the standard ftdi vid (FTDI_VID) */
#define FTDI_SCS_DEVICE_0_PID 0xD010 /* SCS PTC-IIusb */
#define FTDI_SCS_DEVICE_1_PID 0xD011 /* SCS Tracker / DSP TNC */
#define FTDI_SCS_DEVICE_2_PID 0xD012
#define FTDI_SCS_DEVICE_3_PID 0xD013
#define FTDI_SCS_DEVICE_4_PID 0xD014
#define FTDI_SCS_DEVICE_5_PID 0xD015
#define FTDI_SCS_DEVICE_6_PID 0xD016
#define FTDI_SCS_DEVICE_7_PID 0xD017
/* ACT Solutions HomePro ZWave interface (http://www.act-solutions.com/HomePro.htm) */
#define FTDI_ACTZWAVE_PID 0xF2D0
/* www.starting-point-systems.com µChameleon device */
#define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */
/* www.irtrans.de device */
#define FTDI_IRTRANS_PID 0xFC60 /* Product Id */
/* www.thoughttechnology.com/ TT-USB provide with procomp use ftdi_sio */
#define FTDI_TTUSB_PID 0xFF20 /* Product Id */
/* iPlus device */
#define FTDI_IPLUS_PID 0xD070 /* Product Id */
#define FTDI_IPLUS2_PID 0xD071 /* Product Id */
/* DMX4ALL DMX Interfaces */
#define FTDI_DMX4ALL 0xC850
/* OpenDCC (www.opendcc.de) product id */
#define FTDI_OPENDCC_PID 0xBFD8
#define FTDI_OPENDCC_SNIFFER_PID 0xBFD9
#define FTDI_OPENDCC_THROTTLE_PID 0xBFDA
#define FTDI_OPENDCC_GATEWAY_PID 0xBFDB
/* Sprog II (Andrew Crosland's SprogII DCC interface) */
#define FTDI_SPROG_II 0xF0C8
/* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */
/* they use the ftdi chipset for the USB interface and the vendor id is the same */
#define FTDI_XF_632_PID 0xFC08 /* 632: 16x2 Character Display */
#define FTDI_XF_634_PID 0xFC09 /* 634: 20x4 Character Display */
#define FTDI_XF_547_PID 0xFC0A /* 547: Two line Display */
#define FTDI_XF_633_PID 0xFC0B /* 633: 16x2 Character Display with Keys */
#define FTDI_XF_631_PID 0xFC0C /* 631: 20x2 Character Display */
#define FTDI_XF_635_PID 0xFC0D /* 635: 20x4 Character Display */
#define FTDI_XF_640_PID 0xFC0E /* 640: Two line Display */
#define FTDI_XF_642_PID 0xFC0F /* 642: Two line Display */
/* Video Networks Limited / Homechoice in the UK use an ftdi-based device for their 1Mb */
/* broadband internet service. The following PID is exhibited by the usb device supplied */
/* (the VID is the standard ftdi vid (FTDI_VID) */
#define FTDI_VNHCPCUSB_D_PID 0xfe38 /* Product Id */
/*
* PCDJ use ftdi based dj-controllers. The following PID is for their DAC-2 device
* http://www.pcdjhardware.com/DAC2.asp (PID sent by Wouter Paesen)
* (the VID is the standard ftdi vid (FTDI_VID) */
#define FTDI_PCDJ_DAC2_PID 0xFA88
/*
* The following are the values for the Matrix Orbital LCD displays,
* which are the FT232BM ( similar to the 8U232AM )
*/
#define FTDI_MTXORB_0_PID 0xFA00 /* Matrix Orbital Product Id */
#define FTDI_MTXORB_1_PID 0xFA01 /* Matrix Orbital Product Id */
#define FTDI_MTXORB_2_PID 0xFA02 /* Matrix Orbital Product Id */
#define FTDI_MTXORB_3_PID 0xFA03 /* Matrix Orbital Product Id */
#define FTDI_MTXORB_4_PID 0xFA04 /* Matrix Orbital Product Id */
#define FTDI_MTXORB_5_PID 0xFA05 /* Matrix Orbital Product Id */
#define FTDI_MTXORB_6_PID 0xFA06 /* Matrix Orbital Product Id */
/* OOCDlink by Joern Kaipf <joernk@web.de>
* (http://www.joernonline.de/dw/doku.php?id=start&idx=projects:oocdlink) */
#define FTDI_OOCDLINK_PID 0xbaf8 /* Amontec JTAGkey */
/*
* The following are the values for the Matrix Orbital FTDI Range
* Anything in this range will use an FT232RL.
*/
#define MTXORB_VID 0x1B3D
#define MTXORB_FTDI_RANGE_0100_PID 0x0100
#define MTXORB_FTDI_RANGE_0101_PID 0x0101
#define MTXORB_FTDI_RANGE_0102_PID 0x0102
#define MTXORB_FTDI_RANGE_0103_PID 0x0103
#define MTXORB_FTDI_RANGE_0104_PID 0x0104
#define MTXORB_FTDI_RANGE_0105_PID 0x0105
#define MTXORB_FTDI_RANGE_0106_PID 0x0106
#define MTXORB_FTDI_RANGE_0107_PID 0x0107
#define MTXORB_FTDI_RANGE_0108_PID 0x0108
#define MTXORB_FTDI_RANGE_0109_PID 0x0109
#define MTXORB_FTDI_RANGE_010A_PID 0x010A
#define MTXORB_FTDI_RANGE_010B_PID 0x010B
#define MTXORB_FTDI_RANGE_010C_PID 0x010C
#define MTXORB_FTDI_RANGE_010D_PID 0x010D
#define MTXORB_FTDI_RANGE_010E_PID 0x010E
#define MTXORB_FTDI_RANGE_010F_PID 0x010F
#define MTXORB_FTDI_RANGE_0110_PID 0x0110
#define MTXORB_FTDI_RANGE_0111_PID 0x0111
#define MTXORB_FTDI_RANGE_0112_PID 0x0112
#define MTXORB_FTDI_RANGE_0113_PID 0x0113
#define MTXORB_FTDI_RANGE_0114_PID 0x0114
#define MTXORB_FTDI_RANGE_0115_PID 0x0115
#define MTXORB_FTDI_RANGE_0116_PID 0x0116
#define MTXORB_FTDI_RANGE_0117_PID 0x0117
#define MTXORB_FTDI_RANGE_0118_PID 0x0118
#define MTXORB_FTDI_RANGE_0119_PID 0x0119
#define MTXORB_FTDI_RANGE_011A_PID 0x011A
#define MTXORB_FTDI_RANGE_011B_PID 0x011B
#define MTXORB_FTDI_RANGE_011C_PID 0x011C
#define MTXORB_FTDI_RANGE_011D_PID 0x011D
#define MTXORB_FTDI_RANGE_011E_PID 0x011E
#define MTXORB_FTDI_RANGE_011F_PID 0x011F
#define MTXORB_FTDI_RANGE_0120_PID 0x0120
#define MTXORB_FTDI_RANGE_0121_PID 0x0121
#define MTXORB_FTDI_RANGE_0122_PID 0x0122
#define MTXORB_FTDI_RANGE_0123_PID 0x0123
#define MTXORB_FTDI_RANGE_0124_PID 0x0124
#define MTXORB_FTDI_RANGE_0125_PID 0x0125
#define MTXORB_FTDI_RANGE_0126_PID 0x0126
#define MTXORB_FTDI_RANGE_0127_PID 0x0127
#define MTXORB_FTDI_RANGE_0128_PID 0x0128
#define MTXORB_FTDI_RANGE_0129_PID 0x0129
#define MTXORB_FTDI_RANGE_012A_PID 0x012A
#define MTXORB_FTDI_RANGE_012B_PID 0x012B
#define MTXORB_FTDI_RANGE_012C_PID 0x012C
#define MTXORB_FTDI_RANGE_012D_PID 0x012D
#define MTXORB_FTDI_RANGE_012E_PID 0x012E
#define MTXORB_FTDI_RANGE_012F_PID 0x012F
#define MTXORB_FTDI_RANGE_0130_PID 0x0130
#define MTXORB_FTDI_RANGE_0131_PID 0x0131
#define MTXORB_FTDI_RANGE_0132_PID 0x0132
#define MTXORB_FTDI_RANGE_0133_PID 0x0133
#define MTXORB_FTDI_RANGE_0134_PID 0x0134
#define MTXORB_FTDI_RANGE_0135_PID 0x0135
#define MTXORB_FTDI_RANGE_0136_PID 0x0136
#define MTXORB_FTDI_RANGE_0137_PID 0x0137
#define MTXORB_FTDI_RANGE_0138_PID 0x0138
#define MTXORB_FTDI_RANGE_0139_PID 0x0139
#define MTXORB_FTDI_RANGE_013A_PID 0x013A
#define MTXORB_FTDI_RANGE_013B_PID 0x013B
#define MTXORB_FTDI_RANGE_013C_PID 0x013C
#define MTXORB_FTDI_RANGE_013D_PID 0x013D
#define MTXORB_FTDI_RANGE_013E_PID 0x013E
#define MTXORB_FTDI_RANGE_013F_PID 0x013F
#define MTXORB_FTDI_RANGE_0140_PID 0x0140
#define MTXORB_FTDI_RANGE_0141_PID 0x0141
#define MTXORB_FTDI_RANGE_0142_PID 0x0142
#define MTXORB_FTDI_RANGE_0143_PID 0x0143
#define MTXORB_FTDI_RANGE_0144_PID 0x0144
#define MTXORB_FTDI_RANGE_0145_PID 0x0145
#define MTXORB_FTDI_RANGE_0146_PID 0x0146
#define MTXORB_FTDI_RANGE_0147_PID 0x0147
#define MTXORB_FTDI_RANGE_0148_PID 0x0148
#define MTXORB_FTDI_RANGE_0149_PID 0x0149
#define MTXORB_FTDI_RANGE_014A_PID 0x014A
#define MTXORB_FTDI_RANGE_014B_PID 0x014B
#define MTXORB_FTDI_RANGE_014C_PID 0x014C
#define MTXORB_FTDI_RANGE_014D_PID 0x014D
#define MTXORB_FTDI_RANGE_014E_PID 0x014E
#define MTXORB_FTDI_RANGE_014F_PID 0x014F
#define MTXORB_FTDI_RANGE_0150_PID 0x0150
#define MTXORB_FTDI_RANGE_0151_PID 0x0151
#define MTXORB_FTDI_RANGE_0152_PID 0x0152
#define MTXORB_FTDI_RANGE_0153_PID 0x0153
#define MTXORB_FTDI_RANGE_0154_PID 0x0154
#define MTXORB_FTDI_RANGE_0155_PID 0x0155
#define MTXORB_FTDI_RANGE_0156_PID 0x0156
#define MTXORB_FTDI_RANGE_0157_PID 0x0157
#define MTXORB_FTDI_RANGE_0158_PID 0x0158
#define MTXORB_FTDI_RANGE_0159_PID 0x0159
#define MTXORB_FTDI_RANGE_015A_PID 0x015A
#define MTXORB_FTDI_RANGE_015B_PID 0x015B
#define MTXORB_FTDI_RANGE_015C_PID 0x015C
#define MTXORB_FTDI_RANGE_015D_PID 0x015D
#define MTXORB_FTDI_RANGE_015E_PID 0x015E
#define MTXORB_FTDI_RANGE_015F_PID 0x015F
#define MTXORB_FTDI_RANGE_0160_PID 0x0160
#define MTXORB_FTDI_RANGE_0161_PID 0x0161
#define MTXORB_FTDI_RANGE_0162_PID 0x0162
#define MTXORB_FTDI_RANGE_0163_PID 0x0163
#define MTXORB_FTDI_RANGE_0164_PID 0x0164
#define MTXORB_FTDI_RANGE_0165_PID 0x0165
#define MTXORB_FTDI_RANGE_0166_PID 0x0166
#define MTXORB_FTDI_RANGE_0167_PID 0x0167
#define MTXORB_FTDI_RANGE_0168_PID 0x0168
#define MTXORB_FTDI_RANGE_0169_PID 0x0169
#define MTXORB_FTDI_RANGE_016A_PID 0x016A
#define MTXORB_FTDI_RANGE_016B_PID 0x016B
#define MTXORB_FTDI_RANGE_016C_PID 0x016C
#define MTXORB_FTDI_RANGE_016D_PID 0x016D
#define MTXORB_FTDI_RANGE_016E_PID 0x016E
#define MTXORB_FTDI_RANGE_016F_PID 0x016F
#define MTXORB_FTDI_RANGE_0170_PID 0x0170
#define MTXORB_FTDI_RANGE_0171_PID 0x0171
#define MTXORB_FTDI_RANGE_0172_PID 0x0172
#define MTXORB_FTDI_RANGE_0173_PID 0x0173
#define MTXORB_FTDI_RANGE_0174_PID 0x0174
#define MTXORB_FTDI_RANGE_0175_PID 0x0175
#define MTXORB_FTDI_RANGE_0176_PID 0x0176
#define MTXORB_FTDI_RANGE_0177_PID 0x0177
#define MTXORB_FTDI_RANGE_0178_PID 0x0178
#define MTXORB_FTDI_RANGE_0179_PID 0x0179
#define MTXORB_FTDI_RANGE_017A_PID 0x017A
#define MTXORB_FTDI_RANGE_017B_PID 0x017B
#define MTXORB_FTDI_RANGE_017C_PID 0x017C
#define MTXORB_FTDI_RANGE_017D_PID 0x017D
#define MTXORB_FTDI_RANGE_017E_PID 0x017E
#define MTXORB_FTDI_RANGE_017F_PID 0x017F
#define MTXORB_FTDI_RANGE_0180_PID 0x0180
#define MTXORB_FTDI_RANGE_0181_PID 0x0181
#define MTXORB_FTDI_RANGE_0182_PID 0x0182
#define MTXORB_FTDI_RANGE_0183_PID 0x0183
#define MTXORB_FTDI_RANGE_0184_PID 0x0184
#define MTXORB_FTDI_RANGE_0185_PID 0x0185
#define MTXORB_FTDI_RANGE_0186_PID 0x0186
#define MTXORB_FTDI_RANGE_0187_PID 0x0187
#define MTXORB_FTDI_RANGE_0188_PID 0x0188
#define MTXORB_FTDI_RANGE_0189_PID 0x0189
#define MTXORB_FTDI_RANGE_018A_PID 0x018A
#define MTXORB_FTDI_RANGE_018B_PID 0x018B
#define MTXORB_FTDI_RANGE_018C_PID 0x018C
#define MTXORB_FTDI_RANGE_018D_PID 0x018D
#define MTXORB_FTDI_RANGE_018E_PID 0x018E
#define MTXORB_FTDI_RANGE_018F_PID 0x018F
#define MTXORB_FTDI_RANGE_0190_PID 0x0190
#define MTXORB_FTDI_RANGE_0191_PID 0x0191
#define MTXORB_FTDI_RANGE_0192_PID 0x0192
#define MTXORB_FTDI_RANGE_0193_PID 0x0193
#define MTXORB_FTDI_RANGE_0194_PID 0x0194
#define MTXORB_FTDI_RANGE_0195_PID 0x0195
#define MTXORB_FTDI_RANGE_0196_PID 0x0196
#define MTXORB_FTDI_RANGE_0197_PID 0x0197
#define MTXORB_FTDI_RANGE_0198_PID 0x0198
#define MTXORB_FTDI_RANGE_0199_PID 0x0199
#define MTXORB_FTDI_RANGE_019A_PID 0x019A
#define MTXORB_FTDI_RANGE_019B_PID 0x019B
#define MTXORB_FTDI_RANGE_019C_PID 0x019C
#define MTXORB_FTDI_RANGE_019D_PID 0x019D
#define MTXORB_FTDI_RANGE_019E_PID 0x019E
#define MTXORB_FTDI_RANGE_019F_PID 0x019F
#define MTXORB_FTDI_RANGE_01A0_PID 0x01A0
#define MTXORB_FTDI_RANGE_01A1_PID 0x01A1
#define MTXORB_FTDI_RANGE_01A2_PID 0x01A2
#define MTXORB_FTDI_RANGE_01A3_PID 0x01A3
#define MTXORB_FTDI_RANGE_01A4_PID 0x01A4
#define MTXORB_FTDI_RANGE_01A5_PID 0x01A5
#define MTXORB_FTDI_RANGE_01A6_PID 0x01A6
#define MTXORB_FTDI_RANGE_01A7_PID 0x01A7
#define MTXORB_FTDI_RANGE_01A8_PID 0x01A8
#define MTXORB_FTDI_RANGE_01A9_PID 0x01A9
#define MTXORB_FTDI_RANGE_01AA_PID 0x01AA
#define MTXORB_FTDI_RANGE_01AB_PID 0x01AB
#define MTXORB_FTDI_RANGE_01AC_PID 0x01AC
#define MTXORB_FTDI_RANGE_01AD_PID 0x01AD
#define MTXORB_FTDI_RANGE_01AE_PID 0x01AE
#define MTXORB_FTDI_RANGE_01AF_PID 0x01AF
#define MTXORB_FTDI_RANGE_01B0_PID 0x01B0
#define MTXORB_FTDI_RANGE_01B1_PID 0x01B1
#define MTXORB_FTDI_RANGE_01B2_PID 0x01B2
#define MTXORB_FTDI_RANGE_01B3_PID 0x01B3
#define MTXORB_FTDI_RANGE_01B4_PID 0x01B4
#define MTXORB_FTDI_RANGE_01B5_PID 0x01B5
#define MTXORB_FTDI_RANGE_01B6_PID 0x01B6
#define MTXORB_FTDI_RANGE_01B7_PID 0x01B7
#define MTXORB_FTDI_RANGE_01B8_PID 0x01B8
#define MTXORB_FTDI_RANGE_01B9_PID 0x01B9
#define MTXORB_FTDI_RANGE_01BA_PID 0x01BA
#define MTXORB_FTDI_RANGE_01BB_PID 0x01BB
#define MTXORB_FTDI_RANGE_01BC_PID 0x01BC
#define MTXORB_FTDI_RANGE_01BD_PID 0x01BD
#define MTXORB_FTDI_RANGE_01BE_PID 0x01BE
#define MTXORB_FTDI_RANGE_01BF_PID 0x01BF
#define MTXORB_FTDI_RANGE_01C0_PID 0x01C0
#define MTXORB_FTDI_RANGE_01C1_PID 0x01C1
#define MTXORB_FTDI_RANGE_01C2_PID 0x01C2
#define MTXORB_FTDI_RANGE_01C3_PID 0x01C3
#define MTXORB_FTDI_RANGE_01C4_PID 0x01C4
#define MTXORB_FTDI_RANGE_01C5_PID 0x01C5
#define MTXORB_FTDI_RANGE_01C6_PID 0x01C6
#define MTXORB_FTDI_RANGE_01C7_PID 0x01C7
#define MTXORB_FTDI_RANGE_01C8_PID 0x01C8
#define MTXORB_FTDI_RANGE_01C9_PID 0x01C9
#define MTXORB_FTDI_RANGE_01CA_PID 0x01CA
#define MTXORB_FTDI_RANGE_01CB_PID 0x01CB
#define MTXORB_FTDI_RANGE_01CC_PID 0x01CC
#define MTXORB_FTDI_RANGE_01CD_PID 0x01CD
#define MTXORB_FTDI_RANGE_01CE_PID 0x01CE
#define MTXORB_FTDI_RANGE_01CF_PID 0x01CF
#define MTXORB_FTDI_RANGE_01D0_PID 0x01D0
#define MTXORB_FTDI_RANGE_01D1_PID 0x01D1
#define MTXORB_FTDI_RANGE_01D2_PID 0x01D2
#define MTXORB_FTDI_RANGE_01D3_PID 0x01D3
#define MTXORB_FTDI_RANGE_01D4_PID 0x01D4
#define MTXORB_FTDI_RANGE_01D5_PID 0x01D5
#define MTXORB_FTDI_RANGE_01D6_PID 0x01D6
#define MTXORB_FTDI_RANGE_01D7_PID 0x01D7
#define MTXORB_FTDI_RANGE_01D8_PID 0x01D8
#define MTXORB_FTDI_RANGE_01D9_PID 0x01D9
#define MTXORB_FTDI_RANGE_01DA_PID 0x01DA
#define MTXORB_FTDI_RANGE_01DB_PID 0x01DB
#define MTXORB_FTDI_RANGE_01DC_PID 0x01DC
#define MTXORB_FTDI_RANGE_01DD_PID 0x01DD
#define MTXORB_FTDI_RANGE_01DE_PID 0x01DE
#define MTXORB_FTDI_RANGE_01DF_PID 0x01DF
#define MTXORB_FTDI_RANGE_01E0_PID 0x01E0
#define MTXORB_FTDI_RANGE_01E1_PID 0x01E1
#define MTXORB_FTDI_RANGE_01E2_PID 0x01E2
#define MTXORB_FTDI_RANGE_01E3_PID 0x01E3
#define MTXORB_FTDI_RANGE_01E4_PID 0x01E4
#define MTXORB_FTDI_RANGE_01E5_PID 0x01E5
#define MTXORB_FTDI_RANGE_01E6_PID 0x01E6
#define MTXORB_FTDI_RANGE_01E7_PID 0x01E7
#define MTXORB_FTDI_RANGE_01E8_PID 0x01E8
#define MTXORB_FTDI_RANGE_01E9_PID 0x01E9
#define MTXORB_FTDI_RANGE_01EA_PID 0x01EA
#define MTXORB_FTDI_RANGE_01EB_PID 0x01EB
#define MTXORB_FTDI_RANGE_01EC_PID 0x01EC
#define MTXORB_FTDI_RANGE_01ED_PID 0x01ED
#define MTXORB_FTDI_RANGE_01EE_PID 0x01EE
#define MTXORB_FTDI_RANGE_01EF_PID 0x01EF
#define MTXORB_FTDI_RANGE_01F0_PID 0x01F0
#define MTXORB_FTDI_RANGE_01F1_PID 0x01F1
#define MTXORB_FTDI_RANGE_01F2_PID 0x01F2
#define MTXORB_FTDI_RANGE_01F3_PID 0x01F3
#define MTXORB_FTDI_RANGE_01F4_PID 0x01F4
#define MTXORB_FTDI_RANGE_01F5_PID 0x01F5
#define MTXORB_FTDI_RANGE_01F6_PID 0x01F6
#define MTXORB_FTDI_RANGE_01F7_PID 0x01F7
#define MTXORB_FTDI_RANGE_01F8_PID 0x01F8
#define MTXORB_FTDI_RANGE_01F9_PID 0x01F9
#define MTXORB_FTDI_RANGE_01FA_PID 0x01FA
#define MTXORB_FTDI_RANGE_01FB_PID 0x01FB
#define MTXORB_FTDI_RANGE_01FC_PID 0x01FC
#define MTXORB_FTDI_RANGE_01FD_PID 0x01FD
#define MTXORB_FTDI_RANGE_01FE_PID 0x01FE
#define MTXORB_FTDI_RANGE_01FF_PID 0x01FF
/* Interbiometrics USB I/O Board */
/* Developed for Interbiometrics by Rudolf Gugler */
#define INTERBIOMETRICS_VID 0x1209
#define INTERBIOMETRICS_IOBOARD_PID 0x1002
#define INTERBIOMETRICS_MINI_IOBOARD_PID 0x1006
/*
* The following are the values for the Perle Systems
* UltraPort USB serial converters
*/
#define FTDI_PERLE_ULTRAPORT_PID 0xF0C0 /* Perle UltraPort Product Id */
/*
* The following are the values for the Sealevel SeaLINK+ adapters.
* (Original list sent by Tuan Hoang. Ian Abbott renamed the macros and
* removed some PIDs that don't seem to match any existing products.)
*/
#define SEALEVEL_VID 0x0c52 /* Sealevel Vendor ID */
#define SEALEVEL_2101_PID 0x2101 /* SeaLINK+232 (2101/2105) */
#define SEALEVEL_2102_PID 0x2102 /* SeaLINK+485 (2102) */
#define SEALEVEL_2103_PID 0x2103 /* SeaLINK+232I (2103) */
#define SEALEVEL_2104_PID 0x2104 /* SeaLINK+485I (2104) */
#define SEALEVEL_2106_PID 0x9020 /* SeaLINK+422 (2106) */
#define SEALEVEL_2201_1_PID 0x2211 /* SeaPORT+2/232 (2201) Port 1 */
#define SEALEVEL_2201_2_PID 0x2221 /* SeaPORT+2/232 (2201) Port 2 */
#define SEALEVEL_2202_1_PID 0x2212 /* SeaPORT+2/485 (2202) Port 1 */
#define SEALEVEL_2202_2_PID 0x2222 /* SeaPORT+2/485 (2202) Port 2 */
#define SEALEVEL_2203_1_PID 0x2213 /* SeaPORT+2 (2203) Port 1 */
#define SEALEVEL_2203_2_PID 0x2223 /* SeaPORT+2 (2203) Port 2 */
#define SEALEVEL_2401_1_PID 0x2411 /* SeaPORT+4/232 (2401) Port 1 */
#define SEALEVEL_2401_2_PID 0x2421 /* SeaPORT+4/232 (2401) Port 2 */
#define SEALEVEL_2401_3_PID 0x2431 /* SeaPORT+4/232 (2401) Port 3 */
#define SEALEVEL_2401_4_PID 0x2441 /* SeaPORT+4/232 (2401) Port 4 */
#define SEALEVEL_2402_1_PID 0x2412 /* SeaPORT+4/485 (2402) Port 1 */
#define SEALEVEL_2402_2_PID 0x2422 /* SeaPORT+4/485 (2402) Port 2 */
#define SEALEVEL_2402_3_PID 0x2432 /* SeaPORT+4/485 (2402) Port 3 */
#define SEALEVEL_2402_4_PID 0x2442 /* SeaPORT+4/485 (2402) Port 4 */
#define SEALEVEL_2403_1_PID 0x2413 /* SeaPORT+4 (2403) Port 1 */
#define SEALEVEL_2403_2_PID 0x2423 /* SeaPORT+4 (2403) Port 2 */
#define SEALEVEL_2403_3_PID 0x2433 /* SeaPORT+4 (2403) Port 3 */
#define SEALEVEL_2403_4_PID 0x2443 /* SeaPORT+4 (2403) Port 4 */
#define SEALEVEL_2801_1_PID 0X2811 /* SeaLINK+8/232 (2801) Port 1 */
#define SEALEVEL_2801_2_PID 0X2821 /* SeaLINK+8/232 (2801) Port 2 */
#define SEALEVEL_2801_3_PID 0X2831 /* SeaLINK+8/232 (2801) Port 3 */
#define SEALEVEL_2801_4_PID 0X2841 /* SeaLINK+8/232 (2801) Port 4 */
#define SEALEVEL_2801_5_PID 0X2851 /* SeaLINK+8/232 (2801) Port 5 */
#define SEALEVEL_2801_6_PID 0X2861 /* SeaLINK+8/232 (2801) Port 6 */
#define SEALEVEL_2801_7_PID 0X2871 /* SeaLINK+8/232 (2801) Port 7 */
#define SEALEVEL_2801_8_PID 0X2881 /* SeaLINK+8/232 (2801) Port 8 */
#define SEALEVEL_2802_1_PID 0X2812 /* SeaLINK+8/485 (2802) Port 1 */
#define SEALEVEL_2802_2_PID 0X2822 /* SeaLINK+8/485 (2802) Port 2 */
#define SEALEVEL_2802_3_PID 0X2832 /* SeaLINK+8/485 (2802) Port 3 */
#define SEALEVEL_2802_4_PID 0X2842 /* SeaLINK+8/485 (2802) Port 4 */
#define SEALEVEL_2802_5_PID 0X2852 /* SeaLINK+8/485 (2802) Port 5 */
#define SEALEVEL_2802_6_PID 0X2862 /* SeaLINK+8/485 (2802) Port 6 */
#define SEALEVEL_2802_7_PID 0X2872 /* SeaLINK+8/485 (2802) Port 7 */
#define SEALEVEL_2802_8_PID 0X2882 /* SeaLINK+8/485 (2802) Port 8 */
#define SEALEVEL_2803_1_PID 0X2813 /* SeaLINK+8 (2803) Port 1 */
#define SEALEVEL_2803_2_PID 0X2823 /* SeaLINK+8 (2803) Port 2 */
#define SEALEVEL_2803_3_PID 0X2833 /* SeaLINK+8 (2803) Port 3 */
#define SEALEVEL_2803_4_PID 0X2843 /* SeaLINK+8 (2803) Port 4 */
#define SEALEVEL_2803_5_PID 0X2853 /* SeaLINK+8 (2803) Port 5 */
#define SEALEVEL_2803_6_PID 0X2863 /* SeaLINK+8 (2803) Port 6 */
#define SEALEVEL_2803_7_PID 0X2873 /* SeaLINK+8 (2803) Port 7 */
#define SEALEVEL_2803_8_PID 0X2883 /* SeaLINK+8 (2803) Port 8 */