svn commit: r306958 - in stable/9/sys/dev/usb: . serial

[Hans Petter Selasky]

Author: hselasky
Date: Mon Oct 10 11:48:23 2016
New Revision: 306958
URL: https://svnweb.freebsd.org/changeset/base/306958

Log:
  MFC r306478:
  Add new USB ID.
  
  While at it remove some whitespaces.
  
  Submitted by:	Jose Luis Duran <jlduran at gmail.com>
  PR:		213110

Modified:
  stable/9/sys/dev/usb/serial/u3g.c
  stable/9/sys/dev/usb/usbdevs
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/usb/serial/u3g.c
==============================================================================
--- stable/9/sys/dev/usb/serial/u3g.c	Mon Oct 10 11:47:29 2016	(r306957)
+++ stable/9/sys/dev/usb/serial/u3g.c	Mon Oct 10 11:48:23 2016	(r306958)
@@ -523,6 +523,7 @@ static const STRUCT_USB_HOST_ID u3g_devs
 	U3G_DEV(SIERRA, MC5727, 0),
 	U3G_DEV(SIERRA, MC5727_2, 0),
 	U3G_DEV(SIERRA, MC5728, 0),
+	U3G_DEV(SIERRA, MC7430, 0),
 	U3G_DEV(SIERRA, MC8700, 0),
 	U3G_DEV(SIERRA, MC8755, 0),
 	U3G_DEV(SIERRA, MC8755_2, 0),
@@ -626,7 +627,7 @@ u3g_sael_m460_init(struct usb_device *ud
 	static const uint8_t setup[][24] = {
 	     { 0x41, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
 	     { 0x41, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
-	     { 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 
+	     { 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
 	       0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
 	       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
 	     { 0xc1, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02 },
@@ -638,7 +639,7 @@ u3g_sael_m460_init(struct usb_device *ud
 	     { 0x41, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 },
 	     { 0x41, 0x19, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
 	       0x00, 0x00, 0x00, 0x00, 0x11, 0x13 },
-	     { 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 
+	     { 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
 	       0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
 	       0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 },
 	     { 0x41, 0x12, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00 },
@@ -648,7 +649,7 @@ u3g_sael_m460_init(struct usb_device *ud
 	     { 0x41, 0x19, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
 	       0x00, 0x00, 0x00, 0x00, 0x11, 0x13 },
 	     { 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
-	       0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
+	       0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
 	       0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 },
 	     { 0x41, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },
 	};
@@ -682,7 +683,7 @@ u3g_sael_m460_init(struct usb_device *ud
 				DPRINTFN(0, "too small buffer\n");
 				continue;
 			}
-			err = usbd_do_request(udev, NULL, &req, 
+			err = usbd_do_request(udev, NULL, &req,
 			    __DECONST(uint8_t *, &setup[n][8]));
 		}
 		if (err) {
@@ -857,7 +858,7 @@ u3g_attach(device_t dev)
 	}
 
 	/* copy in USB config */
-	for (n = 0; n != U3G_N_TRANSFER; n++) 
+	for (n = 0; n != U3G_N_TRANSFER; n++)
 		u3g_config_tmp[n] = u3g_config[n];
 
 	device_set_usb_desc(dev);

Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs	Mon Oct 10 11:47:29 2016	(r306957)
+++ stable/9/sys/dev/usb/usbdevs	Mon Oct 10 11:48:23 2016	(r306958)
@@ -4078,6 +4078,7 @@ product SIERRA E6893		0x6893	E6893
 product SIERRA MC8700		0x68A3	MC8700
 product SIERRA MC7354		0x68C0	MC7354
 product SIERRA MC7355		0x9041	MC7355
+product SIERRA MC7430		0x9071	Sierra Wireless MC7430 Qualcomm Snapdragon X7 LTE-A
 product SIERRA AC313U		0x68aa	Sierra Wireless AirCard 313U
 product SIERRA TRUINSTALL	0x0fff	Aircard Tru Installer