Author: hselasky
Date: Sat Dec  3 14:02:25 2011
New Revision: 228224
URL: http://svn.freebsd.org/changeset/base/228224

Log:
  MFC r227610 and r227781:
  Add new USB IDs.
  
  PR:           usb/162712

Modified:
  stable/8/sys/dev/usb/quirk/usb_quirk.c
  stable/8/sys/dev/usb/usbdevs
  stable/8/sys/dev/usb/wlan/if_run.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      Sat Dec  3 13:54:54 2011        
(r228223)
+++ stable/8/sys/dev/usb/quirk/usb_quirk.c      Sat Dec  3 14:02:25 2011        
(r228224)
@@ -148,10 +148,6 @@ static struct usb_quirk_entry usb_quirks
            UQ_MSC_FORCE_PROTO_SCSI),
        USB_QUIRK(AIPTEK, POCKETCAM3M, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
            UQ_MSC_FORCE_PROTO_SCSI),
-       USB_QUIRK(ALCOR, SDCR_6335, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY,
-           UQ_MSC_NO_SYNC_CACHE),
-       USB_QUIRK(ALCOR, SDCR_6362, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY,
-           UQ_MSC_NO_SYNC_CACHE),
        USB_QUIRK(ALCOR, UMCR_9361, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
            UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN),
        USB_QUIRK(ALCOR, TRANSCEND, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN,
@@ -462,6 +458,7 @@ static struct usb_quirk_entry usb_quirks
         * Quirks for manufacturers which USB devices does not respond
         * after issuing non-supported commands:
         */
+       USB_QUIRK(ALCOR, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, 
UQ_MSC_NO_TEST_UNIT_READY, UQ_MATCH_VENDOR_ONLY),
        USB_QUIRK(FEIYA, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, 
UQ_MATCH_VENDOR_ONLY),
        USB_QUIRK(REALTEK, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, 
UQ_MATCH_VENDOR_ONLY),
        USB_QUIRK(INITIO, DUMMY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE, 
UQ_MATCH_VENDOR_ONLY),

Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs        Sat Dec  3 13:54:54 2011        
(r228223)
+++ stable/8/sys/dev/usb/usbdevs        Sat Dec  3 14:02:25 2011        
(r228224)
@@ -913,8 +913,10 @@ product ALCATEL OT535              0x02df  One Touch 
 /* Alcor Micro, Inc. products */
 product ALCOR2 KBD_HUB         0x2802  Kbd Hub
 
+product ALCOR DUMMY            0x0000  Dummy product
 product ALCOR SDCR_6335                0x6335  SD/MMC Card Reader
 product ALCOR SDCR_6362                0x6362  SD/MMC Card Reader
+product ALCOR SDCR_6366                0x6366  SD/MMC Card Reader
 product ALCOR TRANSCEND                0x6387  Transcend JetFlash Drive
 product ALCOR MA_KBD_HUB       0x9213  MacAlly Kbd Hub
 product ALCOR AU9814           0x9215  AU9814 Hub
@@ -2082,6 +2084,7 @@ product LINKSYS4 RT3070           0x0078  RT3070
 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
@@ -2177,6 +2180,7 @@ product MELCO RT2870_1            0x0148  RT2870
 product MELCO RT2870_2         0x0150  RT2870
 product MELCO WLIUCGN          0x015d  WLI-UC-GN
 product MELCO WLIUCG301N       0x016f  WLI-UC-G301N
+product MELCO WLIUCGNM         0x01a2  WLI-UC-GNM
 
 /* Merlin products */
 product MERLIN V620             0x1110  Merlin V620

Modified: stable/8/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_run.c  Sat Dec  3 13:54:54 2011        
(r228223)
+++ stable/8/sys/dev/usb/wlan/if_run.c  Sat Dec  3 14:02:25 2011        
(r228224)
@@ -208,12 +208,14 @@ static const STRUCT_USB_HOST_ID run_devs
     RUN_DEV(LOGITEC,           RT2870_1),
     RUN_DEV(LOGITEC,           RT2870_2),
     RUN_DEV(LOGITEC,           RT2870_3),
+    RUN_DEV(LOGITECH,          LANW300NU2),
     RUN_DEV(MELCO,             RT2870_1),
     RUN_DEV(MELCO,             RT2870_2),
     RUN_DEV(MELCO,             WLIUCAG300N),
     RUN_DEV(MELCO,             WLIUCG300N),
     RUN_DEV(MELCO,             WLIUCG301N),
     RUN_DEV(MELCO,             WLIUCGN),
+    RUN_DEV(MELCO,             WLIUCGNM),
     RUN_DEV(MOTOROLA4,         RT2770),
     RUN_DEV(MOTOROLA4,         RT3070),
     RUN_DEV(MSI,               RT3070_1),
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to