MFp4 //depot/projects/usb@158015
Add support for the Sael M460 3G modem. Submitted by: Hans Petter Selasky
This commit is contained in:
Andrew Thompson
parent
6c9cef576c
commit
750a268260
@ -28,9 +28,6 @@
|
||||
* We should consider adding a simple r/w device which allows
|
||||
* attaching of PPP in a more efficient way.
|
||||
*
|
||||
* NOTE:
|
||||
*
|
||||
* - The device ID's are stored in "core/usb2_msctest.c"
|
||||
*/
|
||||
|
||||
#include "usbdevs.h"
|
||||
@ -57,9 +54,9 @@
|
||||
#if USB_DEBUG
|
||||
static int u3g_debug = 0;
|
||||
|
||||
SYSCTL_NODE(_hw_usb2, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB u3g");
|
||||
SYSCTL_NODE(_hw_usb2, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g");
|
||||
SYSCTL_INT(_hw_usb2_u3g, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&u3g_debug, 0, "u3g debug level");
|
||||
&u3g_debug, 0, "Debug level");
|
||||
#endif
|
||||
|
||||
#define U3G_MAXPORTS 4
|
||||
@ -75,15 +72,11 @@ SYSCTL_INT(_hw_usb2_u3g, OID_AUTO, debug, CTLFLAG_RW,
|
||||
#define U3GSP_HSPA 6
|
||||
#define U3GSP_MAX 7
|
||||
|
||||
#define U3GFL_NONE 0x00 /* No flags */
|
||||
#define U3GFL_HUAWEI_INIT 0x01 /* Init command required */
|
||||
#define U3GFL_SCSI_EJECT 0x02 /* SCSI eject command required */
|
||||
#define U3GFL_SIERRA_INIT 0x04 /* Init command required */
|
||||
|
||||
struct u3g_speeds_s {
|
||||
uint32_t ispeed;
|
||||
uint32_t ospeed;
|
||||
};
|
||||
#define U3GFL_NONE 0x0000 /* No flags */
|
||||
#define U3GFL_HUAWEI_INIT 0x0001 /* Init command required */
|
||||
#define U3GFL_SCSI_EJECT 0x0002 /* SCSI eject command required */
|
||||
#define U3GFL_SIERRA_INIT 0x0004 /* Init command required */
|
||||
#define U3GFL_SAEL_M460_INIT 0x0008 /* Init device */
|
||||
|
||||
enum {
|
||||
U3G_BULK_WR,
|
||||
@ -145,18 +138,6 @@ static const struct usb2_com_callback u3g_callback = {
|
||||
.usb2_com_stop_write = &u3g_stop_write,
|
||||
};
|
||||
|
||||
#if 0
|
||||
static const struct u3g_speeds_s u3g_speeds[U3GSP_MAX] = {
|
||||
[U3GSP_GPRS] = {64000, 64000},
|
||||
[U3GSP_EDGE] = {384000, 64000},
|
||||
[U3GSP_CDMA] = {384000, 64000},
|
||||
[U3GSP_UMTS] = {384000, 64000},
|
||||
[U3GSP_HSDPA] = {1200000, 384000},
|
||||
[U3GSP_HSUPA] = {1200000, 384000},
|
||||
[U3GSP_HSPA] = {7200000, 384000},
|
||||
};
|
||||
#endif
|
||||
|
||||
static device_method_t u3g_methods[] = {
|
||||
DEVMETHOD(device_probe, u3g_probe),
|
||||
DEVMETHOD(device_attach, u3g_attach),
|
||||
@ -176,78 +157,71 @@ DRIVER_MODULE(u3g, ushub, u3g_driver, u3g_devclass, u3g_driver_loaded, 0);
|
||||
MODULE_DEPEND(u3g, ucom, 1, 1, 1);
|
||||
MODULE_DEPEND(u3g, usb, 1, 1, 1);
|
||||
|
||||
/* Huawei specific defines */
|
||||
|
||||
#define U3GINFO(flag,speed) ((flag)|((speed) * 256))
|
||||
#define U3G_GET_SPEED(uaa) (USB_GET_DRIVER_INFO(uaa) / 256)
|
||||
|
||||
/*
|
||||
* NOTE: The entries marked with XXX should be checked for the correct
|
||||
* speed indication to set the buffer sizes.
|
||||
*/
|
||||
static const struct usb2_device_id u3g_devs[] = {
|
||||
/* OEM: Option */
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3G, U3GINFO(U3GSP_UMTS, U3GFL_NONE))},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD, U3GINFO(U3GSP_UMTS, U3GFL_NONE))},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GPLUS, U3GINFO(U3GSP_UMTS, U3GFL_NONE))},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G, U3GINFO(U3GSP_UMTS, U3GFL_NONE))},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3G, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GPLUS, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAXHSUPA, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G, U3GFL_NONE)},
|
||||
/* OEM: Qualcomm, Inc. */
|
||||
{USB_VPI(USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM, U3GFL_SCSI_EJECT)},
|
||||
/* OEM: Huawei */
|
||||
{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, U3GINFO(U3GSP_HSDPA, U3GFL_HUAWEI_INIT))},
|
||||
{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220, U3GINFO(U3GSP_HSPA, U3GFL_HUAWEI_INIT))},
|
||||
{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE, U3GFL_HUAWEI_INIT)},
|
||||
{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220, U3GFL_HUAWEI_INIT)},
|
||||
/* OEM: Novatel */
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM, U3GINFO(U3GSP_CDMA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MC950D, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U727, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V620, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720, U3GINFO(U3GSP_UMTS, U3GFL_SCSI_EJECT))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_X950D, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ZEROCD, U3GINFO(U3GSP_HSUPA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_DELL, USB_PRODUCT_DELL_U740, U3GINFO(U3GSP_HSDPA, U3GFL_SCSI_EJECT))},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MC950D, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U727, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V620, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_X950D, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ZEROCD, U3GFL_SCSI_EJECT)},
|
||||
{USB_VPI(USB_VENDOR_DELL, USB_PRODUCT_DELL_U740, U3GFL_SCSI_EJECT)},
|
||||
/* OEM: Merlin */
|
||||
{USB_VPI(USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_MERLIN, USB_PRODUCT_MERLIN_V620, U3GFL_NONE)},
|
||||
/* OEM: Sierra Wireless: */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875U, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GINFO(U3GSP_HSDPA, U3GFL_NONE))},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781, U3GINFO(U3GSP_UMTS, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GINFO(U3GSP_HSPA, U3GFL_NONE))}, /* XXX */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD580, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD595, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC595U, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC597E, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_C597, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880E, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC880U, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881E, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC881U, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720_2, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5725, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MINI5725, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_2, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8755_3, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8765, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AC875U, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775_2, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8780, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8781, U3GFL_NONE)},
|
||||
{USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HS2300, U3GFL_NONE)},
|
||||
/* Sierra TruInstaller device ID */
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_TRUINSTALL, U3GINFO(U3GSP_UMTS, U3GFL_SIERRA_INIT))},
|
||||
{USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_TRUINSTALL, U3GFL_SIERRA_INIT)},
|
||||
/* PRUEBA SILABS */
|
||||
{USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SAEL, U3GFL_SAEL_M460_INIT)},
|
||||
};
|
||||
|
||||
static void
|
||||
@ -290,6 +264,82 @@ u3g_huawei_init(struct usb2_device *udev)
|
||||
return;
|
||||
}
|
||||
|
||||
static void
|
||||
u3g_sael_m460_init(struct usb2_device *udev)
|
||||
{
|
||||
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 },
|
||||
{ 0xc1, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 },
|
||||
{ 0x41, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },
|
||||
{ 0xc1, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 },
|
||||
{ 0x41, 0x01, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 },
|
||||
{ 0x41, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },
|
||||
{ 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, 0x01, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 },
|
||||
{ 0x41, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },
|
||||
{ 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, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00 },
|
||||
};
|
||||
|
||||
struct usb2_device_request req;
|
||||
uint16_t len;
|
||||
uint8_t buf[0x300];
|
||||
uint8_t n;
|
||||
|
||||
DPRINTFN(1, "\n");
|
||||
|
||||
if (usb2_req_set_alt_interface_no(udev, NULL, 0, 0)) {
|
||||
DPRINTFN(0, "Alt setting 0 failed\n");
|
||||
return;
|
||||
}
|
||||
|
||||
for (n = 0; n != (sizeof(setup)/sizeof(setup[0])); n++) {
|
||||
|
||||
memcpy(&req, setup[n], sizeof(req));
|
||||
|
||||
len = UGETW(req.wLength);
|
||||
if (req.bmRequestType & UE_DIR_IN) {
|
||||
if (len > sizeof(buf)) {
|
||||
DPRINTFN(0, "too small buffer\n");
|
||||
continue;
|
||||
}
|
||||
if (usb2_do_request(udev, NULL, &req, buf)) {
|
||||
DPRINTFN(0, "request %u failed\n",
|
||||
(unsigned int)n);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (len > (sizeof(setup[0]) - 8)) {
|
||||
DPRINTFN(0, "too small buffer\n");
|
||||
continue;
|
||||
}
|
||||
if (usb2_do_request(udev, NULL, &req,
|
||||
__DECONST(uint8_t *, &setup[n][8]))) {
|
||||
DPRINTFN(0, "request %u failed\n",
|
||||
(unsigned int)n);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
static int
|
||||
u3g_lookup_huawei(struct usb2_attach_arg *uaa)
|
||||
{
|
||||
@ -386,6 +436,7 @@ u3g_attach(device_t dev)
|
||||
struct u3g_softc *sc = device_get_softc(dev);
|
||||
struct usb2_interface *iface;
|
||||
struct usb2_interface_descriptor *id;
|
||||
uint32_t flags;
|
||||
uint8_t m;
|
||||
uint8_t n;
|
||||
uint8_t i;
|
||||
@ -394,6 +445,11 @@ u3g_attach(device_t dev)
|
||||
|
||||
DPRINTF("sc=%p\n", sc);
|
||||
|
||||
flags = USB_GET_DRIVER_INFO(uaa);
|
||||
|
||||
if (flags & U3GFL_SAEL_M460_INIT)
|
||||
u3g_sael_m460_init(uaa->device);
|
||||
|
||||
/* copy in USB config */
|
||||
for (n = 0; n != U3G_N_TRANSFER; n++)
|
||||
u3g_config_tmp[n] = u3g_config[n];
|
||||
|
||||
@ -2192,6 +2192,7 @@ product SILICOM GPE 0x0002 Psion Gold Port Ethernet
|
||||
|
||||
/* SI Labs */
|
||||
product SILABS POLOLU 0x803b Pololu Serial
|
||||
product SILABS SAEL 0x8053 SA-EL USB
|
||||
product SILABS ARGUSISP 0x8066 Argussoft ISP
|
||||
product SILABS CRUMB128 0x807a Crumb128 board
|
||||
product SILABS DEGREE 0x80ca Degree Controls Inc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user