PERFORCE change 138698 for review

John Birrell jb at FreeBSD.org
Thu Mar 27 02:03:31 UTC 2008


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

Change 138698 by jb at jb_freebsd1 on 2008/03/27 02:03:08

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#11 integrate
.. //depot/projects/dtrace/ports/KNOBS#13 integrate
.. //depot/projects/dtrace/src/etc/rc.d/ppp#9 integrate
.. //depot/projects/dtrace/src/include/stdio.h#7 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/sysctl.3#7 integrate
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#25 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#17 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#10 integrate
.. //depot/projects/dtrace/src/sys/conf/options.amd64#10 integrate
.. //depot/projects/dtrace/src/sys/conf/options.i386#10 integrate
.. //depot/projects/dtrace/src/sys/conf/options.pc98#8 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/NOTES#20 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#12 integrate
.. //depot/projects/dtrace/src/sys/isa/syscons_isa.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/init_sysent.c#31 integrate
.. //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#13 integrate
.. //depot/projects/dtrace/src/sys/kern/syscalls.c#30 integrate
.. //depot/projects/dtrace/src/sys/kern/systrace_args.c#26 integrate
.. //depot/projects/dtrace/src/sys/netsmb/smb_iod.c#8 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#7 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/syscons_cbus.c#7 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/NOTES#10 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.h#28 integrate
.. //depot/projects/dtrace/src/sys/sys/syscall.mk#28 integrate
.. //depot/projects/dtrace/src/sys/sys/sysproto.h#28 integrate
.. //depot/projects/dtrace/src/usr.bin/awk/Makefile#9 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#15 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#11 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.109 2008/03/24 20:51:24 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.110 2008/03/26 21:07:47 blackend Exp $
 -->
 
 <chapter id="printing">
@@ -2080,7 +2080,7 @@
             entry for the printer named <literal>bamboo</literal>.  Here is
             the example <filename>/etc/printcap</filename> file again, with
             the new <literal>df</literal> capability for the printer
-            <literal>bamboo</literal>.</para>
+            <literal>bamboo</literal>:</para>
 
           <programlisting>#
 #  /etc/printcap for host rose - added df filter for bamboo
@@ -2116,15 +2116,15 @@
               linkend="printing-advanced-if-conversion">Accommodating Plain
               Text Jobs on &postscript; Printers</link>) with the arguments 
 	    <application>LPD</application>
-            passed to this script. <command>lprps</command> will use those
+            passed to this script. The <command>lprps</command> utility will use those
             arguments to account for the pages printed.</para>
         </sect4>
             
         <sect4>
           <title>More Conversion Filter Examples</title>
               
-          <para>Since there is no fixed set of steps to install conversion
-            filters, let me instead provide more examples.  Use these as
+          <para>There is no fixed set of steps to install conversion
+            filters, some working examples are described in this section.  Use these as
             guidance to making your own filters.  Use them directly, if
             appropriate.</para>
               

==== //depot/projects/dtrace/ports/KNOBS#13 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # KNOBS - A list of popular knobs and their descriptions
 #
-# $FreeBSD: ports/KNOBS,v 1.24 2008/03/20 12:34:56 danfe Exp $
+# $FreeBSD: ports/KNOBS,v 1.26 2008/03/27 00:05:09 danfe Exp $
 #
 # Rules for adding knobs:
 #
@@ -39,7 +39,7 @@
 DVDNAV			Enables DVD Menu support
 DVDREAD			Enables DVD support
 ESOUND			Adds support for Esound
-EXAMPLES		Installs optional example code, graphics, etc
+EXAMPLES		Installs optional example code, graphics, etc.
 EXIF			Support for EXIF headers in JPEG or TIFF files
 FAAC			FAAC AAC and MP4 audio encoder support
 FAAD			FAAD AAC and MP4 audio decoder support
@@ -66,6 +66,7 @@
 LDAP			Adds LDAP support
 LINUX			Adds support for Linux
 LIVEMEDIA		LiveMedia rstp/rtp/sdp support
+LUA			Lua scripting support
 LZO			LZO data compression support
 MAD			Mad MP3 audio decoder support
 MATROSKA		Matroska multimedia container support

