From owner-cvs-all@FreeBSD.ORG Sun May 4 11:14:29 2003 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5012D37B407 for ; Sun, 4 May 2003 11:14:29 -0700 (PDT) Received: from rootlabs.com (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id C725943FA3 for ; Sun, 4 May 2003 11:14:27 -0700 (PDT) (envelope-from nate@rootlabs.com) Received: (qmail 2801 invoked by uid 1000); 4 May 2003 18:14:26 -0000 Date: Sun, 4 May 2003 11:14:26 -0700 (PDT) From: Nate Lawson To: Warner Losh In-Reply-To: <20030504124946.AACAC37B42C@hub.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/dev/pccbb pccbb.c pccbbdevid.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2003 18:14:29 -0000 On Sun, 4 May 2003, Warner Losh wrote: > FreeBSD src repository > > Modified files: > sys/dev/pccbb pccbb.c pccbbdevid.h > Log: > fix typo in TI1515 ID. > > Revision Changes Path > 1.70 +8 -0 src/sys/dev/pccbb/pccbb.c > 1.12 +1 -1 src/sys/dev/pccbb/pccbbdevid.h That part (the .h) seems correct but it looks like a bunch of debugging printfs leaked in via pccbb.c (below). I usually avoid wildcard commits to keep this from happening. -Nate > --- src/sys/dev/pccbb/pccbb.c:1.69 Mon Apr 28 22:59:04 2003 > +++ src/sys/dev/pccbb/pccbb.c Sun May 4 05:49:37 2003 > @@ -26,7 +26,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: /repoman/r/ncvs/src/sys/dev/pccbb/pccbb.c,v 1.69 2003/04/29 05:59:04 imp Exp $ > + * $FreeBSD: /repoman/r/ncvs/src/sys/dev/pccbb/pccbb.c,v 1.70 2003/05/04 12:49:37 imp Exp $ > */ > > /* > @@ -976,10 +976,14 @@ > /* > * This ISR needs work XXX > */ > +printf("Cbb 1\n"); > sockevent = cbb_get(sc, CBB_SOCKET_EVENT); > +printf("Cbb 2\n"); > if (sockevent) { > +printf("Cbb 3\n"); > /* ack the interrupt */ > cbb_setb(sc, CBB_SOCKET_EVENT, sockevent); > +printf("Cbb 4\n"); > > /* > * If anything has happened to the socket, we assume that > @@ -995,11 +999,13 @@ > * excellent results. > */ > if (sockevent & CBB_SOCKET_EVENT_CD) { > +printf("Cbb 5\n"); > mtx_lock(&sc->mtx); > sc->flags &= ~CBB_CARD_OK; > cv_signal(&sc->cv); > mtx_unlock(&sc->mtx); > } > +printf("Cbb 6\n"); > if (sockevent & CBB_SOCKET_EVENT_CSTS) { > DPRINTF((" cstsevent occured: 0x%08x\n", > cbb_get(sc, CBB_SOCKET_STATE))); > @@ -1011,7 +1017,9 @@ > /* Other bits? */ > } > if (sc->flags & CBB_CARD_OK) { > +printf("Cbb 7\n"); > STAILQ_FOREACH(ih, &sc->intr_handlers, entries) { > +printf("Cbb 8\n"); > (*ih->intr)(ih->arg); > } > }