From owner-p4-projects@FreeBSD.ORG  Thu May  4 20:07:27 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 4E3C516A405; Thu,  4 May 2006 20:07:27 +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 2BFFD16A402
	for <perforce@freebsd.org>; Thu,  4 May 2006 20:07:27 +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 E026B43D4C
	for <perforce@freebsd.org>; Thu,  4 May 2006 20:07:26 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k44K7QSJ073075
	for <perforce@freebsd.org>; Thu, 4 May 2006 20:07:26 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k44K7Qfa073072
	for perforce@freebsd.org; Thu, 4 May 2006 20:07:26 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 4 May 2006 20:07:26 GMT
Message-Id: <200605042007.k44K7Qfa073072@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 96665 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: Thu, 04 May 2006 20:07:27 -0000

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

Change 96665 by imp@imp_hammer on 2006/05/04 20:06:33

	More shaving...

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#11 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#11 (text+ko) ====

@@ -41,7 +41,6 @@
 static void
 SendCommand(spiCommand_t *pCommand)
 {
-	unsigned	v;
 	AT91PS_SPI	pSPI = AT91C_BASE_SPI;
 
 	pSPI->SPI_PTCR = AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS;
@@ -59,7 +58,7 @@
 	pSPI->SPI_PTCR = AT91C_PDC_TXTEN | AT91C_PDC_RXTEN;
 
 	// wait for completion
-	while (!((v = pSPI->SPI_SR) & AT91C_SPI_SPENDRX))
+	while (!(pSPI->SPI_SR & AT91C_SPI_SPENDRX))
 		Delay(700);
 }
 
@@ -227,7 +226,6 @@
 	AT91PS_PIO	pPio;
 	AT91PS_SPI	pSPI = AT91C_BASE_SPI;
 	unsigned	value;
-	char		initStatus;
 
 	// enable CS0, CLK, MOSI, MISO
 	pPio = (AT91PS_PIO)AT91C_BASE_PIOA;
@@ -267,6 +265,6 @@
 	// Increment real time counter every SLCK
 	AT91C_BASE_ST->ST_RTMR = 1;
 
-	if (((initStatus = GetFlashStatus()) & 0xFC) != 0xBC)
-		printf(" Unexpected SPI flash status: 0x%x\r\n", initStatus);
+	if (((value = GetFlashStatus()) & 0xFC) != 0xBC)
+		printf(" Unexpected SPI flash status: 0x%x\r\n", value);
 }