Attachment #175295 for bug #213110

View | Details | Raw Unified | Return to bug 213110
Collapse All | Expand All




	U3G_DEV(SIERRA, MC5728, 0),
	U3G_DEV(SIERRA, MC7354, 0),
	U3G_DEV(SIERRA, MC7355, 0),
	U3G_DEV(SIERRA, MC7430, 0),
	U3G_DEV(SIERRA, MC8700, 0),
	U3G_DEV(SIERRA, MC8755, 0),
	U3G_DEV(SIERRA, MC8755_2, 0),

	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,
	       0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
	       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
	     { 0xc1, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02 },

	     { 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,
	       0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
	       0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 },
	     { 0x41, 0x12, 0x03, 0x00, 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,
	       0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
	       0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 },
	     { 0x41, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },
	};

				DPRINTFN(0, "too small buffer\n");
				continue;
			}
			err = usbd_do_request(udev, NULL, &req,
			    __DECONST(uint8_t *, &setup[n][8]));
		}
		if (err) {

	}

	/* copy in USB config */
	for (n = 0; n != U3G_N_TRANSFER; n++)
		u3g_config_tmp[n] = u3g_config[n];

	device_set_usb_desc(dev);

Lines 4101-4106 product SIERRA E6893 0x6893 E6893 Link Here

(-)sys/dev/usb/usbdevs (+1 lines)
4101	product SIERRA MC8700 0x68A3 MC8700	4101	product SIERRA MC8700 0x68A3 MC8700
4102	product SIERRA MC7354 0x68C0 MC7354	4102	product SIERRA MC7354 0x68C0 MC7354
4103	product SIERRA MC7355 0x9041 MC7355	4103	product SIERRA MC7355 0x9041 MC7355
		4104	product SIERRA MC7430 0x9071 Sierra Wireless MC7430 Qualcomm Snapdragon X7 LTE-A
4104	product SIERRA AC313U 0x68aa Sierra Wireless AirCard 313U	4105	product SIERRA AC313U 0x68aa Sierra Wireless AirCard 313U
4105	product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer	4106	product SIERRA TRUINSTALL 0x0fff Aircard Tru Installer
4106		4107

Return to bug 213110

Lines 522-527 static const STRUCT_USB_HOST_ID u3g_devs[] = { Link Here

(-)sys/dev/usb/serial/u3g.c (-5 / +6 lines)
522	U3G_DEV(SIERRA, MC5728, 0),	522	U3G_DEV(SIERRA, MC5728, 0),
523	U3G_DEV(SIERRA, MC7354, 0),	523	U3G_DEV(SIERRA, MC7354, 0),
524	U3G_DEV(SIERRA, MC7355, 0),	524	U3G_DEV(SIERRA, MC7355, 0),
		525	U3G_DEV(SIERRA, MC7430, 0),
525	U3G_DEV(SIERRA, MC8700, 0),	526	U3G_DEV(SIERRA, MC8700, 0),
526	U3G_DEV(SIERRA, MC8755, 0),	527	U3G_DEV(SIERRA, MC8755, 0),
527	U3G_DEV(SIERRA, MC8755_2, 0),	528	U3G_DEV(SIERRA, MC8755_2, 0),
Lines 631-637 u3g_sael_m460_init(struct usb_device *udev) Link Here
631	static const uint8_t setup[][24] = {	632	static const uint8_t setup[][24] = {
632	{ 0x41, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },	633	{ 0x41, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
633	{ 0x41, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },	634	{ 0x41, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 },
634	{ 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,	635	{ 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
635	0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,	636	0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
636	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },	637	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
637	{ 0xc1, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02 },	638	{ 0xc1, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x40, 0x02 },
Lines 643-649 u3g_sael_m460_init(struct usb_device *udev) Link Here
643	{ 0x41, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 },	644	{ 0x41, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00 },
644	{ 0x41, 0x19, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,	645	{ 0x41, 0x19, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
645	0x00, 0x00, 0x00, 0x00, 0x11, 0x13 },	646	0x00, 0x00, 0x00, 0x00, 0x11, 0x13 },
646	{ 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,	647	{ 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
647	0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,	648	0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
648	0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 },	649	0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 },
649	{ 0x41, 0x12, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00 },	650	{ 0x41, 0x12, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00 },
Lines 653-659 u3g_sael_m460_init(struct usb_device *udev) Link Here
653	{ 0x41, 0x19, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,	654	{ 0x41, 0x19, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
654	0x00, 0x00, 0x00, 0x00, 0x11, 0x13 },	655	0x00, 0x00, 0x00, 0x00, 0x11, 0x13 },
655	{ 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,	656	{ 0x41, 0x13, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
656	0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,	657	0x09, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
657	0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 },	658	0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00 },
658	{ 0x41, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },	659	{ 0x41, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },
659	};	660	};
Lines 687-693 u3g_sael_m460_init(struct usb_device *udev) Link Here
687	DPRINTFN(0, "too small buffer\n");	688	DPRINTFN(0, "too small buffer\n");
688	continue;	689	continue;
689	}	690	}
690	err = usbd_do_request(udev, NULL, &req,	691	err = usbd_do_request(udev, NULL, &req,
691	__DECONST(uint8_t *, &setup[n][8]));	692	__DECONST(uint8_t *, &setup[n][8]));
692	}	693	}
693	if (err) {	694	if (err) {
Lines 863-869 u3g_attach(device_t dev) Link Here
863	}	864	}
864		865
865	/* copy in USB config */	866	/* copy in USB config */
866	for (n = 0; n != U3G_N_TRANSFER; n++)	867	for (n = 0; n != U3G_N_TRANSFER; n++)
867	u3g_config_tmp[n] = u3g_config[n];	868	u3g_config_tmp[n] = u3g_config[n];
868		869
869	device_set_usb_desc(dev);	870	device_set_usb_desc(dev);