From owner-p4-projects@FreeBSD.ORG Tue Dec 5 16:46:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2143116A4FB; Tue, 5 Dec 2006 16:46:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DBCCC16A4D1 for ; Tue, 5 Dec 2006 16:46:54 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3DE343C9D for ; Tue, 5 Dec 2006 16:46:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB5Gks1B014700 for ; Tue, 5 Dec 2006 16:46:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB5GksZe014697 for perforce@freebsd.org; Tue, 5 Dec 2006 16:46:54 GMT (envelope-from imp@freebsd.org) Date: Tue, 5 Dec 2006 16:46:54 GMT Message-Id: <200612051646.kB5GksZe014697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 111148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2006 16:46:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=111148 Change 111148 by imp@imp_lighthouse on 2006/12/05 16:46:25 unbreak icee and remove debugs. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#35 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#35 (text+ko) ==== @@ -232,8 +232,6 @@ err = EBUSY; else if (sr & TWI_SR_NACK) err = EADDRNOTAVAIL; - if (sr & ~bit) - printf("status is %x\n", sr); return (err); } @@ -271,7 +269,6 @@ WR4(sc, TWI_CR, TWI_CR_SWRST); WR4(sc, TWI_CR, TWI_CR_MSEN | TWI_CR_SVDIS); WR4(sc, TWI_CWGR, sc->cwgr); - printf("setting cwgr to %#x\n", sc->cwgr); return 0; } @@ -336,20 +333,16 @@ WR4(sc, TWI_THR, *buf++); if (len == 0) WR4(sc, TWI_CR, TWI_CR_STOP); - if ((err = at91_twi_wait(sc, TWI_SR_TXRDY))) { - printf("Len %d\n", len); + if ((err = at91_twi_wait(sc, TWI_SR_TXRDY))) goto out; - } } } if ((err = at91_twi_wait(sc, TWI_SR_TXCOMP))) break; } out:; - if (err) { + if (err) WR4(sc, TWI_CR, TWI_CR_STOP); - printf("Err is %d\n", err); - } AT91_TWI_UNLOCK(sc); return (err); }