==== //depot/projects/dtrace/src/etc/rc.d/ppp#9 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/ppp,v 1.16 2008/01/26 14:02:19 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ppp,v 1.17 2008/03/26 21:54:48 brooks Exp $
 #
 
 # PROVIDE: ppp
@@ -21,17 +21,22 @@
 	local _ppp_profile _ppp_mode _ppp_nat
 
 	_ppp_profile=$1
+	_ppp_profile_cleaned=$1
+	_punct=". - / +"
+	for _punct_c in $_punct; do
+		_ppp_profile_cleaned=`ltr ${_ppp_profile_cleaned} ${_punct_c} '_'`
+	done
 
 	# Check for ppp profile mode override.
 	#
-	eval _ppp_mode=\$ppp_${_ppp_profile}_mode
+	eval _ppp_mode=\$ppp_${_ppp_profile_cleaned}_mode
 	if [ -z "$_ppp_mode" ]; then
 		_ppp_mode=$ppp_mode
 	fi
 
 	# Check for ppp profile nat override.
 	#
-	eval _ppp_nat=\$ppp_${_ppp_profile}_nat
+	eval _ppp_nat=\$ppp_${_ppp_profile_cleaned}_nat
 	if [ -z "$_ppp_nat" ]; then
 		_ppp_nat=$ppp_nat
 	fi

==== //depot/projects/dtrace/src/include/stdio.h#7 (text+ko) ====

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.60 2007/04/07 16:02:30 pjd Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.61 2008/03/26 23:43:11 jb Exp $
  */
 
 #ifndef	_STDIO_H_

==== //depot/projects/dtrace/src/lib/libc/gen/sysctl.3#7 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.74 2007/10/16 11:29:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.75 2008/03/26 23:02:17 ru Exp $
 .\"
-.Dd October 16, 2007
+.Dd March 27, 2008
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -534,17 +534,6 @@
 followed by the vnode itself
 .Va struct vnode .
 .El
-.Ss CTL_MACHDEP
-The set of variables defined is architecture dependent.
-The following variables are defined for the i386 architecture.
-.Bl -column "CONSOLE_DEVICEXXX" "struct bootinfoXXX" -offset indent
-.It Sy "Second level name	Type	Changeable"
-.It Li "CPU_CONSDEV	dev_t	no"
-.It Li "CPU_ADJKERNTZ	int	yes"
-.It Li "CPU_DISRTCSET	int	yes"
-.It Li "CPU_BOOTINFO	struct bootinfo	no"
-.It Li "CPU_WALLCLOCK	int	yes"
-.El
 .Ss CTL_NET
 The string and integer information available for the CTL_NET level
 is detailed below.

==== //depot/projects/dtrace/src/share/man/man5/rc.conf.5#25 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.335 2008/03/05 18:32:58 brooks Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.336 2008/03/26 21:54:48 brooks Exp $
 .\"
 .Dd January 27, 2008
 .Dt RC.CONF 5
@@ -1315,11 +1315,30 @@
 run the
 .Xr ppp 8
 daemon.
+.It Va ppp_profile
+.Pq Vt str
+The name of the profile to use from
+.Pa /etc/ppp/ppp.conf .
+Also used for per-profile overrides of
+.Va ppp_mode
+and
+.Va ppp_nat .
+When the profile name contains any of the characters
+.Dq Li .-/+
+they are translated to
+.Dq Li _
+for the proposes of the override variable names.
 .It Va ppp_mode
 .Pq Vt str
 Mode in which to run the
 .Xr ppp 8
 daemon.
+.It Va ppp_ Ns Ao Ar profile Ac Ns _mode
+.Pq Vt str
+Overrides the global
+.Va ppp_mode
+for
+.Ar profile .
 Accepted modes are
 .Dq Li auto ,
 .Dq Li ddial ,
@@ -1336,10 +1355,12 @@
 .Va gateway_enable
 allows hosts on private network addresses access to the Internet using
 this host as a network address translating router.
-.It Va ppp_profile
+.It Va ppp_ Ns Ao Ar profile Ac Ns _nat
 .Pq Vt str
