From owner-svn-src-all@FreeBSD.ORG Thu Aug 13 10:18:16 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCBC21065677 for ; Thu, 13 Aug 2009 10:18:16 +0000 (UTC) (envelope-from sean.bruno@dsl-only.net) Received: from iron2.pdx.net (iron2.pdx.net [69.64.224.71]) by mx1.freebsd.org (Postfix) with ESMTP id B73518FC4B for ; Thu, 13 Aug 2009 10:18:16 +0000 (UTC) Received: (qmail 29124 invoked from network); 13 Aug 2009 02:51:35 -0700 Received: from 069-064-235-060.pdx.net (HELO ?192.168.1.200?) (69.64.235.60) by iron2.pdx.net with (DHE-RSA-AES256-SHA encrypted) SMTP; 13 Aug 2009 02:51:35 -0700 From: Sean Bruno To: Nick Hibma In-Reply-To: <200908130824.n7D8OwO9093632@svn.freebsd.org> References: <200908130824.n7D8OwO9093632@svn.freebsd.org> Content-Type: text/plain Date: Thu, 13 Aug 2009 02:51:34 -0700 Message-Id: <1250157094.8589.11.camel@Lappy> Mime-Version: 1.0 X-Mailer: Evolution 2.26.3 (2.26.3-1.fc11) Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r196170 - stable/7/sys/dev/firewire X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2009 10:18:17 -0000 Nick: I like your ideas in this code, but this change removes debugging output from the default output. I'm afraid that it's there for a reason, i.e. please revert this changeset and let's chat about it in IRC or via email to come up with something that makes sense. :) Sean On Thu, 2009-08-13 at 08:24 +0000, Nick Hibma wrote: > Author: n_hibma > Date: Thu Aug 13 08:24:58 2009 > New Revision: 196170 > URL: http://svn.freebsd.org/changeset/base/196170 > > Log: > Compact some output. Move some behind bootverbose. > > Modified: > stable/7/sys/dev/firewire/fwohci.c > > Modified: stable/7/sys/dev/firewire/fwohci.c > ============================================================================== > --- stable/7/sys/dev/firewire/fwohci.c Thu Aug 13 08:20:12 2009 (r196169) > +++ stable/7/sys/dev/firewire/fwohci.c Thu Aug 13 08:24:58 2009 (r196170) > @@ -616,10 +616,9 @@ fwohci_init(struct fwohci_softc *sc, dev > /* OHCI version */ > reg = OREAD(sc, OHCI_VERSION); > mver = (reg >> 16) & 0xff; > - device_printf(dev, "OHCI version %x.%x (ROM=%d)\n", > - mver, reg & 0xff, (reg>>24) & 1); > if (mver < 1 || mver > 9) { > - device_printf(dev, "invalid OHCI version\n"); > + device_printf(dev, "invalid OHCI version %d (reg=0x%08x)\n", > + mver, reg); > return (ENXIO); > } > > @@ -632,10 +631,15 @@ fwohci_init(struct fwohci_softc *sc, dev > for (i = 0; i < 0x20; i++) > if ((reg & (1 << i)) == 0) > break; > + if (i == 0) { > + device_printf(dev, "0 isoc. channels"); > + return ENXIO; > + } > sc->fc.nisodma = i; > - device_printf(dev, "No. of Isochronous channels is %d.\n", i); > - if (i == 0) > - return (ENXIO); > + > + device_printf(dev, "OHCI version %x.%x (ROM=%d), %d isoc. channels\n", > + mver, reg & 0xff, (reg>>24) & 1, > + sc->fc.nisodma); > > sc->fc.arq = &sc->arrq.xferq; > sc->fc.ars = &sc->arrs.xferq; > @@ -1848,7 +1852,8 @@ fwohci_intr_core(struct fwohci_softc *sc > /* Disable bus reset interrupt until sid recv. */ > OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_PHY_BUS_R); > > - device_printf(fc->dev, "BUS reset\n"); > + if (bootverbose) > + device_printf(fc->dev, "BUS reset\n"); > OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_CYC_LOST); > OWRITE(sc, OHCI_LNKCTLCLR, OHCI_CNTL_CYCSRC); > > @@ -2464,7 +2469,8 @@ fwohci_ibr(struct firewire_comm *fc) > struct fwohci_softc *sc; > uint32_t fun; > > - device_printf(fc->dev, "Initiate bus reset\n"); > + if (bootverbose) > + device_printf(fc->dev, "Initiate bus reset\n"); > sc = (struct fwohci_softc *)fc; > > /*