svn commit: r196177 - stable/7/sys/dev/firewire

[Nick Hibma]

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;
 
 	/*