cvs commit: src/sys/dev/usb umass.c usbdevs

[Giorgos Keramidas]

On 2005-12-20 16:21, Pav Lucistnik <pav at FreeBSD.org> wrote:
> pav         2005-12-20 16:21:18 UTC
>
>   FreeBSD src repository (doc,ports committer)
>
>   Modified files:
>     sys/dev/usb          umass.c usbdevs
>   Log:
>   - Ignore incorrect CSW signatures on my PURE PocketDab 2000 player
>
>   Approved by:    ssouhlal
>   MFC after:      1 week
>
>   Revision  Changes    Path
>   1.126     +11 -3     src/sys/dev/usb/umass.c
>   1.239     +4 -0      src/sys/dev/usb/usbdevs

This doesn't build.

/home/build/src/sys/dev/usb/umass.c: In function `umass_bbb_state':
/home/build/src/sys/dev/usb/umass.c:1629: error: invalid initializer
/home/build/src/sys/dev/usb/umass.c:1630: warning: comparison between pointer and integer
/home/build/src/sys/dev/usb/umass.c:1631: warning: comparison between pointer and integer
*** Error code 1

     %%%
     Index: /usr/src/sys/dev/usb/umass.c
     ===================================================================
     RCS file: /home/ncvs/src/sys/dev/usb/umass.c,v
     retrieving revision 1.125
     retrieving revision 1.126
     diff -u -r1.125 -r1.126
     --- /usr/src/sys/dev/usb/umass.c        19 Dec 2005 03:27:28 -0000      1.125
     +++ /usr/src/sys/dev/usb/umass.c        20 Dec 2005 16:21:17 -0000      1.126
     @@ -1620,9 +1625,12 @@
1625                 DIF(UDMASS_BBB, umass_bbb_dump_csw(sc, &sc->csw));
1626
1627                 /* Translate weird command-status signatures. */
     -               if ((sc->quirks & WRONG_CSWSIG) &&
     -                   UGETDW(sc->csw.dCSWSignature) == CSWSIGNATURE_OLYMPUS_C1)
     -                       USETDW(sc->csw.dCSWSignature, CSWSIGNATURE);
1628 +               if (sc->quirks & WRONG_CSWSIG) {
1629 +                       uDWord dCSWSignature = UGETDW(sc->csw.dCSWSignature);
1630 +                       if (dCSWSignature == CSWSIGNATURE_OLYMPUS_C1 ||
1631 +                           dCSWSignature == CSWSIGNATURE_IMAGINATION_DBX1)
1632 +                               USETDW(sc->csw.dCSWSignature, CSWSIGNATURE);
1633 +               }
1634
1635                 int Residue;
1636                 Residue = UGETDW(sc->csw.dCSWDataResidue);
     %%%