kern/56575: setting in uvisor.c for CLIE_40 is incorrect

[Jan L. Peterson]

>Number:         56575
>Category:       kern
>Synopsis:       setting in uvisor.c for CLIE_40 is incorrect
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 07 14:20:07 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jan L. Peterson
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
Peterson Technologies
>Environment:
System: FreeBSD aurora.peterson.ath.cx 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #4: Sun Sep 7 00:09:12 MDT 2003 root at aurora.peterson.ath.cx:/usr/obj/usr/src/sys/AURORA i386

>Description:
	I've been trying to get my Sony Clie SJ-30 to connect via USB
	to my laptop, but been unsuccessful.  The system would log
	messages like this:

	ucom0: Palm, Inc. Palm Handheld, rev 1.00/1.00, addr 2
	ucom0: init failed, STALLED
	device_probe_and_attach: ucom0 attach returned 6

	I found that my device, which reports it's USB vendor code
	as 0x054c and product code as 0x0066 is actually running
	PalmOS 4.1.  In usbdevs, those vendor and product numbers
	are associated with PalmOS 4.0 on the Clie, not 4.1.

	Looking in uvisor.c reveals that the CLIE_41 device does not
	have the PALM4 flag, while the CLIE_40 device does.  Removing
	the PALM4 flag from the CLIE_40 device line lets my Clie 
	connect and attach as it is supposed to. 

>How-To-Repeat:
	Try to sync a Clie SJ-30 with PalmOS 4.1, notice that the ucom
	device fails to initialize.
>Fix:

	Apply this patch to uvisor.c:

*** uvisor.c    14 Aug 2003 00:22:08 -0000      1.7.2.5
--- uvisor.c    7 Sep 2003 19:46:40 -0000
***************
*** 210,216 ****
        {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M505 }, PALM4 },
        {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M515 }, PALM4 },
        {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M125 }, PALM4 },
!       {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40 }, PALM4 },
        {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41 }, 0 },
  /*    {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_25 }, PALM4 },*/
  };
--- 210,216 ----
        {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M505 }, PALM4 },
        {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M515 }, PALM4 },
        {{ USB_VENDOR_PALM, USB_PRODUCT_PALM_M125 }, PALM4 },
!       {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40 }, 0 },
        {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41 }, 0 },
  /*    {{ USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_25 }, PALM4 },*/
  };

Note that I do not know if any other Sony Clie devices actually running
PalmOS 4.0 require the PALM4 flag.  Making this change works with my Clie.

>Release-Note:
>Audit-Trail:
>Unformatted: