From owner-p4-projects@FreeBSD.ORG  Sun Jun 18 20:38:06 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 1889616A47D; Sun, 18 Jun 2006 20:38:06 +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 D0BC616A47A
	for <perforce@freebsd.org>; Sun, 18 Jun 2006 20:38:05 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A00A443D45
	for <perforce@freebsd.org>; Sun, 18 Jun 2006 20:38:05 +0000 (GMT)
	(envelope-from cognet@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 k5IKc5XN054823
	for <perforce@freebsd.org>; Sun, 18 Jun 2006 20:38:05 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5IKc5Df054820
	for perforce@freebsd.org; Sun, 18 Jun 2006 20:38:05 GMT
	(envelope-from cognet@freebsd.org)
Date: Sun, 18 Jun 2006 20:38:05 GMT
Message-Id: <200606182038.k5IKc5Df054820@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 99555 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: Sun, 18 Jun 2006 20:38:06 -0000

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

Change 99555 by cognet@cognet on 2006/06/18 20:37:24

	- Spell BOOT_MP920X BOOT_KB9202.
	- Reset the timeout each time we received a packet.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#18 edit

Differences ...

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

@@ -232,7 +232,7 @@
  * any here.
  * .KB_C_FN_DEFINITION_END
  */
-static void
+static int
 CheckForNewPacket(ip_header_t *pHeader)
 {
 	unsigned short	*pFrameType;
@@ -252,7 +252,7 @@
 	}
 		
 	if (!process)
-		return ;
+		return (0);
 						
 	process = i;
 		
@@ -334,6 +334,7 @@
 		}
 	}
 	p_rxBD[process].address &= ~0x01;
+	return (1);
 }
 
 
@@ -613,7 +614,7 @@
 		  AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 |
 		  AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC |
 		  AT91C_PA7_ETXCK_EREFCK;
-#ifdef BOOT_MB920X	/* Really !RMII */
+#ifdef BOOT_KB9202	/* Really !RMII */
 		AT91C_BASE_PIOB->PIO_BSR =
 		  AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER |
 		  AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV |
@@ -641,16 +642,18 @@
 	ackBlock = -1;
 
 	while (running && timeout) {
+		int newpacket;
 
-		CheckForNewPacket(&IpHeader);
+		newpacket = CheckForNewPacket(&IpHeader);
 
 		tickUpdate = 0;
 
-		if (thisSeconds != GetSeconds()) {
+		if (!newpacket && thisSeconds != GetSeconds()) {
 			tickUpdate = 1;
 			--timeout;
 			thisSeconds = GetSeconds();
-		}
+		} else if (newpacket)
+			timeout = 10;
 
 		switch (state) {