-The name of the profile to use from
-.Pa /etc/ppp/ppp.conf .
+Overrides the global
+.Va ppp_nat
+for
+.Ar profile .
 .It Va ppp_user
 .Pq Vt str
 The name of the user under which

==== //depot/projects/dtrace/src/sys/amd64/conf/NOTES#17 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.76 2008/03/24 22:23:21 jkim Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.77 2008/03/26 22:11:58 phk Exp $
 #
 
 #
@@ -88,19 +88,6 @@
 #####################################################################
 # CLOCK OPTIONS
 
-# The following options are used for debugging clock behavior only, and
-# should not be used for production systems.
-
-# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
-# startup until the user presses a key.  (The i8254 clock is always
-# calibrated relative to the RTC (mc146818a) and this option causes the
-# calibration to be repeated.)
-options 	CLK_CALIBRATION_LOOP
-
-# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
-# clock to actually be used.
-options 	CLK_USE_I8254_CALIBRATION
-
 # Provide read/write access to the memory in the clock chip.
 device		nvram		# Access to rtc cmos via /dev/nvram
 

==== //depot/projects/dtrace/src/sys/amd64/isa/clock.c#10 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.240 2008/03/26 20:26:12 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -430,86 +430,6 @@
 	return(bcd2bin(rtcin(port)));
 }
 
