From owner-p4-projects@FreeBSD.ORG  Wed May  2 11:43:09 2007
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 3A9AC16A403; Wed,  2 May 2007 11:43:09 +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 18E2116A401
	for <perforce@freebsd.org>; Wed,  2 May 2007 11:43:09 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 0AA7913C45A
	for <perforce@freebsd.org>; Wed,  2 May 2007 11:43:09 +0000 (UTC)
	(envelope-from bms@incunabulum.net)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l42Bh8Rt082277
	for <perforce@freebsd.org>; Wed, 2 May 2007 11:43:08 GMT
	(envelope-from bms@incunabulum.net)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l42Bh8cw082270
	for perforce@freebsd.org; Wed, 2 May 2007 11:43:08 GMT
	(envelope-from bms@incunabulum.net)
Date: Wed, 2 May 2007 11:43:08 GMT
Message-Id: <200705021143.l42Bh8cw082270@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bms@incunabulum.net using -f
From: Bruce M Simpson <bms@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 119147 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: Wed, 02 May 2007 11:43:09 -0000

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

Change 119147 by bms@bms_anglepoise on 2007/05/02 11:42:20

	Bring back plain old hardcoded clock value.
	The Sentry5 doesn't have YAMON or the Motorola RTC.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/tick.c#11 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/tick.c#11 (text+ko) ====

@@ -117,7 +117,7 @@
 	printf("Calibrating MIPS32 clock ... ");
 
 	do {
-#ifdef TICK_USE_YAMON_FREQ
+#if defined(TICK_USE_YAMON_FREQ)
 		/*
 		 * Use the clock frequency specified in the environment
 		 * variables providied to us by the YAMON monitor.
@@ -131,13 +131,12 @@
 		} else {
 			counter_freq = strtol(cp, (char **)NULL, 10) * 1000 ;
 		}
-#else
+#elif defined(TICK_USE_MALTA_RTC)
 		u_int64_t counterval[2];
 
 		/*
 		 * Determine clock frequency from hardware.
 		 */
-#ifdef TICK_USE_MALTA_RTC
 		/* Set RTC to binary mode. */
 		writertc(RTC_STATUSB, (rtcin(RTC_STATUSB) | RTCSB_BCD));
 
@@ -146,19 +145,19 @@
 			;
 		while (((rtcin(RTC_STATUSA)& RTCSA_TUP) != 0))
 			;
-#endif
 		counterval[0] = mips_rd_count();
 
-#ifdef TICK_USE_MALTA_RTC
 		/* Busy-wait for falling edge of RTC update. */
 		while (((rtcin(RTC_STATUSA) & RTCSA_TUP) == 0))
 			;
 		while (((rtcin(RTC_STATUSA)& RTCSA_TUP) != 0))
 			;
-#endif
+		counterval[1] = mips_rd_count();
 
-		counterval[1] = mips_rd_count();
 		counter_freq = counterval[1] - counterval[0];
+#else
+		printf("using hard-coded default clock of 10MHz\n");
+		counter_freq = 10000000;
 #endif
 	} while (0);