svn commit: r215980 - in stable/8/sys/dev/usb: . quirk serial wlan
Andrew Thompson
thompsa at FreeBSD.org
Sun Nov 28 07:03:22 UTC 2010
Author: thompsa
Date: Sun Nov 28 07:03:21 2010
New Revision: 215980
URL: http://svn.freebsd.org/changeset/base/215980
Log:
MFC r213804,213879,213880,214800
Add new device IDs.
Modified:
stable/8/sys/dev/usb/quirk/usb_quirk.c
stable/8/sys/dev/usb/serial/u3g.c
stable/8/sys/dev/usb/usbdevs
stable/8/sys/dev/usb/wlan/if_rum.c
stable/8/sys/dev/usb/wlan/if_upgt.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- stable/8/sys/dev/usb/quirk/usb_quirk.c Sun Nov 28 06:43:39 2010 (r215979)
+++ stable/8/sys/dev/usb/quirk/usb_quirk.c Sun Nov 28 07:03:21 2010 (r215980)
@@ -120,6 +120,7 @@ static struct usb_quirk_entry usb_quirks
USB_QUIRK(MGE, UPS2, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(APPLE, IPHONE, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(APPLE, IPHONE_3G, 0x0000, 0xffff, UQ_HID_IGNORE),
+ USB_QUIRK(MEGATEC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE),
/* Devices which should be ignored by both ukbd and uhid */
USB_QUIRK(CYPRESS, WISPY1A, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE),
USB_QUIRK(METAGEEK, WISPY1B, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE),
Modified: stable/8/sys/dev/usb/serial/u3g.c
==============================================================================
--- stable/8/sys/dev/usb/serial/u3g.c Sun Nov 28 06:43:39 2010 (r215979)
+++ stable/8/sys/dev/usb/serial/u3g.c Sun Nov 28 07:03:21 2010 (r215980)
@@ -285,11 +285,12 @@ static const struct usb_device_id u3g_de
U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI),
U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI),
U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI),
- U3G_DEV(HUAWEI, K3765_INIT, U3GINIT_HUAWEISCSI),
+ U3G_DEV(HUAWEI, K3765, U3GINIT_HUAWEI),
U3G_DEV(KYOCERA2, CDMA_MSM_K, 0),
U3G_DEV(KYOCERA2, KPC680, 0),
U3G_DEV(LONGCHEER, WM66, U3GINIT_HUAWEI),
U3G_DEV(MERLIN, V620, 0),
+ U3G_DEV(NEOTEL, PRIME, 0),
U3G_DEV(NOVATEL, E725, 0),
U3G_DEV(NOVATEL, ES620, 0),
U3G_DEV(NOVATEL, ES620_2, 0),
Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs Sun Nov 28 06:43:39 2010 (r215979)
+++ stable/8/sys/dev/usb/usbdevs Sun Nov 28 07:03:21 2010 (r215980)
@@ -2526,7 +2526,7 @@ product PHILIPS RT2870 0x200f RT2870
product PHILIPSSEMI HUB1122 0x1122 HUB
/* Megatec */
-product MEGATEC UPS 0x5161 Protocol based UPS
+product MEGATEC UPS 0x5161 Phoenixtec protocol based UPS
/* P.I. Engineering products */
product PIENGINEERING PS2USB 0x020b PS2 to Mac USB Adapter
Modified: stable/8/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_rum.c Sun Nov 28 06:43:39 2010 (r215979)
+++ stable/8/sys/dev/usb/wlan/if_rum.c Sun Nov 28 07:03:21 2010 (r215980)
@@ -118,6 +118,8 @@ static const struct usb_device_id rum_de
RUM_DEV(HUAWEI3COM, WUB320G),
RUM_DEV(MELCO, G54HP),
RUM_DEV(MELCO, SG54HP),
+ RUM_DEV(MELCO, WLRUCG),
+ RUM_DEV(MELCO, WLRUCGAOSS),
RUM_DEV(MSI, RT2573_1),
RUM_DEV(MSI, RT2573_2),
RUM_DEV(MSI, RT2573_3),
Modified: stable/8/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_upgt.c Sun Nov 28 06:43:39 2010 (r215979)
+++ stable/8/sys/dev/usb/wlan/if_upgt.c Sun Nov 28 07:03:21 2010 (r215980)
@@ -182,6 +182,7 @@ static const struct usb_device_id upgt_d
UPGT_DEV(FSC, E5400),
UPGT_DEV(GLOBESPAN, PRISM_GT_1),
UPGT_DEV(GLOBESPAN, PRISM_GT_2),
+ UPGT_DEV(NETGEAR, WG111V2_2),
UPGT_DEV(INTERSIL, PRISM_GT),
UPGT_DEV(SMC, 2862WG),
UPGT_DEV(USR, USR5422),
More information about the svn-src-stable
mailing list