-static u_int
-calibrate_clocks(void)
-{
-	u_int count, prev_count, tot_count;
-	int sec, start_sec, timeout;
-
-	if (bootverbose)
-	        printf("Calibrating clock(s) ... ");
-	if (!(rtcin(RTC_STATUSD) & RTCSD_PWR))
-		goto fail;
-	timeout = 100000000;
-
-	/* Read the mc146818A seconds counter. */
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP)) {
-			sec = rtcin(RTC_SEC);
-			break;
-		}
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Wait for the mC146818A seconds counter to change. */
-	start_sec = sec;
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP)) {
-			sec = rtcin(RTC_SEC);
-			if (sec != start_sec)
-				break;
-		}
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Start keeping track of the i8254 counter. */
-	prev_count = getit();
-	if (prev_count == 0 || prev_count > i8254_max_count)
-		goto fail;
-	tot_count = 0;
-
-	/*
-	 * Wait for the mc146818A seconds counter to change.  Read the i8254
-	 * counter for each iteration since this is convenient and only
-	 * costs a few usec of inaccuracy. The timing of the final reads
-	 * of the counters almost matches the timing of the initial reads,
-	 * so the main cause of inaccuracy is the varying latency from 
-	 * inside getit() or rtcin(RTC_STATUSA) to the beginning of the
-	 * rtcin(RTC_SEC) that returns a changed seconds count.  The
-	 * maximum inaccuracy from this cause is < 10 usec on 486's.
-	 */
-	start_sec = sec;
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP))
-			sec = rtcin(RTC_SEC);
-		count = getit();
-		if (count == 0 || count > i8254_max_count)
-			goto fail;
-		if (count > prev_count)
-			tot_count += prev_count - (count - i8254_max_count);
-		else
-			tot_count += prev_count - count;
-		prev_count = count;
-		if (sec != start_sec)
-			break;
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	if (bootverbose) {
-	        printf("i8254 clock: %u Hz\n", tot_count);
-	}
-	return (tot_count);
-
-fail:
-	if (bootverbose)
-	        printf("failed, using default i8254 clock of %u Hz\n",
-		       i8254_freq);
-	return (i8254_freq);
-}
-
 static void
 set_i8254_freq(u_int freq, int intr_freq)
 {
@@ -547,42 +467,10 @@
 void
 startrtclock()
 {
-	u_int delta, freq;
 
 	writertc(RTC_STATUSA, rtc_statusa);
 	writertc(RTC_STATUSB, RTCSB_24HR);
 
-	freq = calibrate_clocks();
-#ifdef CLK_CALIBRATION_LOOP
-	if (bootverbose) {
-		printf(
-		"Press a key on the console to abort clock calibration\n");
-		while (cncheckc() == -1)
-			calibrate_clocks();
-	}
-#endif
-
-	/*
-	 * Use the calibrated i8254 frequency if it seems reasonable.
-	 * Otherwise use the default, and don't use the calibrated i586
-	 * frequency.
-	 */
-	delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
-	if (delta < i8254_freq / 100) {
-#ifndef CLK_USE_I8254_CALIBRATION
-		if (bootverbose)
-			printf(
-"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
-		freq = i8254_freq;
-#endif
-		i8254_freq = freq;
-	} else {
-		if (bootverbose)
-			printf(
-		    "%d Hz differs from default of %d Hz by more than 1%%\n",
-			       freq, i8254_freq);
-	}
-
 	set_i8254_freq(i8254_freq, hz);
 	tc_init(&i8254_timecounter);
 

==== //depot/projects/dtrace/src/sys/conf/options.amd64#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.30 2007/11/30 21:45:06 peter Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.31 2008/03/26 22:11:59 phk Exp $
 # Options specific to AMD64 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -21,8 +21,6 @@
 LINSYSFS		opt_dontuse.h
 NDISAPI			opt_dontuse.h
 
-CLK_CALIBRATION_LOOP		opt_clock.h
-CLK_USE_I8254_CALIBRATION	opt_clock.h
 TIMER_FREQ			opt_clock.h
 
 # options for serial support

==== //depot/projects/dtrace/src/sys/conf/options.i386#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.239 2007/11/30 21:45:06 peter Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.240 2008/03/26 22:11:59 phk Exp $
 # Options specific to the i386 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -36,8 +36,6 @@
 # Physical address extensions and support for >4G ram.  As above.
 PAE			opt_global.h
 
-CLK_CALIBRATION_LOOP		opt_clock.h
-CLK_USE_I8254_CALIBRATION	opt_clock.h
 TIMER_FREQ			opt_clock.h
 
 CPU_ATHLON_SSE_HACK		opt_cpu.h

==== //depot/projects/dtrace/src/sys/conf/options.pc98#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.pc98,v 1.201 2007/07/04 00:18:38 bz Exp $
+# $FreeBSD: src/sys/conf/options.pc98,v 1.202 2008/03/26 22:11:59 phk Exp $
 # Options specific to the pc98 platform kernels
 
 AUTO_EOI_1		opt_auto_eoi.h
@@ -31,8 +31,6 @@
 # Change KVM size.  Changes things all over the kernel.
 KVA_PAGES		opt_global.h
 
-CLK_CALIBRATION_LOOP		opt_clock.h
-CLK_USE_I8254_CALIBRATION	opt_clock.h
 TIMER_FREQ			opt_clock.h
 
 # options for serial support

==== //depot/projects/dtrace/src/sys/i386/conf/NOTES#20 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1251 2008/03/24 22:23:22 jkim Exp $
+# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1252 2008/03/26 22:11:59 phk Exp $
 #
 
 #
@@ -259,19 +259,6 @@
 #####################################################################
 # CLOCK OPTIONS
 
-# The following options are used for debugging clock behavior only, and
-# should not be used for production systems.
-
-# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
-# startup until the user presses a key.  (The i8254 clock is always
-# calibrated relative to the RTC (mc146818a) and this option causes the
-# calibration to be repeated.)
-options 	CLK_CALIBRATION_LOOP
-
-# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
-# clock to actually be used.
-options 	CLK_USE_I8254_CALIBRATION
-
 # Provide read/write access to the memory in the clock chip.
 device		nvram		# Access to rtc cmos via /dev/nvram
 

==== //depot/projects/dtrace/src/sys/i386/isa/clock.c#12 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.244 2008/03/26 20:09:19 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.245 2008/03/26 22:11:59 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -57,34 +57,24 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/clock.h>
-#include <sys/conf.h>
-#include <sys/fcntl.h>
 #include <sys/lock.h>
 #include <sys/kdb.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
-#include <sys/time.h>
 #include <sys/timetc.h>
-#include <sys/uio.h>
 #include <sys/kernel.h>
-#include <sys/limits.h>
 #include <sys/module.h>
 #include <sys/sched.h>
 #include <sys/sysctl.h>
-#include <sys/cons.h>
-#include <sys/power.h>
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/cputypes.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
-#include <machine/psl.h>
 #ifdef DEV_APIC
 #include <machine/apicvar.h>
 #endif
-#include <machine/specialreg.h>
 #include <machine/ppireg.h>
 #include <machine/timerreg.h>
 
@@ -462,86 +452,6 @@
 	return(bcd2bin(rtcin(port)));
 }
 
-static u_int
-calibrate_clocks(void)
-{
-	u_int count, prev_count, tot_count;
-	int sec, start_sec, timeout;
-
-	if (bootverbose)
-	        printf("Calibrating clock(s) ... ");
-	if (!(rtcin(RTC_STATUSD) & RTCSD_PWR))
-		goto fail;
-	timeout = 100000000;
-
-	/* Read the mc146818A seconds counter. */
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP)) {
-			sec = rtcin(RTC_SEC);
-			break;
-		}
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Wait for the mC146818A seconds counter to change. */
-	start_sec = sec;
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP)) {
-			sec = rtcin(RTC_SEC);
-			if (sec != start_sec)
-				break;
-		}
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Start keeping track of the i8254 counter. */
-	prev_count = getit();
-	if (prev_count == 0 || prev_count > i8254_max_count)
-		goto fail;
-	tot_count = 0;
-
-	/*
-	 * Wait for the mc146818A seconds counter to change.  Read the i8254
-	 * counter for each iteration since this is convenient and only
-	 * costs a few usec of inaccuracy. The timing of the final reads
-	 * of the counters almost matches the timing of the initial reads,
-	 * so the main cause of inaccuracy is the varying latency from 
-	 * inside getit() or rtcin(RTC_STATUSA) to the beginning of the
-	 * rtcin(RTC_SEC) that returns a changed seconds count.  The
-	 * maximum inaccuracy from this cause is < 10 usec on 486's.
-	 */
-	start_sec = sec;
-	for (;;) {
-		if (!(rtcin(RTC_STATUSA) & RTCSA_TUP))
-			sec = rtcin(RTC_SEC);
-		count = getit();
-		if (count == 0 || count > i8254_max_count)
-			goto fail;
-		if (count > prev_count)
-			tot_count += prev_count - (count - i8254_max_count);
-		else
-			tot_count += prev_count - count;
-		prev_count = count;
-		if (sec != start_sec)
-			break;
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	if (bootverbose) {
-	        printf("i8254 clock: %u Hz\n", tot_count);
-	}
-	return (tot_count);
-
-fail:
-	if (bootverbose)
-	        printf("failed, using default i8254 clock of %u Hz\n",
-		       i8254_freq);
-	return (i8254_freq);
-}
-
 static void
 set_i8254_freq(u_int freq, int intr_freq)
 {
@@ -618,42 +528,10 @@
 void
 startrtclock()
 {
-	u_int delta, freq;
 
 	writertc(RTC_STATUSA, rtc_statusa);
 	writertc(RTC_STATUSB, RTCSB_24HR);
 
-	freq = calibrate_clocks();
-#ifdef CLK_CALIBRATION_LOOP
-	if (bootverbose) {
-		printf(
-		"Press a key on the console to abort clock calibration\n");
-		while (cncheckc() == -1)
-			calibrate_clocks();
-	}
-#endif
-
-	/*
-	 * Use the calibrated i8254 frequency if it seems reasonable.
-	 * Otherwise use the default, and don't use the calibrated i586
-	 * frequency.
-	 */
-	delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
-	if (delta < i8254_freq / 100) {
-#ifndef CLK_USE_I8254_CALIBRATION
-		if (bootverbose)
-			printf(
-"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
-		freq = i8254_freq;
-#endif
-		i8254_freq = freq;
-	} else {
-		if (bootverbose)
-			printf(
-		    "%d Hz differs from default of %d Hz by more than 1%%\n",
-			       freq, i8254_freq);
-	}
-
 	set_i8254_freq(i8254_freq, hz);
 	tc_init(&i8254_timecounter);
 

==== //depot/projects/dtrace/src/sys/isa/syscons_isa.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/isa/syscons_isa.c,v 1.31 2008/03/26 20:09:19 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/isa/syscons_isa.c,v 1.32 2008/03/26 22:02:50 phk Exp $");
 
 #include "opt_syscons.h"
 
@@ -43,8 +43,6 @@
 
 #include <machine/clock.h>
 #include <machine/md_var.h>
-#include <machine/ppireg.h>
-#include <machine/timerreg.h>
 #include <machine/pc/bios.h>
 
 #include <vm/vm.h>
@@ -272,18 +270,12 @@
 int
 sc_tone(int herz)
 {
-#if defined(__i386__) || defined(__amd64__)
+#if defined(HAS_TIMER_SPKR)
 	if (herz) {
-		/* set command for counter 2, 2 byte write */
 		if (timer_spkr_acquire())
 			return EBUSY;
-		/* set pitch */
 		timer_spkr_setfreq(herz);
-		/* enable counter 2 output to speaker */
-		ppi_spkr_on();
 	} else {
-		/* disable counter 2 output to speaker */
-		ppi_spkr_off();
 		timer_spkr_release();
 	}
 #endif

==== //depot/projects/dtrace/src/sys/kern/init_sysent.c#31 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/init_sysent.c,v 1.238 2008/03/27 01:55:05 jb Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.241 2008/03/26 15:23:09 dfr Exp 
  */
 

==== //depot/projects/dtrace/src/sys/kern/makesyscalls.sh#13 (text+ko) ====

@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.69 2008/03/25 09:11:53 ru Exp $
+# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.70 2008/03/27 01:53:44 jb Exp $
 
 set -e
 

==== //depot/projects/dtrace/src/sys/kern/syscalls.c#30 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/syscalls.c,v 1.222 2008/03/27 01:55:05 jb Exp $
  * created from FreeBSD: src/sys/kern/syscalls.master,v 1.241 2008/03/26 15:23:09 dfr Exp 
  */
 

==== //depot/projects/dtrace/src/sys/kern/systrace_args.c#26 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD$
+ * $FreeBSD: src/sys/kern/systrace_args.c,v 1.22 2008/03/27 01:55:05 jb Exp $
  * This file is part of the DTrace syscall provider.
  */
 

==== //depot/projects/dtrace/src/sys/netsmb/smb_iod.c#8 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netsmb/smb_iod.c,v 1.20 2008/03/25 09:39:00 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_iod.c,v 1.21 2008/03/27 01:23:59 attilio Exp $");
  
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -652,6 +652,8 @@
 {
 	struct smbiod *iod = arg;
 
+	mtx_lock(&Giant);
+
 	/*
 	 * Here we assume that the thread structure will be the same
 	 * for an entire kthread (kproc, to be more precise) life.
@@ -665,6 +667,7 @@
 			break;
 		tsleep(&iod->iod_flags, PWAIT, "90idle", iod->iod_sleeptimo);
 	}
+	mtx_unlock(&Giant);
 	kproc_exit(0);
 }
 

==== //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#7 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.165 2008/03/26 20:09:20 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.166 2008/03/26 22:12:00 phk Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -69,7 +69,6 @@
 #include <sys/limits.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
-#include <sys/cons.h>
 #include <sys/power.h>
 
 #include <machine/clock.h>
@@ -325,71 +324,6 @@
 #endif
 }
 
-static u_int
-calibrate_clocks(void)
-{
-	int timeout;
-	u_int count, prev_count, tot_count;
-	u_short	sec, start_sec;
-
-	if (bootverbose)
-	        printf("Calibrating clock(s) ... ");
-	/* Check ARTIC. */
-	if (!(PC98_SYSTEM_PARAMETER(0x458) & 0x80) &&
-	    !(PC98_SYSTEM_PARAMETER(0x45b) & 0x04))
-		goto fail;
-	timeout = 100000000;
-
-	/* Read the ARTIC. */
-	sec = inw(0x5e);
-
-	/* Wait for the ARTIC to changes. */
-	start_sec = sec;
-	for (;;) {
-		sec = inw(0x5e);
-		if (sec != start_sec)
-			break;
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	/* Start keeping track of the i8254 counter. */
-	prev_count = getit();
-	if (prev_count == 0 || prev_count > i8254_max_count)
-		goto fail;
-	tot_count = 0;
-
-	start_sec = sec;
-	for (;;) {
-		sec = inw(0x5e);
-		count = getit();
-		if (count == 0 || count > i8254_max_count)
-			goto fail;
-		if (count > prev_count)
-			tot_count += prev_count - (count - i8254_max_count);
-		else
-			tot_count += prev_count - count;
-		prev_count = count;
-		if ((sec == start_sec + 1200) || /* 1200 = 307.2KHz >> 8 */
-		    (sec < start_sec &&
-		        (u_int)sec + 0x10000 == (u_int)start_sec + 1200))
-			break;
-		if (--timeout == 0)
-			goto fail;
-	}
-
-	if (bootverbose) {
-	        printf("i8254 clock: %u Hz\n", tot_count);
-	}
-	return (tot_count);
-
-fail:
-	if (bootverbose)
-	        printf("failed, using default i8254 clock of %u Hz\n",
-		       i8254_freq);
-	return (i8254_freq);
-}
-
 static void
 set_i8254_freq(u_int freq, int intr_freq)
 {
@@ -459,38 +393,6 @@
 void
 startrtclock()
 {
-	u_int delta, freq;
-
-	freq = calibrate_clocks();
-#ifdef CLK_CALIBRATION_LOOP
-	if (bootverbose) {
-		printf(
-		"Press a key on the console to abort clock calibration\n");
-		while (cncheckc() == -1)
-			calibrate_clocks();
-	}
-#endif
-
-	/*
-	 * Use the calibrated i8254 frequency if it seems reasonable.
-	 * Otherwise use the default, and don't use the calibrated i586
-	 * frequency.
-	 */
-	delta = freq > i8254_freq ? freq - i8254_freq : i8254_freq - freq;
-	if (delta < i8254_freq / 100) {
-#ifndef CLK_USE_I8254_CALIBRATION
-		if (bootverbose)
-			printf(
-"CLK_USE_I8254_CALIBRATION not specified - using default frequency\n");
-		freq = i8254_freq;
-#endif
-		i8254_freq = freq;
-	} else {
-		if (bootverbose)
-			printf(
-		    "%d Hz differs from default of %d Hz by more than 1%%\n",
-			       freq, i8254_freq);
-	}
 
 	set_i8254_freq(i8254_freq, hz);
 	tc_init(&i8254_timecounter);

==== //depot/projects/dtrace/src/sys/pc98/cbus/syscons_cbus.c#7 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pc98/cbus/syscons_cbus.c,v 1.26 2008/03/26 20:09:20 phk Exp $
+ * $FreeBSD: src/sys/pc98/cbus/syscons_cbus.c,v 1.27 2008/03/26 22:02:51 phk Exp $
  */
 
 #include "opt_syscons.h"
@@ -38,8 +38,6 @@
 #include <sys/sysctl.h>
 
 #include <machine/clock.h>
-#include <machine/ppireg.h>
-#include <machine/timerreg.h>
 
 #include <pc98/pc98/pc98_machdep.h>
 
@@ -227,16 +225,10 @@
 {
 
 	if (herz) {
-		/* enable counter 1 */
-		ppi_spkr_on();
-		/* set command for counter 1, 2 byte write */
 		if (timer_spkr_acquire())
 			return EBUSY;
-		/* set pitch */
 		timer_spkr_setfreq(herz);
 	} else {
-		/* disable counter 1 */
-		ppi_spkr_off();
 		timer_spkr_release();
 	}
 	return 0;

==== //depot/projects/dtrace/src/sys/pc98/conf/NOTES#10 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.86 2008/03/24 22:23:22 jkim Exp $
+# $FreeBSD: src/sys/pc98/conf/NOTES,v 1.87 2008/03/26 22:12:00 phk Exp $
 #
 
 #
@@ -197,23 +197,6 @@
 
 
 #####################################################################
-# CLOCK OPTIONS
-
-# The following options are used for debugging clock behavior only, and
-# should not be used for production systems.
-
-# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
-# startup until the user presses a key.  (The i8254 clock is always
-# calibrated relative to the RTC (mc146818a) and this option causes the
-# calibration to be repeated.)
-options 	CLK_CALIBRATION_LOOP
-
-# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254
-# clock to actually be used.
-options 	CLK_USE_I8254_CALIBRATION
-
-
-#####################################################################

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list