diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 2009-08-13 08:24:58 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 2009-08-13 08:24:58 +0000 |
| commit | 55c28995f62c7e4aa428e537893b087b3806b547 (patch) | |
| tree | 8faa7cbd390cccff2142fa335313662469496906 /sys/dev/firewire | |
| parent | 70cf4efa6ba639e67e9a2a81b40481012d42fbd7 (diff) | |
Notes
Diffstat (limited to 'sys/dev/firewire')
| -rw-r--r-- | sys/dev/firewire/fwohci.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c index c74d8d84b4935..c41a96e085407 100644 --- a/sys/dev/firewire/fwohci.c +++ b/sys/dev/firewire/fwohci.c @@ -616,10 +616,9 @@ fwohci_init(struct fwohci_softc *sc, device_t 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, device_t 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, uint32_t stat, int count) /* 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; /* |