cvs commit: src/sys/dev/pccbb pccbb.c pccbbdevid.h

[Nate Lawson]

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);
>  		}
>  	}