Date: Tue, 4 Mar 1997 05:47:29 -0500 (EST) From: "Matthew N. Dodd" <winter@jurai.net> To: Bruce Evans <bde@zeta.org.au> Cc: cvs-all@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-sys@freefall.freebsd.org, gpalmer@freefall.freebsd.org, Gary Palmer <gpalmer@mail.webspan.net> Subject: Re: cvs commit: src/sys/i386/isa clock.c Message-ID: <Pine.BSF.3.95q.970304054446.366B-200000@sasami.jurai.net> In-Reply-To: <199703040958.UAA03727@godzilla.zeta.org.au>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, 4 Mar 1997, Bruce Evans wrote: > >gpalmer 97/03/04 01:24:03 > > > > Modified: sys/i386/isa clock.c > > Log: > > Split the rather long and line-wrapping clock probe messages on boot. > > (2.2?) > > > > Submitted by: Mathew Dood <winter@jurai.net> > > Arrgh. The clock calibration messages were carefully phrased to provide > complete information on one for all paths through the code. Formatting > them on one line is particularly useful with option CLK_CALIBRATION_LOOP > and boot flag -v. Then the calibration is repeated until you hit a key, > and printing one line per call gives a readable tabular format. This was > broken in rev.1.60, fixed in rev.1.71 and is now broken again. Since Gary just crashed I'll point out that its not too difficult to add the proper #ifdef's for CLK_CALIBRATION_LOOP to have your cake and eat it too. Attached is a patch against 1.77 to make everyone happy. Though as Gary and Bruce indicate putting the whole mess behind bootverbose might be the best way to deal with this. I didn't really mind seeing the clock probes, just seeing them wrapped. *grin* Have a good one. /* Matthew N. Dodd | A memory retaining a love you had for life winter@jurai.net | As cruel as it seems nothing ever seems to http://www.jurai.net/~winter | go right - FLA M 3.1:53 */ [-- Attachment #2 --] *** clock.c.old Tue Mar 4 05:32:43 1997 --- clock.c Tue Mar 4 05:39:06 1997 *************** *** 515,519 **** --- 515,523 ---- int sec, start_sec, timeout; + #ifdef CLK_CALIBRATION_LOOP printf("Calibrating clock(s) relative to mc146818A clock ... "); + #else + printf("Calibrating clock(s) relative to mc146818A clock.\n"); + #endif if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) goto fail; *************** *** 588,600 **** --- 592,616 ---- if (cpu_class == CPUCLASS_586 || cpu_class == CPUCLASS_686) { set_i586_ctr_freq((u_int)rdtsc(), tot_count); + #ifdef CLK_CALIBRATION_LOOP printf("i586 clock: %u Hz, ", i586_ctr_freq); + #else + printf(" i586 clock: %u Hz\n", i586_ctr_freq); + #endif } #endif + #ifdef CLK_CALIBRATION_LOOP printf("i8254 clock: %u Hz\n", tot_count); + #else + printf(" i8254 clock: %u Hz\n", tot_count); + #endif return (tot_count); fail: + #ifdef CLK_CALIBRATION_LOOP printf("failed, using default i8254 clock of %u Hz\n", timer_freq); + #else + printf(" Failed, using default i8254 clock of %u Hz\n", timer_freq); + #endif return (timer_freq); }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.3.95q.970304054446.366B-200000>