usb/143186: add USB device IDs for Google Nexus One and for RealTek Card Reader

[J.R. Oldroyd]

>Number:         143186
>Category:       usb
>Synopsis:       add USB device IDs for Google Nexus One and for RealTek Card Reader
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-usb
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 24 21:30:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     J.R. Oldroyd
>Release:        FreeBSD 8.0-RELEASE-p1 amd64
>Organization:
>Environment:
System: FreeBSD xx.opal.com 8.0-RELEASE-p1 FreeBSD 8.0-RELEASE-p1 #3: Sun Jan 24 12:28:02 EST 2010 xx at xx.opal.com:/usr/src/sys/amd64/compile/XX amd64
>Description:
Adds USB device IDs for Google Nexus One and for RealTek Card Reader

Note:  The initial USB probe will fail (NOT READY) when attaching an
Android device.  This is because attaching an Android device does not
automatically make the SD card available to the computer.  The SD card
must be unmounted from the phone in order to make it available to the
computer - an operation that requires manual intervention on the phone
(you must "mount" the card).

Once that is done, the phone's SD card can be mounted using a mount
command.  HAL, however, does not see the device once it is available,
so HAL does not auto-mount it.  I've not found a quirk or other
work-around for this.  Feel free to add one if you know of something.

Note: The RealTek Card Reader has nothing to do with the Nexus One.
I'm just adding its ID at the same time.  It is a PCCARD/ExpressCard
reader on my laptop.

>How-To-Repeat:
n/a
>Fix:
--- dev/usb/storage/umass.c.orig	2009-10-24 21:10:29.000000000 -0400
+++ dev/usb/storage/umass.c	2010-01-24 15:29:29.000000000 -0500
@@ -497,6 +497,10 @@
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 		WRONG_CSWSIG
 	},
+	{USB_VENDOR_GOOGLE, USB_PRODUCT_GOOGLE_NEXUSONE, RID_WILDCARD,
+		UMASS_PROTO_DEFAULT,
+		NO_QUIRKS
+	},
 	{USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FG, RID_WILDCARD,
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 		NO_QUIRKS
@@ -741,6 +745,10 @@
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 		IGNORE_RESIDUE | NO_START_STOP
 	},
+	{USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_USB20CRW, RID_WILDCARD,
+		UMASS_PROTO_DEFAULT,
+		NO_QUIRKS
+	},
 	{USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_YP_U2, RID_WILDCARD,
 		UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 		SHUTTLE_INIT | NO_GETMAXLUN
--- dev/usb/usbdevs.orig	2009-10-24 21:10:29.000000000 -0400
+++ dev/usb/usbdevs	2010-01-24 15:27:55.000000000 -0500
@@ -621,6 +621,7 @@
 vendor SENAO		0x1740	Senao
 vendor METAGEEK		0x1781	MetaGeek
 vendor AMIT		0x18c5	AMIT
+vendor GOOGLE		0x18d1	Google
 vendor QCOM		0x18e8	Qcom
 vendor LINKSYS3		0x1915	Linksys
 vendor QUALCOMMINC	0x19d2	Qualcomm, Incorporated
@@ -1383,6 +1384,9 @@
 product GOODWAY GWUSB2E		0x6200	GWUSB2E
 product GOODWAY RT2573		0xc019	RT2573
 
+/* Google products */
+product	GOOGLE NEXUSONE		0x4e11	Nexus One
+
 /* Gravis products */
 product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
 
@@ -2078,6 +2082,7 @@
 product RALINK RT2573_2		0x9021	RT2501USB Wireless Adapter
 
 /* ReakTek products */
+product REALTEK USB20CRW	0x0158	USB20CRW Card Reader
 /* Green House and CompUSA OEM this part */
 product REALTEK USBKR100	0x8150	USBKR100 USB Ethernet
 product REALTEK RTL8187		0x8187	RTL8187 Wireless Adapter
>Release-Note:
>Audit-Trail:
>Unformatted: