From owner-cvs-src@FreeBSD.ORG Tue Dec 20 21:09:02 2005 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D25B16A41F; Tue, 20 Dec 2005 21:09:02 +0000 (GMT) (envelope-from keramida@ceid.upatras.gr) Received: from kane.otenet.gr (kane.otenet.gr [195.170.0.95]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CFB743D67; Tue, 20 Dec 2005 21:09:00 +0000 (GMT) (envelope-from keramida@ceid.upatras.gr) Received: from flame.pc (aris.bedc.ondsl.gr [62.103.39.226]) by kane.otenet.gr (8.13.4/8.13.4/Debian-8) with SMTP id jBKL8va2019616; Tue, 20 Dec 2005 23:08:58 +0200 Received: by flame.pc (Postfix, from userid 1001) id 7F145116B3; Tue, 20 Dec 2005 23:07:54 +0200 (EET) Date: Tue, 20 Dec 2005 23:07:54 +0200 From: Giorgos Keramidas To: Pav Lucistnik Message-ID: <20051220210754.GA52388@flame.pc> References: <200512201621.jBKGLIt2008083@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200512201621.jBKGLIt2008083@repoman.freebsd.org> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/usb umass.c usbdevs X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2005 21:09:02 -0000 On 2005-12-20 16:21, Pav Lucistnik 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); %%%