[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Sat Jan 21 22:36:07 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/b762a360eef2
changeset: 287:b762a360eef2
user: ray at terran.dlink.ua
date: Sun Jan 22 00:22:31 2012 +0200
description:
update sys/dev/usb/ to r230440.
diffstat:
head/sys/dev/usb/quirk/usb_quirk.c | 3 ++-
head/sys/dev/usb/serial/u3g.c | 3 ++-
head/sys/dev/usb/serial/uftdi.c | 3 ++-
head/sys/dev/usb/usb_hub.c | 4 ----
head/sys/dev/usb/usb_request.c | 16 +++-------------
head/sys/dev/usb/usbdevs | 10 ++++++++--
head/sys/dev/usb/wlan/if_run.c | 4 ++--
7 files changed, 19 insertions(+), 24 deletions(-)
diffs (201 lines):
diff -r 1f7980008e67 -r b762a360eef2 head/sys/dev/usb/quirk/usb_quirk.c
--- a/head/sys/dev/usb/quirk/usb_quirk.c Sat Jan 21 17:32:13 2012 +0200
+++ b/head/sys/dev/usb/quirk/usb_quirk.c Sun Jan 22 00:22:31 2012 +0200
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/sys/dev/usb/quirk/usb_quirk.c 228243 2011-12-03 19:56:52Z emaste $ */
+/* $FreeBSD: head/sys/dev/usb/quirk/usb_quirk.c 230238 2012-01-16 22:26:25Z hselasky $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
* Copyright (c) 1998 Lennart Augustsson. All rights reserved.
@@ -134,6 +134,7 @@
USB_QUIRK(QUALCOMM2, CDMA_MSM, 0x0000, 0xffff, UQ_ASSUME_CM_OVER_DATA),
USB_QUIRK(CURITEL, UM150, 0x0000, 0xffff, UQ_ASSUME_CM_OVER_DATA),
USB_QUIRK(CURITEL, UM175, 0x0000, 0xffff, UQ_ASSUME_CM_OVER_DATA),
+ USB_QUIRK(VERTEX, VW110L, 0x0000, 0xffff, UQ_ASSUME_CM_OVER_DATA),
/* USB Mass Storage Class Quirks */
USB_QUIRK_VP(USB_VENDOR_ASAHIOPTICAL, 0, UQ_MSC_NO_RS_CLEAR_UA,
diff -r 1f7980008e67 -r b762a360eef2 head/sys/dev/usb/serial/u3g.c
--- a/head/sys/dev/usb/serial/u3g.c Sat Jan 21 17:32:13 2012 +0200
+++ b/head/sys/dev/usb/serial/u3g.c Sun Jan 22 00:22:31 2012 +0200
@@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $FreeBSD: head/sys/dev/usb/serial/u3g.c 227309 2011-11-07 15:43:11Z ed $
+ * $FreeBSD: head/sys/dev/usb/serial/u3g.c 230238 2012-01-16 22:26:25Z hselasky $
*/
/*
@@ -368,6 +368,7 @@
U3G_DEV(QISDA, H21_2, 0),
U3G_DEV(QUALCOMM2, AC8700, 0),
U3G_DEV(QUALCOMM2, MF330, 0),
+ U3G_DEV(QUALCOMM2, VW110L, U3GINIT_SCSIEJECT),
U3G_DEV(QUALCOMMINC, AC2726, 0),
U3G_DEV(QUALCOMMINC, AC8700, 0),
U3G_DEV(QUALCOMMINC, AC8710, 0),
diff -r 1f7980008e67 -r b762a360eef2 head/sys/dev/usb/serial/uftdi.c
--- a/head/sys/dev/usb/serial/uftdi.c Sat Jan 21 17:32:13 2012 +0200
+++ b/head/sys/dev/usb/serial/uftdi.c Sun Jan 22 00:22:31 2012 +0200
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/usb/serial/uftdi.c 230179 2012-01-15 23:00:33Z kientzle $");
+__FBSDID("$FreeBSD: head/sys/dev/usb/serial/uftdi.c 230242 2012-01-16 23:14:23Z stas $");
/*
* NOTE: all function names beginning like "uftdi_cfg_" can only
@@ -221,6 +221,7 @@
UFTDI_DEV(FTDI, SERIAL_4232H, 8U232AM),
UFTDI_DEV(FTDI, SERIAL_8U232AM, 8U232AM),
UFTDI_DEV(FTDI, SERIAL_8U232AM4, 8U232AM),
+ UFTDI_DEV(FTDI, SERIAL_BEAGLEBONE, 8U232AM),
UFTDI_DEV(FTDI, SEMC_DSS20, 8U232AM),
UFTDI_DEV(FTDI, CFA_631, 8U232AM),
UFTDI_DEV(FTDI, CFA_632, 8U232AM),
diff -r 1f7980008e67 -r b762a360eef2 head/sys/dev/usb/usb_hub.c
--- a/head/sys/dev/usb/usb_hub.c Sat Jan 21 17:32:13 2012 +0200
+++ b/head/sys/dev/usb/usb_hub.c Sun Jan 22 00:22:31 2012 +0200
@@ -918,10 +918,6 @@
uint8_t iface_index;
usb_error_t err;
-#ifdef USB_DEBUG
- uhub_debug = 0xfffffff;
-#endif
-
sc->sc_udev = udev;
sc->sc_dev = dev;
diff -r 1f7980008e67 -r b762a360eef2 head/sys/dev/usb/usb_request.c
--- a/head/sys/dev/usb/usb_request.c Sat Jan 21 17:32:13 2012 +0200
+++ b/head/sys/dev/usb/usb_request.c Sun Jan 22 00:22:31 2012 +0200
@@ -335,16 +335,12 @@
usbd_get_hr_func(struct usb_device *udev)
{
/* figure out if there is a Handle Request function */
- if (udev->flags.usb_mode == USB_MODE_DEVICE) {
- DPRINTF("USB_MODE_DEVICE\n");
+ if (udev->flags.usb_mode == USB_MODE_DEVICE)
return (usb_temp_get_desc_p);
- } else if (udev->parent_hub == NULL) {
- DPRINTF("udev->parent_hub == NULL, use roothub_exec = %p\n", udev->bus->methods->roothub_exec);
+ else if (udev->parent_hub == NULL)
return (udev->bus->methods->roothub_exec);
- } else {
- DPRINTF("!USB_MODE_DEVICE && udev->parent_hub != NULL\n");
+ else
return (NULL);
- }
}
/*------------------------------------------------------------------------*
@@ -421,9 +417,6 @@
uint16_t temp;
uint16_t acttemp;
uint8_t enum_locked;
-#ifdef USB_DEBUG
- usb_debug = 0xfffffff;
-#endif
if (timeout < 50) {
/* timeout is too small */
@@ -499,7 +492,6 @@
/* The root HUB code needs the BUS lock locked */
USB_BUS_LOCK(udev->bus);
- DPRINTF("hr_func = %p\n", hr_func);
err = (hr_func) (udev, req, &desc, &temp);
USB_BUS_UNLOCK(udev->bus);
@@ -528,8 +520,6 @@
memcpy(data, desc, length);
}
goto done; /* success */
- } else {
- DPRINTF("Handle Request function is not set\n");
}
/*
diff -r 1f7980008e67 -r b762a360eef2 head/sys/dev/usb/usbdevs
--- a/head/sys/dev/usb/usbdevs Sat Jan 21 17:32:13 2012 +0200
+++ b/head/sys/dev/usb/usbdevs Sun Jan 22 00:22:31 2012 +0200
@@ -1,4 +1,4 @@
-$FreeBSD: head/sys/dev/usb/usbdevs 230179 2012-01-15 23:00:33Z kientzle $
+$FreeBSD: head/sys/dev/usb/usbdevs 230333 2012-01-19 18:03:52Z hselasky $
/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
/*-
@@ -679,6 +679,7 @@
vendor METAGEEK2 0x1dd5 MetaGeek
vendor ALINK 0x1e0e Alink
vendor AIRTIES 0x1eda AirTies
+vendor VERTEX 0x1fe7 Vertex Wireless Co., Ltd.
vendor DLINK 0x2001 D-Link
vendor PLANEX2 0x2019 Planex Communications
vendor HAUPPAUGE2 0x2040 Hauppauge Computer Works
@@ -1606,6 +1607,7 @@
product FTDI SERIAL_2232D 0x9e90 FT2232D Dual port Serial
product FTDI BEAGLEBONE 0xA6D0 BeagleBone
product FTDI SERIAL_4232H 0x6011 FT4232H Quad port Serial
+product FTDI SERIAL_BEAGLEBONE 0xa6d0 BeagleBone FTDI Serial
/* Gude Analog- und Digitalsysteme products also uses FTDI's id: */
product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi
product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru
@@ -2091,7 +2093,6 @@
product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2
/* Logitech products */
-product LOGITECH LANW300NU2 0x0166 LAN-W300N/U2
product LOGITECH M2452 0x0203 M2452 keyboard
product LOGITECH M4848 0x0301 M4848 mouse
product LOGITECH PAGESCAN 0x040f PageScan
@@ -2124,6 +2125,7 @@
product LOGITEC RT2870_1 0x0162 RT2870
product LOGITEC RT2870_2 0x0163 RT2870
product LOGITEC RT2870_3 0x0164 RT2870
+product LOGITEC LANW300NU2 0x0166 LAN-W300N/U2
/* Longcheer Holdings, Ltd. products */
product LONGCHEER WM66 0x6061 Longcheer WM66 HSDPA
@@ -2682,6 +2684,7 @@
product QUALCOMM2 RWT_FCT 0x3100 RWT FCT-CDMA 2000 1xRTT modem
product QUALCOMM2 CDMA_MSM 0x3196 CDMA Technologies MSM modem
product QUALCOMM2 AC8700 0x6000 AC8700
+product QUALCOMM2 VW110L 0x1000 Vertex Wireless 110L modem
product QUALCOMMINC CDMA_MSM 0x0001 CDMA Technologies MSM modem
product QUALCOMMINC E0002 0x0002 3G modem
product QUALCOMMINC E0003 0x0003 3G modem
@@ -3381,6 +3384,9 @@
/* Vaisala products */
product VAISALA CABLE 0x0200 USB Interface cable
+/* Vertex products */
+product VERTEX VW110L 0x0100 Vertex VW110L modem
+
/* VidzMedia products */
product VIDZMEDIA MONSTERTV 0x4fb1 MonsterTV P2H
diff -r 1f7980008e67 -r b762a360eef2 head/sys/dev/usb/wlan/if_run.c
--- a/head/sys/dev/usb/wlan/if_run.c Sat Jan 21 17:32:13 2012 +0200
+++ b/head/sys/dev/usb/wlan/if_run.c Sun Jan 22 00:22:31 2012 +0200
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_run.c 228621 2011-12-17 10:23:17Z bschmidt $");
+__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_run.c 230333 2012-01-19 18:03:52Z hselasky $");
/*-
* Ralink Technology RT2700U/RT2800U/RT3000U chipset driver.
@@ -208,7 +208,7 @@
RUN_DEV(LOGITEC, RT2870_1),
RUN_DEV(LOGITEC, RT2870_2),
RUN_DEV(LOGITEC, RT2870_3),
- RUN_DEV(LOGITECH, LANW300NU2),
+ RUN_DEV(LOGITEC, LANW300NU2),
RUN_DEV(MELCO, RT2870_1),
RUN_DEV(MELCO, RT2870_2),
RUN_DEV(MELCO, WLIUCAG300N),
More information about the Zrouter-src-freebsd
mailing list