PERFORCE change 155748 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Wed Jan 7 10:09:47 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=155748
Change 155748 by hselasky at hselasky_laptop001 on 2009/01/07 10:09:35
Umass module quirk from Alexander Best
to support Meizu Electronics MiniPlayer.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#35 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 edit
.. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 edit
.. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/usbdevs#35 (text+ko) ====
@@ -151,6 +151,7 @@
vendor KYOCERA 0x0482 Kyocera Wireless Corp.
vendor STMICRO 0x0483 STMicroelectronics
vendor FOXCONN 0x0489 Foxconn
+vendor MEIZU 0x0492 Meizu Electronics
vendor YAMAHA 0x0499 YAMAHA
vendor COMPAQ 0x049f Compaq
vendor HITACHI 0x04a4 Hitachi
@@ -1657,6 +1658,9 @@
product MCT USB232 0x0210 USB-232 Interface
product MCT SITECOM_USB232 0x0230 Sitecom USB-232 Products
+/* Meizu Electronics */
+product MEIZU M6_SL 0x0140 MiniPlayer M6 (SL)
+
/* Melco, Inc products */
product MELCO LUATX1 0x0001 LUA-TX Ethernet
product MELCO LUATX5 0x0005 LUA-TX Ethernet
==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#21 (text+ko) ====
@@ -4,7 +4,7 @@
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.390 2008/12/23 13:09:17 remko Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.391 2008/12/31 14:25:14 luigi Exp
*/
/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
@@ -158,6 +158,7 @@
#define USB_VENDOR_KYOCERA 0x0482 /* Kyocera Wireless Corp. */
#define USB_VENDOR_STMICRO 0x0483 /* STMicroelectronics */
#define USB_VENDOR_FOXCONN 0x0489 /* Foxconn */
+#define USB_VENDOR_MEIZU 0x0492 /* Meizu Electronics */
#define USB_VENDOR_YAMAHA 0x0499 /* YAMAHA */
#define USB_VENDOR_COMPAQ 0x049f /* Compaq */
#define USB_VENDOR_HITACHI 0x04a4 /* Hitachi */
@@ -1247,12 +1248,18 @@
#define USB_PRODUCT_EPSON_CX5400 0x0808 /* CX5400 scanner */
#define USB_PRODUCT_EPSON_3500 0x080e /* CX-3500/3600/3650 MFP */
#define USB_PRODUCT_EPSON_RX425 0x080f /* Stylus Photo RX425 scanner */
-#define USB_PRODUCT_EPSON_4800 0x0819 /* CX4800 MP scanner */
-#define USB_PRODUCT_EPSON_4200 0x0820 /* CX4200 MP scanner */
-#define USB_PRODUCT_EPSON_5000 0x082b /* DX-50x0 MFP scanner */
-#define USB_PRODUCT_EPSON_6000 0x082e /* DX-60x0 MFP scanner */
-#define USB_PRODUCT_EPSON_DX7400 0x0838 /* DX7400/CX7300 scanner */
-#define USB_PRODUCT_EPSON_DX8400 0x0839 /* DX8400 scanner */
+#define USB_PRODUCT_EPSON_DX3800 0x0818 /* CX3700/CX3800/DX38x0 MFP scanner */
+#define USB_PRODUCT_EPSON_4800 0x0819 /* CX4700/CX4800/DX48x0 MFP scanner */
+#define USB_PRODUCT_EPSON_4200 0x0820 /* CX4100/CX4200/DX4200 MFP scanner */
+#define USB_PRODUCT_EPSON_5000 0x082b /* CX4900/CX5000/DX50x0 MFP scanner */
+#define USB_PRODUCT_EPSON_6000 0x082e /* CX5900/CX6000/DX60x0 MFP scanner */
+#define USB_PRODUCT_EPSON_DX4000 0x082f /* DX4000 MFP scanner */
+#define USB_PRODUCT_EPSON_DX7400 0x0838 /* CX7300/CX7400/DX7400 MFP scanner */
+#define USB_PRODUCT_EPSON_DX8400 0x0839 /* CX8300/CX8400/DX8400 MFP scanner */
+#define USB_PRODUCT_EPSON_SX100 0x0841 /* SX100/NX100 MFP scanner */
+#define USB_PRODUCT_EPSON_NX300 0x0848 /* NX300 MFP scanner */
+#define USB_PRODUCT_EPSON_SX200 0x0849 /* SX200/SX205 MFP scanner */
+#define USB_PRODUCT_EPSON_SX400 0x084a /* SX400/NX400/TX400 MFP scanner */
/* e-TEK Labs products */
#define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial */
@@ -1658,6 +1665,9 @@
#define USB_PRODUCT_MCT_USB232 0x0210 /* USB-232 Interface */
#define USB_PRODUCT_MCT_SITECOM_USB232 0x0230 /* Sitecom USB-232 Products */
+/* Meizu Electronics */
+#define USB_PRODUCT_MEIZU_M6_SL 0x0140 /* MiniPlayer M6 (SL) */
+
/* Melco, Inc products */
#define USB_PRODUCT_MELCO_LUATX1 0x0001 /* LUA-TX Ethernet */
#define USB_PRODUCT_MELCO_LUATX5 0x0005 /* LUA-TX Ethernet */
==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#21 (text+ko) ====
@@ -4,7 +4,7 @@
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.390 2008/12/23 13:09:17 remko Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.391 2008/12/31 14:25:14 luigi Exp
*/
/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
@@ -2357,40 +2357,76 @@
"Stylus Photo RX425 scanner",
},
{
+ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX3800,
+ 0,
+ "Seiko Epson",
+ "CX3700/CX3800/DX38x0 MFP scanner",
+ },
+ {
USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4800,
0,
"Seiko Epson",
- "CX4800 MP scanner",
+ "CX4700/CX4800/DX48x0 MFP scanner",
},
{
USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200,
0,
"Seiko Epson",
- "CX4200 MP scanner",
+ "CX4100/CX4200/DX4200 MFP scanner",
},
{
USB_VENDOR_EPSON, USB_PRODUCT_EPSON_5000,
0,
"Seiko Epson",
- "DX-50x0 MFP scanner",
+ "CX4900/CX5000/DX50x0 MFP scanner",
},
{
USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000,
0,
"Seiko Epson",
- "DX-60x0 MFP scanner",
+ "CX5900/CX6000/DX60x0 MFP scanner",
+ },
+ {
+ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX4000,
+ 0,
+ "Seiko Epson",
+ "DX4000 MFP scanner",
},
{
USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX7400,
0,
"Seiko Epson",
- "DX7400/CX7300 scanner",
+ "CX7300/CX7400/DX7400 MFP scanner",
},
{
USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX8400,
0,
"Seiko Epson",
- "DX8400 scanner",
+ "CX8300/CX8400/DX8400 MFP scanner",
+ },
+ {
+ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX100,
+ 0,
+ "Seiko Epson",
+ "SX100/NX100 MFP scanner",
+ },
+ {
+ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_NX300,
+ 0,
+ "Seiko Epson",
+ "NX300 MFP scanner",
+ },
+ {
+ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX200,
+ 0,
+ "Seiko Epson",
+ "SX200/SX205 MFP scanner",
+ },
+ {
+ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX400,
+ 0,
+ "Seiko Epson",
+ "SX400/NX400/TX400 MFP scanner",
},
{
USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
@@ -3995,6 +4031,12 @@
"Sitecom USB-232 Products",
},
{
+ USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL,
+ 0,
+ "Meizu Electronics",
+ "MiniPlayer M6 (SL)",
+ },
+ {
USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1,
0,
"Melco",
@@ -7835,6 +7877,12 @@
NULL,
},
{
+ USB_VENDOR_MEIZU, 0,
+ USB_KNOWNDEV_NOPROD,
+ "Meizu Electronics",
+ NULL,
+ },
+ {
USB_VENDOR_YAMAHA, 0,
USB_KNOWNDEV_NOPROD,
"YAMAHA",
==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#20 (text+ko) ====
@@ -916,6 +916,10 @@
UMASS_PROTO_ATAPI | UMASS_PROTO_CBI,
NO_QUIRKS
},
+ {USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL, RID_WILDCARD,
+ UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+ NO_INQUIRY | NO_SYNCHRONIZE_CACHE
+ },
{VID_EOT, PID_EOT, RID_EOT, 0, 0}
};
More information about the p4-projects
mailing list