Date: Tue, 14 Oct 2008 07:45:11 +0000 (UTC) From: Nick Hibma <n_hibma@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r183868 - head/sys/dev/usb Message-ID: <200810140745.m9E7jBai099067@svn.freebsd.org>
index | next in thread | raw e-mail
Author: n_hibma Date: Tue Oct 14 07:45:11 2008 New Revision: 183868 URL: http://svn.freebsd.org/changeset/base/183868 Log: - Fix the naming of the MC950D device. - Remove the (unimplemented) U3GFL_EJECT quirk as this won't be implemented in the u3g driver anyway (most probably as an entry in devd.conf) Modified: head/sys/dev/usb/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/u3g.c ============================================================================== --- head/sys/dev/usb/u3g.c Tue Oct 14 07:24:18 2008 (r183867) +++ head/sys/dev/usb/u3g.c Tue Oct 14 07:45:11 2008 (r183868) @@ -90,7 +90,6 @@ struct u3g_dev_type_s { u_int16_t u3g_flags; #define U3GFL_NONE 0x0000 #define U3GFL_HUAWEI_INIT 0x0001 /* Send USB command to reset iface to ucom mode */ -#define U3GFL_EJECT 0x0002 /* Send SCSI eject to reset first iface to ucom mode */ }; static const struct u3g_dev_type_s u3g_devs[] = { @@ -108,17 +107,17 @@ static const struct u3g_dev_type_s u3g_d /* OEM: Novatel */ {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620 }, U3GFL_NONE }, + {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MC950D }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U727 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U740_2 }, U3GFL_NONE }, - {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U950D }, U3GFL_EJECT }, + {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V620 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V640 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V720 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_V740 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_X950D }, U3GFL_NONE }, - {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U870 }, U3GFL_NONE }, {{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870 }, U3GFL_NONE }, {{ USB_VENDOR_DELL, USB_PRODUCT_DELL_U740 }, U3GFL_NONE }, }; Modified: head/sys/dev/usb/usbdevs ============================================================================== --- head/sys/dev/usb/usbdevs Tue Oct 14 07:24:18 2008 (r183867) +++ head/sys/dev/usb/usbdevs Tue Oct 14 07:45:11 2008 (r183868) @@ -1839,7 +1839,7 @@ product NOVATEL X950D 0x1450 Merlin X95 product NOVATEL ES620 0x2100 ES620 CDMA product NOVATEL U720 0x2110 Merlin U720 product NOVATEL U727 0x4100 Merlin U727 CDMA -product NOVATEL U950D 0x4400 Novatel MC950D HSUPA +product NOVATEL MC950D 0x4400 Novatel MC950D HSUPA product NOVATEL ZEROCD 0x5010 Novatel ZeroCD product NOVATEL2 FLEXPACKGPS 0x0100 NovAtel FlexPack GPS receiverhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810140745.m9E7jBai099067>