Author: gavin
Date: Tue Jan  4 20:38:52 2011
New Revision: 216976
URL: http://svn.freebsd.org/changeset/base/216976

Log:
  Merge r216045 from head (by hand, due to code changes):
  
    Support the Falcom Twist USB GSM/GPRS modem in uftdi(4)
  
  PR:           usb/151862
  Submitted by: Alessandro de Manzano <demanzano dqmicro.it>

Modified:
  stable/7/sys/dev/usb/uftdi.c
  stable/7/sys/dev/usb/usbdevs
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/usb/uftdi.c
==============================================================================
--- stable/7/sys/dev/usb/uftdi.c        Tue Jan  4 20:26:41 2011        
(r216975)
+++ stable/7/sys/dev/usb/uftdi.c        Tue Jan  4 20:38:52 2011        
(r216976)
@@ -190,6 +190,9 @@ uftdi_match(device_t self)
        if (uaa->vendor == USB_VENDOR_MATRIXORBITAL &&
            (uaa->product == USB_PRODUCT_MATRIXORBITAL_MOUA))
                return (UMATCH_VENDOR_PRODUCT);
+       if (uaa->vendor == USB_VENDOR_FALCOM &&
+           (uaa->product == USB_PRODUCT_FALCOM_TWIST))
+               return (UMATCH_VENDOR_PRODUCT);
 
        return (UMATCH_NONE);
 }

Modified: stable/7/sys/dev/usb/usbdevs
==============================================================================
--- stable/7/sys/dev/usb/usbdevs        Tue Jan  4 20:26:41 2011        
(r216975)
+++ stable/7/sys/dev/usb/usbdevs        Tue Jan  4 20:38:52 2011        
(r216976)
@@ -1280,6 +1280,9 @@ product ETEK 1COM         0x8007  Serial
 /* Extended Systems products */
 product EXTENDED XTNDACCESS    0x0100  XTNDAccess IrDA
 
+/* Falcom products */
+product FALCOM TWIST           0x0001  USB GSM/GPRS modem
+
 /* FEIYA products */
 product FEIYA 5IN1             0x1132  5-in-1 Card Reader
 
_______________________________________________
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