>Number:         11006
>Category:       kern
>Synopsis:       Add support for the rio 600 to the urio device
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Sep 13 08:52:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Jasper Wallace
>Release:        Recent ish 1.5Alpha2
>Organization:
-- 
http://pointless.net/     : Another Great waste of bandwidth!
http://advogato.com/      : nothing to do with me, but worth a look.
http://www.ivision.co.uk/ : I pretend to work for these people.
2ECA0975     ::     45 52 65 E9 33 C7 72 4B  96 F4 44 2D 79 27 BF 08
>Environment:
	Diamond Rio 600 digital audio player
System: NetBSD jellycat 1.5_ALPHA2 NetBSD 1.5_ALPHA2 (JELLYCAT.pnpbios) #2: Sat Sep 9 19:01:21 BST 2000 root@jellycat:/usr/src/sys/arch/i386/compile/JELLYCAT.pnpbios i386


>Description:
	NetBSD dosn't support the Rio 600 in the urio driver.
>How-To-Repeat:
	Obtain Rio 600. Connect Rio 600 to netbsd machine, observe lack of
	attachment to the urio driver.
>Fix:
	Patch urio driver and usbdevs as below. Userland code to talk to the
Rio 600 can be obtained from http://www.pointless.net/ when i've finished it.
(sometime this week?) (i don't expect the userland code to be imported into
the NetBSD source, i'm mention it here in case someone searches the PR
database for rio 600 support...)


*** urio.c	Fri Jun  2 10:27:00 2000
--- /usr/src/sys/dev/usb/urio.c	Sat Sep  9 19:39:16 2000
***************
*** 136,143 ****
  	if (uaa->iface != NULL)
  		return (UMATCH_NONE);
  
! 	if (uaa->vendor == USB_VENDOR_DIAMOND &&
! 	    uaa->product == USB_PRODUCT_DIAMOND_RIO500USB)
  		return (UMATCH_VENDOR_PRODUCT);
  	else
  		return (UMATCH_NONE);
--- 136,146 ----
  	if (uaa->iface != NULL)
  		return (UMATCH_NONE);
  
! 	if ( ( uaa->vendor == USB_VENDOR_DIAMOND &&
! 	      uaa->product == USB_PRODUCT_DIAMOND_RIO500USB ) ||
! 	      ( uaa->vendor == USB_VENDOR_DIAMOND2 &&
! 	       uaa->product == USB_PRODUCT_DIAMOND2_RIO600USB )
! 	   )
  		return (UMATCH_VENDOR_PRODUCT);
  	else
  		return (UMATCH_NONE);


*** usbdevs	Tue Jul  4 10:35:00 2000
--- /usr/src/sys/dev/usb/usbdevs	Sat Sep  9 18:19:00 2000
***************
*** 62,67 ****
--- 62,68 ----
  vendor TI		0x0451	Texas Instruments
  vendor ANALOGDEVICES	0x0456	Analog Devices, Inc.
  vendor KYE		0x0458	KYE Systems Corp.
+ vendor DIAMOND2		0x045a	Diamond Multimedia
  vendor MICROSOFT	0x045e	Microsoft
  vendor PRIMAX		0x0461	Primax Electronics
  vendor AMP		0x0464	AMP, Inc.
***************
*** 358,363 ****
--- 359,367 ----
  /* Diamond products */
  product DIAMOND RIO500USB	0x0001	Rio 500 USB
  
+ /* Diamond2 products */
+ product DIAMOND2 RIO600USB	0x5001	Rio 600 USB
+ 
  /* Digi International products */
  product DIGI ACCELEPORT2	0x0002	AccelePort USB 2
  product DIGI ACCELEPORT4	0x0004	AccelePort USB 4
***************
*** 380,385 ****
--- 384,390 ----
  product ENTREGA 1S9		0x0093	1S9 serial connector
  product ENTREGA EZUSB		0x8000	EZ-USB
  /*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
+ product ENTREGA 2U4S		0x8004  2U4S serial connector/usb hub
  /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
  
  /* Epson products */
>Release-Note:
>Audit-Trail:
>Unformatted: