From nobody@FreeBSD.org  Tue Jun  1 00:04:37 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 699CD16A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 Jun 2004 00:04:37 -0700 (PDT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4CC7243D2F
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 Jun 2004 00:04:37 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.11/8.12.11) with ESMTP id i5174Vqa086036
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 1 Jun 2004 00:04:31 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.11/8.12.11/Submit) id i5174V7g086035;
	Tue, 1 Jun 2004 00:04:31 -0700 (PDT)
	(envelope-from nobody)
Message-Id: <200406010704.i5174V7g086035@www.freebsd.org>
Date: Tue, 1 Jun 2004 00:04:31 -0700 (PDT)
From: Remington <MrL0L@charter.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [Patch] CrystalFonts USB LCD add
X-Send-Pr-Version: www-2.3

>Number:         67438
>Category:       kern
>Synopsis:       [Patch] CrystalFonts USB LCD add
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 01 00:10:10 PDT 2004
>Closed-Date:    Sat Jun 05 14:25:26 PDT 2004
>Last-Modified:  Sat Jun 05 14:25:26 PDT 2004
>Originator:     Remington
>Release:        FreeBSD
>Organization:
>Environment:
FreeBSD bart 5.2.1-RELEASE-p6 FreeBSD 5.2.1-RELEASE-p6 #1: Sat May 15 18:22:11 PDT 2004     root@bart:/usr/obj/usr/src/sys/BART  i386

>Description:
I have made some changes to 5.2.1 to support CrystalFontz USB LCD displays. I have personally tested 634, rumor has 631-633 are tested and working. If anything else is needed gimme a buzz. All diffs must be applied in /usr/src/sys/dev/usb
>How-To-Repeat:
*** uftdi.c     Sun Aug 24 10:55:55 2003
--- uftdi.c.new Mon May 31 23:38:34 2004
***************
*** 152,158 ****

        if (uaa->vendor == USB_VENDOR_FTDI &&
            (uaa->product == USB_PRODUCT_FTDI_SERIAL_8U100AX ||
!            uaa->product == USB_PRODUCT_FTDI_SERIAL_8U232AM))
                return (UMATCH_VENDOR_PRODUCT);

        return (UMATCH_NONE);
--- 152,162 ----

        if (uaa->vendor == USB_VENDOR_FTDI &&
            (uaa->product == USB_PRODUCT_FTDI_SERIAL_8U100AX ||
!            uaa->product == USB_PRODUCT_FTDI_SERIAL_8U232AM ||
!          uua->product == USB_PRODUCT_FTDI_CFA_631 ||
!          uaa->product == USB_PRODUCT_FTDI_CFA_632 ||
!          uaa->product == USB_PRODUCT_FTDI_CFA_633 ||
!          uaa->product == USB_PRODUCT_FTDI_CFA_634))
                return (UMATCH_VENDOR_PRODUCT);

        return (UMATCH_NONE);
***************
*** 208,213 ****
--- 212,233 ----
                sc->sc_type = UFTDI_TYPE_8U232AM;
                sc->sc_hdrlen = 0;
                break;
+     case USB_PRODUCT_FTDI_CFA_631:
+         sc->sc_type = UFTDI_TYPE_8U232AM;
+         sc->sc_hdrlen = 0;
+         break;
+     case USB_PRODUCT_FTDI_CFA_632:
+         sc->sc_type = UFTDI_TYPE_8U232AM;
+         sc->sc_hdrlen = 0;
+         break;
+     case USB_PRODUCT_FTDI_CFA_633:
+         sc->sc_type = UFTDI_TYPE_8U232AM;
+         sc->sc_hdrlen = 0;
+         break;
+     case USB_PRODUCT_FTDI_CFA_634:
+         sc->sc_type = UFTDI_TYPE_8U232AM;
+         sc->sc_hdrlen = 0;
+         break;

        default:                /* Can't happen */
                goto bad;

*** usbdevs.h   Sun Nov 16 04:07:01 2003
--- usbdevs.h.new       Mon May 31 22:50:53 2004
***************
*** 555,560 ****
--- 555,566 ----
  /* Creative products */
  #define       USB_PRODUCT_CREATIVE_NOMAD_II   0x1002          /* Nomad II MP3 player */

+ /* CrystalFontz products */
+ #define USB_PRODUCT_FTDI_CFA_631    0xfc0c  /* Crystalfontz CFA-631 USB LCD */
+ #define USB_PRODUCT_FTDI_CFA_632    0xfc0a  /* Crystalfontz CFA-632 USB LCD */
+ #define USB_PRODUCT_FTDI_CFA_633    0xfc0b  /* Crystalfontz CFA-633 USB LCD */
+ #define USB_PRODUCT_FTDI_CFA_634    0xfc09  /* Crystalfontz CFA-634 USB LCD */
+
  /* CTX products */*** usbdevs     Sun Nov 16 04:05:11 2003
--- usbdevs.new Mon May 31 23:00:33 2004
***************
*** 557,562 ****
--- 557,567 ----
  product CYPRESS FMRADIO               0x1002  FM Radio
  product CYPRESS SLIM_HUB      0x6560  Slim Hub

+ /* Crystalfontz products */
+ product FTDI CFA_632  0xfc08  Crystalfontz CFA-632 USB LCD
+ product FTDI CFA_633  0xfc0b  Crystalfontz CFA-633 USB LCD
+ product FTDI CFA_634  0xfc09  Crystalfontz CFA-634 USB LCD
+
  /* Daisy Technology products */
  product DAISY DMC             0x6901  USB MultiMedia Reader


  #define       USB_PRODUCT_CTX_EX1300  0x9999          /* Ex1300 hub */

*** usbdevs     Sun Nov 16 04:05:11 2003
--- usbdevs.new Mon May 31 23:00:33 2004
***************
*** 557,562 ****
--- 557,567 ----
  product CYPRESS FMRADIO               0x1002  FM Radio
  product CYPRESS SLIM_HUB      0x6560  Slim Hub

+ /* Crystalfontz products */
+ product FTDI CFA_632  0xfc08  Crystalfontz CFA-632 USB LCD
+ product FTDI CFA_633  0xfc0b  Crystalfontz CFA-633 USB LCD
+ product FTDI CFA_634  0xfc09  Crystalfontz CFA-634 USB LCD
+
  /* Daisy Technology products */
  product DAISY DMC             0x6901  USB MultiMedia Reader

*** usbdevs_data.h      Sun Nov 16 04:07:01 2003
--- usbdevs_data.h.new  Mon May 31 23:44:53 2004
***************
*** 999,1004 ****
--- 999,1022 ----
            "Extended Systems",
            "XTNDAccess IrDA",
        },
+     {
+         USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_632,
+         0,
+         "Future Technology Devices",
+         "Crystalfontz CFA-632 USB LCD",
+     },
+     {
+          USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_633,
+          0,
+          "Future Technology Devices",
+          "Crystalfontz CFA-633 USB LCD",
+     },
+     {
+          USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_634,
+          0,
+          "Future Technology Devices",
+          "Crystalfontz CFA-634 USB LCD",
+      },
        {
            USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
            0,

>Fix:

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: sanpei 
State-Changed-When: Sat Jun 5 14:23:18 PDT 2004 
State-Changed-Why:  
Already committed these devices in uftdi.c. 
And we do not commit these device information, 
because 5.2 / 5.2.1 supported security fix branch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67438 
>Unformatted:
