From owner-p4-projects@FreeBSD.ORG  Mon Jul  3 23:02:17 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3E3516A4E5; Mon,  3 Jul 2006 23:02:17 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A070616A4DE
	for <perforce@freebsd.org>; Mon,  3 Jul 2006 23:02:17 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 597B843D60
	for <perforce@freebsd.org>; Mon,  3 Jul 2006 23:02:17 +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 k63N2Hcu049930
	for <perforce@freebsd.org>; Mon, 3 Jul 2006 23:02:17 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63N2Hpd049927
	for perforce@freebsd.org; Mon, 3 Jul 2006 23:02:17 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 3 Jul 2006 23:02:17 GMT
Message-Id: <200607032302.k63N2Hpd049927@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100529 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2006 23:02:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=100529

Change 100529 by imp@imp_lighthouse on 2006/07/03 23:01:39

	Mark flags as volatile
	better interface.  need more info to start than is available in the
	start bus interface command...

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#15 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#15 (text+ko) ====

@@ -52,7 +52,7 @@
 	struct resource *irq_res;	/* IRQ resource */
 	struct resource	*mem_res;	/* Memory resource */
 	struct mtx sc_mtx;		/* basically a perimeter lock */
-	int flags;
+	volatile int flags;
 #define RXRDY		4
 #define TXRDY		0x10
 	uint32_t cwgr;
@@ -268,8 +268,6 @@
 
 	sc = device_get_softc(dev);
 	WR4(sc, TWI_MMR, TWI_MMR_DADR(slave));
-	WR4(sc, TWI_CR, TWI_CR_START);
-	sc->sc_started = 1;
 	return (0);
 }
 
@@ -283,7 +281,6 @@
 
 	sc = device_get_softc(dev);
 	WR4(sc, TWI_MMR, TWI_MMR_DADR(slave));
-	WR4(sc, TWI_CR, TWI_CR_START);
 	sc->sc_started = 1;
 	return (0);
 }
@@ -297,8 +294,10 @@
 
 	walker = buf;
 	sc = device_get_softc(dev);
+	AT91_TWI_LOCK(sc);
 	WR4(sc, TWI_MMR, TWI_MMR_MWRITE | RD4(sc, TWI_MMR));
-	AT91_TWI_LOCK(sc);
+	WR4(sc, TWI_CR, TWI_CR_START);
+	sc->sc_started = 1;
 	WR4(sc, TWI_IER, TWI_SR_TXRDY);
 	while (len--) {
 		WR4(sc, TWI_THR, *walker++);
@@ -327,6 +326,8 @@
 	sc = device_get_softc(dev);
 	AT91_TWI_LOCK(sc);
 	WR4(sc, TWI_MMR, ~TWI_MMR_MWRITE & RD4(sc, TWI_MMR));
+	WR4(sc, TWI_CR, TWI_CR_START);
+	sc->sc_started = 1;
 	WR4(sc, TWI_IER, TWI_SR_RXRDY);
 	while (len-- > 0) {
 		err = 0;