svn commit: r263166 - in stable/9/sys/dev/usb: . misc net quirk serial

Hans Petter Selasky hselasky at FreeBSD.org
Fri Mar 14 10:18:55 UTC 2014


Author: hselasky
Date: Fri Mar 14 10:18:53 2014
New Revision: 263166
URL: http://svnweb.freebsd.org/changeset/base/263166

Log:
  MFC r227751, r238766, r241553, r242748, r244047, r245947, r246021, r247255,
      r249039, r249204, r250848, r251351, r252295, r252498, r255123, r255238,
      r256782, r257132, r257390 and r259675:
  - Add various new USB ID's and quirks.
  - Make sure the usbdevs mergeinfo gets recorded on the sys directory.

Modified:
  stable/9/sys/dev/usb/misc/udbp.c
  stable/9/sys/dev/usb/net/if_axe.c
  stable/9/sys/dev/usb/quirk/usb_quirk.c
  stable/9/sys/dev/usb/serial/u3g.c
  stable/9/sys/dev/usb/serial/uftdi.c
  stable/9/sys/dev/usb/serial/uslcom.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/usb/usbdevs   (props changed)

Modified: stable/9/sys/dev/usb/misc/udbp.c
==============================================================================
--- stable/9/sys/dev/usb/misc/udbp.c	Fri Mar 14 09:46:56 2014	(r263165)
+++ stable/9/sys/dev/usb/misc/udbp.c	Fri Mar 14 10:18:53 2014	(r263166)
@@ -290,6 +290,7 @@ udbp_modload(module_t mod, int event, vo
 
 static const STRUCT_USB_HOST_ID udbp_devs[] = {
 	{USB_VPI(USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT, 0)},
+	{USB_VPI(USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_GADGETZERO, 0)},
 	{USB_VPI(USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2301, 0)},
 	{USB_VPI(USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2302, 0)},
 	{USB_VPI(USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZLINK, 0)},

Modified: stable/9/sys/dev/usb/net/if_axe.c
==============================================================================
--- stable/9/sys/dev/usb/net/if_axe.c	Fri Mar 14 09:46:56 2014	(r263165)
+++ stable/9/sys/dev/usb/net/if_axe.c	Fri Mar 14 10:18:53 2014	(r263166)
@@ -159,6 +159,7 @@ static const STRUCT_USB_HOST_ID axe_devs
 	AXE_DEV(COREGA, FETHER_USB2_TX, 0),
 	AXE_DEV(DLINK, DUBE100, 0),
 	AXE_DEV(DLINK, DUBE100B1, AXE_FLAG_772),
+	AXE_DEV(DLINK, DUBE100C1, AXE_FLAG_772B),
 	AXE_DEV(GOODWAY, GWUSB2E, 0),
 	AXE_DEV(IODATA, ETGUS2, AXE_FLAG_178),
 	AXE_DEV(JVC, MP_PRX1, 0),

Modified: stable/9/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- stable/9/sys/dev/usb/quirk/usb_quirk.c	Fri Mar 14 09:46:56 2014	(r263165)
+++ stable/9/sys/dev/usb/quirk/usb_quirk.c	Fri Mar 14 10:18:53 2014	(r263166)
@@ -113,6 +113,7 @@ static struct usb_quirk_entry usb_quirks
 	USB_QUIRK(ITUNERNET, USBLCD2X20, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(ITUNERNET, USBLCD4X20, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(LIEBERT, POWERSURE_PXT, 0x0000, 0xffff, UQ_HID_IGNORE),
+	USB_QUIRK(LIEBERT2, PSI1000, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(MGE, UPS1, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(MGE, UPS2, 0x0000, 0xffff, UQ_HID_IGNORE),
 	USB_QUIRK(APPLE, IPHONE, 0x0000, 0xffff, UQ_HID_IGNORE),
@@ -334,6 +335,9 @@ static struct usb_quirk_entry usb_quirks
 	USB_QUIRK(SANDISK, SDDR12, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_CBI,
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_READ_CAP_OFFBY1,
 	    UQ_MSC_NO_GETMAXLUN),
+	USB_QUIRK(SANDISK, SDCZ2_128, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
+	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_IGNORE_RESIDUE,
+	    UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(SANDISK, SDCZ2_256, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_IGNORE_RESIDUE),
 	USB_QUIRK(SANDISK, SDCZ4_128, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
@@ -399,6 +403,8 @@ static struct usb_quirk_entry usb_quirks
 	USB_QUIRK(STMICRO, ST72682, 0x0000, 0xffff, UQ_MSC_NO_PREVENT_ALLOW),
 	USB_QUIRK(SUPERTOP, IDE, 0x0000, 0xffff, UQ_MSC_IGNORE_RESIDUE,
 	    UQ_MSC_NO_SYNC_CACHE),
+	USB_QUIRK(SUPERTOP, FLASHDRIVE, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY,
+	    UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(TAUGA, CAMERAMATE, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI),
 	USB_QUIRK(TEAC, FD05PUB, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_CBI,
 	    UQ_MSC_FORCE_PROTO_UFI),
@@ -428,6 +434,7 @@ static struct usb_quirk_entry usb_quirks
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY_EVPD,
 	    UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(WESTERN, MYPASSWORD, 0x0000, 0xffff, UQ_MSC_FORCE_SHORT_INQ),
+	USB_QUIRK(WESTERN, MYPASSPORT, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
 	USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
 	    UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY),
 	USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,

Modified: stable/9/sys/dev/usb/serial/u3g.c
==============================================================================
--- stable/9/sys/dev/usb/serial/u3g.c	Fri Mar 14 09:46:56 2014	(r263165)
+++ stable/9/sys/dev/usb/serial/u3g.c	Fri Mar 14 10:18:53 2014	(r263166)
@@ -388,6 +388,7 @@ static const STRUCT_USB_HOST_ID u3g_devs
 	U3G_DEV(OPTION, GTMAXHSUPA, 0),
 	U3G_DEV(OPTION, GTMAXHSUPAE, 0),
 	U3G_DEV(OPTION, VODAFONEMC3G, 0),
+	U3G_DEV(OPTION, GTM661W, 0),
 	U3G_DEV(QISDA, H20_1, 0),
 	U3G_DEV(QISDA, H20_2, 0),
 	U3G_DEV(QISDA, H21_1, 0),
@@ -559,6 +560,7 @@ static const STRUCT_USB_HOST_ID u3g_devs
 	U3G_DEV(TOSHIBA, G450, 0),
 	U3G_DEV(TOSHIBA, HSDPA, 0),
 	U3G_DEV(YISO, C893, 0),
+	U3G_DEV(WETELECOM, WM_D200, 0),
 	/* Autoinstallers */
 	U3G_DEV(NOVATEL, ZEROCD, U3GINIT_SCSIEJECT),
 	U3G_DEV(OPTION, GTICON322, U3GINIT_REZERO),

Modified: stable/9/sys/dev/usb/serial/uftdi.c
==============================================================================
--- stable/9/sys/dev/usb/serial/uftdi.c	Fri Mar 14 09:46:56 2014	(r263165)
+++ stable/9/sys/dev/usb/serial/uftdi.c	Fri Mar 14 10:18:53 2014	(r263166)
@@ -243,6 +243,7 @@ static const STRUCT_USB_HOST_ID uftdi_de
 	UFTDI_DEV(FALCOM, TWIST, UFTDI_TYPE_8U232AM),
 	UFTDI_DEV(FIC, NEO1973_DEBUG, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG),
 	UFTDI_DEV(FIC, NEO1973_DEBUG, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG),
+	UFTDI_DEV(FTDI, 232EX, UFTDI_TYPE_AUTO),
 	UFTDI_DEV(FTDI, 232H, UFTDI_TYPE_AUTO),
 	UFTDI_DEV(FTDI, 232RL, UFTDI_TYPE_AUTO),
 	UFTDI_DEV(FTDI, 4N_GALAXY_DE_1, UFTDI_TYPE_AUTO),
@@ -384,6 +385,7 @@ static const STRUCT_USB_HOST_ID uftdi_de
 	UFTDI_DEV(FTDI, LK204, UFTDI_TYPE_8U232AM),
 	UFTDI_DEV(FTDI, LM3S_DEVEL_BOARD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG),
 	UFTDI_DEV(FTDI, LM3S_EVAL_BOARD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG),
+	UFTDI_DEV(FTDI, LM3S_ICDI_B_BOARD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG),
 	UFTDI_DEV(FTDI, MASTERDEVEL2, UFTDI_TYPE_AUTO),
 	UFTDI_DEV(FTDI, MAXSTREAM, UFTDI_TYPE_8U232AM),
 	UFTDI_DEV(FTDI, MHAM_DB9, UFTDI_TYPE_AUTO),

Modified: stable/9/sys/dev/usb/serial/uslcom.c
==============================================================================
--- stable/9/sys/dev/usb/serial/uslcom.c	Fri Mar 14 09:46:56 2014	(r263165)
+++ stable/9/sys/dev/usb/serial/uslcom.c	Fri Mar 14 10:18:53 2014	(r263166)
@@ -242,15 +242,37 @@ static const STRUCT_USB_HOST_ID uslcom_d
     USLCOM_DEV(JABLOTRON, PC60B),
     USLCOM_DEV(KAMSTRUP, OPTICALEYE),
     USLCOM_DEV(KAMSTRUP, MBUS_250D),
+    USLCOM_DEV(LAKESHORE, 121),
+    USLCOM_DEV(LAKESHORE, 218A),
+    USLCOM_DEV(LAKESHORE, 219),
+    USLCOM_DEV(LAKESHORE, 233),
+    USLCOM_DEV(LAKESHORE, 235),
+    USLCOM_DEV(LAKESHORE, 335),
+    USLCOM_DEV(LAKESHORE, 336),
+    USLCOM_DEV(LAKESHORE, 350),
+    USLCOM_DEV(LAKESHORE, 371),
+    USLCOM_DEV(LAKESHORE, 411),
+    USLCOM_DEV(LAKESHORE, 425),
+    USLCOM_DEV(LAKESHORE, 455A),
+    USLCOM_DEV(LAKESHORE, 465),
+    USLCOM_DEV(LAKESHORE, 475A),
+    USLCOM_DEV(LAKESHORE, 625A),
+    USLCOM_DEV(LAKESHORE, 642A),
+    USLCOM_DEV(LAKESHORE, 648),
+    USLCOM_DEV(LAKESHORE, 737),
+    USLCOM_DEV(LAKESHORE, 776),
     USLCOM_DEV(LINKINSTRUMENTS, MSO19),
     USLCOM_DEV(LINKINSTRUMENTS, MSO28),
     USLCOM_DEV(LINKINSTRUMENTS, MSO28_2),
     USLCOM_DEV(MEI, CASHFLOW_SC),
     USLCOM_DEV(MEI, S2000),
+    USLCOM_DEV(NETGEAR, M4100),
     USLCOM_DEV(OWEN, AC4),
+    USLCOM_DEV(OWL, CM_160),
     USLCOM_DEV(PHILIPS, ACE1001),
     USLCOM_DEV(PLX, CA42),
     USLCOM_DEV(RENESAS, RX610),
+    USLCOM_DEV(SEL, C662),
     USLCOM_DEV(SILABS, AC_SERV_CAN),
     USLCOM_DEV(SILABS, AC_SERV_CIS),
     USLCOM_DEV(SILABS, AC_SERV_IBUS),
@@ -283,6 +305,7 @@ static const STRUCT_USB_HOST_ID uslcom_d
     USLCOM_DEV(SILABS, HELICOM),
     USLCOM_DEV(SILABS, IMS_USB_RS422),
     USLCOM_DEV(SILABS, INFINITY_MIC),
+    USLCOM_DEV(SILABS, INGENI_ZIGBEE),
     USLCOM_DEV(SILABS, INSYS_MODEM),
     USLCOM_DEV(SILABS, IRZ_SG10),
     USLCOM_DEV(SILABS, KYOCERA_GPS),
@@ -290,6 +313,7 @@ static const STRUCT_USB_HOST_ID uslcom_d
     USLCOM_DEV(SILABS, LIPOWSKY_JTAG),
     USLCOM_DEV(SILABS, LIPOWSKY_LIN),
     USLCOM_DEV(SILABS, MC35PU),
+    USLCOM_DEV(SILABS, MMB_ZIGBEE),
     USLCOM_DEV(SILABS, MJS_TOSLINK),
     USLCOM_DEV(SILABS, MSD_DASHHAWK),
     USLCOM_DEV(SILABS, MULTIPLEX_RC),
@@ -306,6 +330,7 @@ static const STRUCT_USB_HOST_ID uslcom_d
     USLCOM_DEV(SILABS, USBPULSE100),
     USLCOM_DEV(SILABS, USBSCOPE50),
     USLCOM_DEV(SILABS, USBWAVE12),
+    USLCOM_DEV(SILABS, V_PREON32),
     USLCOM_DEV(SILABS, VSTABI),
     USLCOM_DEV(SILABS, WAVIT),
     USLCOM_DEV(SILABS, WMRBATT),
@@ -320,6 +345,7 @@ static const STRUCT_USB_HOST_ID uslcom_d
     USLCOM_DEV(VAISALA, CABLE),
     USLCOM_DEV(WAGO, SERVICECABLE),
     USLCOM_DEV(WAVESENSE, JAZZ),
+    USLCOM_DEV(WESTMOUNTAIN, RIGBLASTER_ADVANTAGE),
     USLCOM_DEV(WIENERPLEINBAUS, PL512),
     USLCOM_DEV(WIENERPLEINBAUS, RCM),
     USLCOM_DEV(WIENERPLEINBAUS, MPOD),


More information about the svn-src-stable-9 mailing list