From owner-svn-src-stable@FreeBSD.ORG Thu Aug 13 10:27:23 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 731F51065673; Thu, 13 Aug 2009 10:27:23 +0000 (UTC) (envelope-from n_hibma@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 47FC88FC48; Thu, 13 Aug 2009 10:27:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7DARNRO097750; Thu, 13 Aug 2009 10:27:23 GMT (envelope-from n_hibma@svn.freebsd.org) Received: (from n_hibma@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7DARNFs097748; Thu, 13 Aug 2009 10:27:23 GMT (envelope-from n_hibma@svn.freebsd.org) Message-Id: <200908131027.n7DARNFs097748@svn.freebsd.org> From: Nick Hibma Date: Thu, 13 Aug 2009 10:27:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196177 - stable/7/sys/dev/firewire X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Aug 2009 10:27:24 -0000 Author: n_hibma Date: Thu Aug 13 10:27:22 2009 New Revision: 196177 URL: http://svn.freebsd.org/changeset/base/196177 Log: Revert he previous commit as requested by Sean Bruno. 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 10:26:34 2009 (r196176) +++ stable/7/sys/dev/firewire/fwohci.c Thu Aug 13 10:27:22 2009 (r196177) @@ -616,9 +616,10 @@ 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 %d (reg=0x%08x)\n", - mver, reg); + device_printf(dev, "invalid OHCI version\n"); return (ENXIO); } @@ -631,15 +632,10 @@ 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, "OHCI version %x.%x (ROM=%d), %d isoc. channels\n", - mver, reg & 0xff, (reg>>24) & 1, - sc->fc.nisodma); + device_printf(dev, "No. of Isochronous channels is %d.\n", i); + if (i == 0) + return (ENXIO); sc->fc.arq = &sc->arrq.xferq; sc->fc.ars = &sc->arrs.xferq; @@ -1852,8 +1848,7 @@ fwohci_intr_core(struct fwohci_softc *sc /* Disable bus reset interrupt until sid recv. */ OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_PHY_BUS_R); - if (bootverbose) - device_printf(fc->dev, "BUS reset\n"); + device_printf(fc->dev, "BUS reset\n"); OWRITE(sc, FWOHCI_INTMASKCLR, OHCI_INT_CYC_LOST); OWRITE(sc, OHCI_LNKCTLCLR, OHCI_CNTL_CYCSRC); @@ -2469,8 +2464,7 @@ fwohci_ibr(struct firewire_comm *fc) struct fwohci_softc *sc; uint32_t fun; - if (bootverbose) - device_printf(fc->dev, "Initiate bus reset\n"); + device_printf(fc->dev, "Initiate bus reset\n"); sc = (struct fwohci_softc *)fc; /*