CVS commit: src/share/man/man9
Module Name:src Committed By: yamt Date: Mon Oct 24 07:25:51 UTC 2011 Modified Files: src/share/man/man9: xcall.9 Log Message: - document XC_HIGHPRI - explicitly note that xc_wait requires thread context. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man9/xcall.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/xcall.9 diff -u src/share/man/man9/xcall.9:1.7 src/share/man/man9/xcall.9:1.8 --- src/share/man/man9/xcall.9:1.7 Thu Dec 2 12:54:13 2010 +++ src/share/man/man9/xcall.9 Mon Oct 24 07:25:51 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: xcall.9,v 1.7 2010/12/02 12:54:13 wiz Exp $ +.\ $NetBSD: xcall.9,v 1.8 2011/10/24 07:25:51 yamt Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 16, 2010 +.Dd October 24, 2011 .Dt XCALL 9 .Os .Sh NAME @@ -81,6 +81,15 @@ context, and not from a software interru not interrupting other code running on the CPU, and so has exclusive access to the CPU. Keep in mind that unless disabled, it may cause a kernel preemption. +.Pp +.Nm +also provides a mechanism for making +.Dq high priority +cross calls. +The function to be executed runs on the remote CPU within a +.Dv IPL_SOFTCLOCK +software interrupt context, possibly interrupting other lower-priority +code running on the CPU. .Sh NOTES Functions being called should be relatively lightweight. They may block on locks, but carefully and minimally, to not interfere @@ -101,7 +110,9 @@ to .Fn xc_wait on for the cross-call to complete. .Fa flags -should be 0. +should be +.Dv XC_HIGHPRI +for a high priority call, and 0 for a low priority call. .Fn xc_broadcast should not be called from interrupt context. .It Fn xc_unicast flags func arg1 arg2 ci @@ -122,6 +133,8 @@ returned by a prior or .Fn xc_unicast for the corresponding cross-call to complete. +.Fn xc_wait +should be called from a thread context. .El .Sh CODE REFERENCES The
CVS commit: src/share/man/man9
Module Name:src Committed By: yamt Date: Mon Oct 24 07:27:09 UTC 2011 Modified Files: src/share/man/man9: workqueue.9 Log Message: update the description of the priority argument. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man9/workqueue.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/workqueue.9 diff -u src/share/man/man9/workqueue.9:1.9 src/share/man/man9/workqueue.9:1.10 --- src/share/man/man9/workqueue.9:1.9 Thu Dec 2 12:54:13 2010 +++ src/share/man/man9/workqueue.9 Mon Oct 24 07:27:09 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: workqueue.9,v 1.9 2010/12/02 12:54:13 wiz Exp $ +.\ $NetBSD: workqueue.9,v 1.10 2011/10/24 07:27:09 yamt Exp $ .\ .\ Copyright (c)2005 YAMAMOTO Takashi, .\ All rights reserved. @@ -25,7 +25,7 @@ .\ SUCH DAMAGE. .\ .\ -.Dd August 3, 2009 +.Dd October 24, 2011 .Dt WORKQUEUE 9 .Os .\ @@ -72,7 +72,7 @@ The function to be called for each An argument to be passed as a second argument of .Fa func . .It Fa prio -The process priority to be used when sleeping to wait requests. +The priority level for the worker threads. .It Fa ipl The highest IPL at which this workqueue is used. .It Fa flags
CVS commit: src/share/man/man9
Module Name:src Committed By: yamt Date: Mon Oct 24 07:30:29 UTC 2011 Modified Files: src/share/man/man9: cpu_need_resched.9 Log Message: - document RESCHED_KPREEMPT - Specifically - Typically in the paragraph which says what this function can do, because they are merely examples. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man9/cpu_need_resched.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/cpu_need_resched.9 diff -u src/share/man/man9/cpu_need_resched.9:1.8 src/share/man/man9/cpu_need_resched.9:1.9 --- src/share/man/man9/cpu_need_resched.9:1.8 Sat Jul 31 02:12:20 2010 +++ src/share/man/man9/cpu_need_resched.9 Mon Oct 24 07:30:29 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: cpu_need_resched.9,v 1.8 2010/07/31 02:12:20 jruoho Exp $ +.\ $NetBSD: cpu_need_resched.9,v 1.9 2011/10/24 07:30:29 yamt Exp $ .\ .\ Copyright (c) 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,6 +49,17 @@ This event may occur if a higher priorit queue or if the current LWP has exceeded its time slice. .Pp If +.Dv RESCHED_KPREEMPT +flag is specified in +.Fa flags +and +.Dv __HAVE_PREEMPTION +C pre-processor macro is defined in +.In machine/intr.h , +machine-dependent code should make a context switch happen as soon as possible +even if the cpu is running the kernel code. +.Pp +If .Dv RESCHED_IMMED flag is specified in .Fa flags , @@ -60,7 +71,7 @@ is not the current processor, typically issues an inter processor call to the processor to make it notice the need of a context switch as soon as possible. .Pp -Specifically, the +Typically, the .Fn cpu_need_resched function will perform the following operations: .Bl -bullet -offset indent
CVS commit: src/share/man/man9
Module Name:src Committed By: yamt Date: Mon Oct 24 07:31:31 UTC 2011 Modified Files: src/share/man/man9: Makefile Added Files: src/share/man/man9: ucas.9 Log Message: document ucas To generate a diff of this commit: cvs rdiff -u -r1.354 -r1.355 src/share/man/man9/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/ucas.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.354 src/share/man/man9/Makefile:1.355 --- src/share/man/man9/Makefile:1.354 Thu Oct 6 05:23:41 2011 +++ src/share/man/man9/Makefile Mon Oct 24 07:31:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.354 2011/10/06 05:23:41 jruoho Exp $ +# $NetBSD: Makefile,v 1.355 2011/10/24 07:31:31 yamt Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -50,7 +50,7 @@ MAN= accept_filter.9 accf_data.9 accf_ht store.9 suspendsched.9 \ sysctl.9 sysmon_envsys.9 sysmon_pswitch.9 sysmon_taskq.9 tc.9 \ tcp_congctl.9 timecounter.9 time_second.9 todr.9 tvtohz.9 \ - uiomove.9 ucom.9 userret.9 \ + ucas.9 uiomove.9 ucom.9 userret.9 \ vattr.9 veriexec.9 vcons.9 vfs.9 vfs_hooks.9 vfsops.9 vfssubr.9 \ video.9 vme.9 \ vnfileops.9 vnode.9 vnodeops.9 vnsubr.9 \ Added files: Index: src/share/man/man9/ucas.9 diff -u /dev/null src/share/man/man9/ucas.9:1.1 --- /dev/null Mon Oct 24 07:31:31 2011 +++ src/share/man/man9/ucas.9 Mon Oct 24 07:31:31 2011 @@ -0,0 +1,88 @@ +.\ $NetBSD: ucas.9,v 1.1 2011/10/24 07:31:31 yamt Exp $ +.\ +.\ Copyright (c)2011 YAMAMOTO Takashi, +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\ SUCH DAMAGE. +.\ +.\ +.Dd October 24, 2011 +.Dt UCAS 9 +.Os +.\ +.Sh NAME +.Nm ucas +.Nd atomic memory operations on user-space address +.\ +.Sh SYNOPSIS +.In sys/systm.h +.\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.Ft int +.Fn ucas_ptr \ +volatile void *uptr void *old void *new void *retp +.\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +.Ft int +.Fn ucas_int \ +volatile int *uptr int old int new int *retp +.\ +.Sh DESCRIPTION +These functions provide compare-and-swap (CAS) functionality on +user-space address. +.Pp +Except that they can be safely used for the kernel to access user-space +address, they are semantically equivalents of +.Xr atomic_cas 3 . +.Pp +.Bl -tag -width uptr +.It Fa uptr +The pointer to the variable. +This should be a user-space pointer. +.It Fa old +The value to compare with the variable. +.It Fa new +The value to store to the variable. +.It Fa retp +The pointer to the memory to store the old value of the variable. +.El +.\ +.Sh RETURN VALUES +On success, these functions return 0. +In that case, the caller can consult the value returned via +.Fa retp +to check the result of the CAS operation. +Otherwise, these functions return an appropriate +.Xr errno 9 +error code, typically +.Dv EFAULT . +.\ +.Sh SEE ALSO +.Xr intro 9 , +.Xr atomic_cas 3 +.\ +.Sh BUGS +Conceptually, the +.Fa retp +argument of +.Fn ucas_ptr +would be of +.Dv void ** . +The current prototype is a compromise for usability.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: yamt Date: Mon Oct 24 07:33:27 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: ucas.9 To generate a diff of this commit: cvs rdiff -u -r1.1695 -r1.1696 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1695 src/distrib/sets/lists/comp/mi:1.1696 --- src/distrib/sets/lists/comp/mi:1.1695 Fri Oct 21 02:11:18 2011 +++ src/distrib/sets/lists/comp/mi Mon Oct 24 07:33:26 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1695 2011/10/21 02:11:18 christos Exp $ +# $NetBSD: mi,v 1.1696 2011/10/24 07:33:26 yamt Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -10649,6 +10649,7 @@ ./usr/share/man/cat9/ubc_release.0 comp-sys-catman .cat ./usr/share/man/cat9/ubc_uiomove.0 comp-sys-catman .cat ./usr/share/man/cat9/ucom.0 comp-sys-catman .cat +./usr/share/man/cat9/ucas.0 comp-sys-catman .cat ./usr/share/man/cat9/uiomove.0 comp-sys-catman .cat ./usr/share/man/cat9/ungetnewvnode.0 comp-sys-catman .cat ./usr/share/man/cat9/untimeout.0 comp-sys-catman .cat @@ -16715,6 +16716,7 @@ ./usr/share/man/html9/ubc_release.html comp-sys-htmlman html ./usr/share/man/html9/ubc_uiomove.html comp-sys-htmlman html ./usr/share/man/html9/ucom.html comp-sys-htmlman html +./usr/share/man/html9/ucas.html comp-sys-htmlman html ./usr/share/man/html9/uiomove.html comp-sys-htmlman html ./usr/share/man/html9/ungetnewvnode.html comp-sys-htmlman html ./usr/share/man/html9/untimeout.html comp-sys-htmlman html @@ -22994,6 +22996,7 @@ ./usr/share/man/man9/ubc_release.9 comp-sys-man .man ./usr/share/man/man9/ubc_uiomove.9 comp-sys-man .man ./usr/share/man/man9/ucom.9 comp-sys-man .man +./usr/share/man/man9/ucas.9 comp-sys-man .man ./usr/share/man/man9/uiomove.9 comp-sys-man .man ./usr/share/man/man9/ungetnewvnode.9 comp-sys-man .man ./usr/share/man/man9/untimeout.9 comp-sys-man .man
CVS commit: src/sys/nfs
Module Name:src Committed By: hannken Date: Mon Oct 24 11:43:31 UTC 2011 Modified Files: src/sys/nfs: nfs_kq.c nfs_vfsops.c Log Message: VOP_GETATTR() needs a shared lock at least. As nfs_kqpoll() ignores the return value from VOP_GETATTR() initialize the attrributes to zero -- nfs_kqfilter() does the same. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/nfs/nfs_kq.c cvs rdiff -u -r1.219 -r1.220 src/sys/nfs/nfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/nfs/nfs_kq.c diff -u src/sys/nfs/nfs_kq.c:1.24 src/sys/nfs/nfs_kq.c:1.25 --- src/sys/nfs/nfs_kq.c:1.24 Sun Jun 12 03:35:59 2011 +++ src/sys/nfs/nfs_kq.c Mon Oct 24 11:43:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_kq.c,v 1.24 2011/06/12 03:35:59 rmind Exp $ */ +/* $NetBSD: nfs_kq.c,v 1.25 2011/10/24 11:43:30 hannken Exp $ */ /*- * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: nfs_kq.c,v 1.24 2011/06/12 03:35:59 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: nfs_kq.c,v 1.25 2011/10/24 11:43:30 hannken Exp $); #include sys/param.h #include sys/systm.h @@ -138,7 +138,10 @@ nfs_kqpoll(void *arg) /* save v_size, nfs_getattr() updates it */ osize = ke-vp-v_size; + memset(attr, 0, sizeof(attr)); + vn_lock(ke-vp, LK_SHARED | LK_RETRY); (void) VOP_GETATTR(ke-vp, attr, l-l_cred); + VOP_UNLOCK(ke-vp); /* following is a bit fragile, but about best * we can get */ @@ -318,7 +321,9 @@ nfs_kqfilter(void *v) * held. This is likely cheap due to attrcache, so do it now. */ memset(attr, 0, sizeof(attr)); + vn_lock(vp, LK_SHARED | LK_RETRY); (void) VOP_GETATTR(vp, attr, l-l_cred); + VOP_UNLOCK(vp); mutex_enter(nfskq_lock); Index: src/sys/nfs/nfs_vfsops.c diff -u src/sys/nfs/nfs_vfsops.c:1.219 src/sys/nfs/nfs_vfsops.c:1.220 --- src/sys/nfs/nfs_vfsops.c:1.219 Fri Oct 7 09:35:06 2011 +++ src/sys/nfs/nfs_vfsops.c Mon Oct 24 11:43:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_vfsops.c,v 1.219 2011/10/07 09:35:06 hannken Exp $ */ +/* $NetBSD: nfs_vfsops.c,v 1.220 2011/10/24 11:43:30 hannken Exp $ */ /* * Copyright (c) 1989, 1993, 1995 @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: nfs_vfsops.c,v 1.219 2011/10/07 09:35:06 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: nfs_vfsops.c,v 1.220 2011/10/24 11:43:30 hannken Exp $); #if defined(_KERNEL_OPT) #include opt_nfs.h @@ -387,7 +387,9 @@ nfs_mountroot(void) vfs_unbusy(mp, false, NULL); /* Get root attributes (for the time). */ + vn_lock(vp, LK_SHARED | LK_RETRY); error = VOP_GETATTR(vp, attr, l-l_cred); + VOP_UNLOCK(vp); if (error) panic(nfs_mountroot: getattr for root); n = attr.va_atime.tv_sec;
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Mon Oct 24 15:40:49 UTC 2011 Update of /cvsroot/src/share/zoneinfo In directory ivanova.netbsd.org:/tmp/cvs-serv8723 Log Message: Import tzdata2011m. The executive summary: europe Pridnestrovian Moldavian Republic (Europe/Tiraspol) has followed much of Russia, and will retain summer time year round (that is no time transition is due Oct 30). This reintroduces a zone that had earlier been removed, and so removes the backward link. On the other hand, Ukraine have decided not to follow, so the change which had been made in preparation for that in tzdata2011k is now reverted, and there will be a transition on Oct 30. southamerica The change to Bahia, Brazil, that introduced summer time (following the regular Brazil rules, so commencing this year on Oct 16 - last SUnday) that was mooted before tzdata2011l was released, but withdrawn becase the change was not yet official, has now been ratified. Status: Vendor Tag: ADO Release Tags: TZDATA2011M U src/share/zoneinfo/antarctica U src/share/zoneinfo/africa C src/share/zoneinfo/australasia U src/share/zoneinfo/asia U src/share/zoneinfo/iso3166.tab U src/share/zoneinfo/backward U src/share/zoneinfo/etcetera U src/share/zoneinfo/europe U src/share/zoneinfo/factory U src/share/zoneinfo/yearistype.sh U src/share/zoneinfo/leapseconds U src/share/zoneinfo/northamerica U src/share/zoneinfo/pacificnew U src/share/zoneinfo/solar87 U src/share/zoneinfo/solar88 U src/share/zoneinfo/solar89 U src/share/zoneinfo/southamerica U src/share/zoneinfo/systemv U src/share/zoneinfo/zone.tab 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jADO:yesterday -jADO src/share/zoneinfo
CVS commit: src/share/zoneinfo
Module Name:src Committed By: apb Date: Mon Oct 24 15:42:57 UTC 2011 Modified Files: src/share/zoneinfo: australasia Log Message: merge tzdata2011m To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.21 src/share/zoneinfo/australasia:1.22 --- src/share/zoneinfo/australasia:1.21 Mon Oct 10 19:35:07 2011 +++ src/share/zoneinfo/australasia Mon Oct 24 15:42:57 2011 @@ -1,5 +1,5 @@ # pre -# @(#)australasia 8.27 +# @(#)australasia 8.28 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson.
CVS commit: src/doc
Module Name:src Committed By: apb Date: Mon Oct 24 15:44:10 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: tzdata2011m is released and merged To generate a diff of this commit: cvs rdiff -u -r1.880 -r1.881 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.880 src/doc/3RDPARTY:1.881 --- src/doc/3RDPARTY:1.880 Tue Oct 18 12:42:19 2011 +++ src/doc/3RDPARTY Mon Oct 24 15:44:09 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.880 2011/10/18 12:42:19 reed Exp $ +# $NetBSD: 3RDPARTY,v 1.881 2011/10/24 15:44:09 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1099,8 +1099,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2011i / tzdata2011l -Current Vers: tzcode2011i / tzdata2011l +Version: tzcode2011i / tzdata2011m +Current Vers: tzcode2011i / tzdata2011m Maintainer: Arthur David Olson a...@elsie.nci.nih.gov Maintainer: Robert Elz k...@munnari.oz.au Archive Site: ftp://elsie.nci.nih.gov/pub/
CVS commit: src/doc
Module Name:src Committed By: apb Date: Mon Oct 24 15:44:56 UTC 2011 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2011m. [apb 20111024] To generate a diff of this commit: cvs rdiff -u -r1.1616 -r1.1617 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1616 src/doc/CHANGES:1.1617 --- src/doc/CHANGES:1.1616 Sat Oct 22 20:59:12 2011 +++ src/doc/CHANGES Mon Oct 24 15:44:56 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1616 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1617 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1141,3 +1141,4 @@ Changes from NetBSD 5.0 to NetBSD 6.0: zoneinfo: Import tzdata2011l. [apb 20111010] sqlite: Import of pre-release of SQLite 3.6.9 [joerg 20111013] vmt(4): Add a VMware Tools driver, from OpenBSD. [jmcneill 20111017] + zoneinfo: Import tzdata2011m. [apb 20111024]
CVS commit: src/sbin/atactl
Module Name:src
Committed By: jakllsch
Date: Mon Oct 24 15:56:17 UTC 2011
Modified Files:
src/sbin/atactl: atactl.c
Log Message:
change lines containing only whitespace to empty lines,
remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sbin/atactl/atactl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.60 src/sbin/atactl/atactl.c:1.61
--- src/sbin/atactl/atactl.c:1.60 Sat Aug 27 16:12:54 2011
+++ src/sbin/atactl/atactl.c Mon Oct 24 15:56:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atactl.c,v 1.60 2011/08/27 16:12:54 joerg Exp $ */
+/* $NetBSD: atactl.c,v 1.61 2011/10/24 15:56:17 jakllsch Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.60 2011/08/27 16:12:54 joerg Exp $);
+__RCSID($NetBSD: atactl.c,v 1.61 2011/10/24 15:56:17 jakllsch Exp $);
#endif
@@ -475,7 +475,7 @@ device_smart_temp(struct ata_smart_attr
{
printf(% PRIu8, attr-raw[0]);
if (attr-raw[0] != raw_value)
- printf( Lifetime min/max % PRIu8 /% PRIu8,
+ printf( Lifetime min/max % PRIu8 /% PRIu8,
attr-raw[2], attr-raw[4]);
}
@@ -531,8 +531,8 @@ print_smart_status(void *vbuf, void *tbu
if (attr-value == 0||attr-value == 0xFE||attr-value == 0xFF)
continue;
- for (aid = 0;
- smart_attrs[aid].id != i smart_attrs[aid].id != 0;
+ for (aid = 0;
+ smart_attrs[aid].id != i smart_attrs[aid].id != 0;
aid++)
;
@@ -667,12 +667,12 @@ print_error(void *buf)
printf(No errors have been logged\n);
return;
}
-
+
if (erlog-mostrecenterror 5) {
fprintf(stderr, Most recent error is too large\n);
return;
}
-
+
for (i = erlog-mostrecenterror; i 5; i++)
print_error_entry(i, erlog-log_entries[i]);
for (i = 0; i erlog-mostrecenterror; i++)
@@ -737,12 +737,12 @@ print_selftest(void *buf)
printf(No self-tests have been logged\n);
return;
}
-
+
if (stlog-mostrecenttest 22) {
fprintf(stderr, Most recent test is too large\n);
return;
}
-
+
for (i = stlog-mostrecenttest; i 22; i++)
print_selftest_entry(i, stlog-log_entries[i]);
for (i = 0; i stlog-mostrecenttest; i++)
@@ -957,13 +957,13 @@ device_identify(int argc, char *argv[])
humanize_number(hnum, sizeof(hnum), capacity, bytes,
HN_AUTOSCALE, HN_DIVISOR_1000);
- printf(Capacity %s, % PRIu64 sectors, % PRIu32 bytes/sector\n,
+ printf(Capacity %s, % PRIu64 sectors, % PRIu32 bytes/sector\n,
hnum, sectors, secsize);
printf(Cylinders: %d, heads: %d, sec/track: %d\n,
inqbuf-atap_cylinders, inqbuf-atap_heads,
inqbuf-atap_sectors);
-
+
lb_per_pb = 1;
if ((inqbuf-atap_secsz ATA_SECSZ_VALID_MASK) == ATA_SECSZ_VALID) {
@@ -1083,22 +1083,22 @@ device_apm(int argc, char *argv[])
if (argc = 1) {
req.command = SET_FEATURES;
req.timeout = 1000;
-
+
if (strcmp(argv[0], disable) == 0)
req.features = WDSF_APM_DS;
else if (strcmp(argv[0], set) == 0 argc = 2
(l = strtol(argv[1], NULL, 0)) = 0 l = 253) {
-
+
req.features = WDSF_APM_EN;
req.sec_count = l + 1;
} else
usage();
} else
usage();
-
+
ata_command(req);
}
-
+
/*
* Set the idle timer on the disk. Set it for either idle mode or
@@ -1244,7 +1244,7 @@ device_smart(int argc, char *argv[])
req.command = WDCC_SMART;
req.cylinder = WDSMART_CYL;
req.timeout = 1000;
-
+
ata_command(req);
if (req.cylinder != WDSMART_CYL) {
@@ -1266,7 +1266,7 @@ device_smart(int argc, char *argv[])
req.datalen = sizeof(inbuf);
req.cylinder = WDSMART_CYL;
req.timeout = 1000;
-
+
ata_command(req);
memset(inbuf2, 0, sizeof(inbuf2));
@@ -1309,7 +1309,7 @@ device_smart(int argc, char *argv[])
memset(inbuf, 0, sizeof(inbuf));
memset(req, 0, sizeof(req));
-
+
req.flags = ATACMD_READ;
req.features = WDSM_RD_LOG;
req.sec_count = 1;
@@ -1319,9 +1319,9 @@ device_smart(int argc, char *argv[])
req.datalen = sizeof(inbuf);
req.cylinder = WDSMART_CYL;
req.timeout = 1000;
-
+
ata_command(req);
-
+
print_error(inbuf);
} else if (strcmp(argv[0], selftest-log) == 0) {
if (!is_smart()) {
@@ -1331,7 +1331,7 @@ device_smart(int argc, char *argv[])
memset(inbuf, 0, sizeof(inbuf));
memset(req, 0, sizeof(req));
-
+
req.flags = ATACMD_READ;
req.features = WDSM_RD_LOG;
req.sec_count = 1;
@@ -1341,9 +1341,9 @@ device_smart(int argc, char *argv[])
req.datalen = sizeof(inbuf);
req.cylinder = WDSMART_CYL;
req.timeout = 1000;
-
+
ata_command(req);
-
+
print_selftest(inbuf);
} else {
CVS commit: src/sys/dev/pci
Module Name:src Committed By: njoly Date: Mon Oct 24 16:06:44 UTC 2011 Modified Files: src/sys/dev/pci: jmide_reg.h Log Message: Remove unused local defines for PCI_COMMAND_STATUS_REG bits (already available from pcireg.h). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/jmide_reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/jmide_reg.h diff -u src/sys/dev/pci/jmide_reg.h:1.3 src/sys/dev/pci/jmide_reg.h:1.4 --- src/sys/dev/pci/jmide_reg.h:1.3 Sat Jul 24 17:55:54 2010 +++ src/sys/dev/pci/jmide_reg.h Mon Oct 24 16:06:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: jmide_reg.h,v 1.3 2010/07/24 17:55:54 jakllsch Exp $*/ +/* $NetBSD: jmide_reg.h,v 1.4 2011/10/24 16:06:43 njoly Exp $*/ /* * Copyright (c) 2007 Manuel Bouyer. @@ -27,11 +27,6 @@ /* registers definitions for the JMicon JMB36x IDE/SATA controllers */ -/* special bits in command/status register (PCI_COMMAND_STATUS_REG) */ -#define PCI_STATUS_INT_STATUS 0x0008 /* interrupt pending */ -#define PCI_COMMAND_INT_DIS 0x0400 /* interrupt disable */ - - #define PCI_JM_CONTROL0 0x40 /* controller control register 0 */ #define JM_CONTROL0_ROM_EN 0x8000 /* external ROM enable */ #define JM_CONTROL0_ID_WR 0x4000 /* device ID write enable */
CVS commit: src/sys/dev/ata
Module Name:src Committed By: jakllsch Date: Mon Oct 24 16:09:58 UTC 2011 Modified Files: src/sys/dev/ata: atareg.h Log Message: Add defines for SET FEATURES for the SATA, PUIS and AAM feature sets. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ata/atareg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ata/atareg.h diff -u src/sys/dev/ata/atareg.h:1.38 src/sys/dev/ata/atareg.h:1.39 --- src/sys/dev/ata/atareg.h:1.38 Mon Jan 25 00:39:51 2010 +++ src/sys/dev/ata/atareg.h Mon Oct 24 16:09:58 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: atareg.h,v 1.38 2010/01/25 00:39:51 jakllsch Exp $ */ +/* $NetBSD: atareg.h,v 1.39 2011/10/24 16:09:58 jakllsch Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. @@ -194,7 +194,11 @@ atacmd_tostatq(int cmd32) #define WDSF_SET_MODE 0x03 #define WDSF_REASSIGN_EN 0x04 #define WDSF_APM_EN 0x05 +#define WDSF_PUIS_EN 0x06 +#define WDSF_PUIS_SPIN_UP 0x07 +#define WDSF_SATA_EN 0x10 #define WDSF_RETRY_DS 0x33 +#define WDSF_AAM_EN 0x42 #define WDSF_SET_CACHE_SGMT 0x54 #define WDSF_READAHEAD_DS 0x55 #define WDSF_POD_DS 0x66 @@ -202,13 +206,24 @@ atacmd_tostatq(int cmd32) #define WDSF_WRITE_CACHE_DS 0x82 #define WDSF_REASSIGN_DS 0x84 #define WDSF_APM_DS 0x85 +#define WDSF_PUIS_DS 0x86 #define WDSF_ECC_EN 0x88 +#define WDSF_SATA_DS 0x90 #define WDSF_RETRY_EN 0x99 #define WDSF_SET_CURRENT 0x9a #define WDSF_READAHEAD_EN 0xaa #define WDSF_PREFETCH_SET 0xab +#define WDSF_AAM_DS 0xc2 #define WDSF_POD_EN 0xcc +/* Subcommands for WDSF_SATA (count register) */ +#define WDSF_SATA_NONZERO_OFFSETS 0x01 +#define WDSF_SATA_DMA_SETUP_AUTO 0x02 +#define WDSF_SATA_DRIVE_PWR_MGMT 0x03 +#define WDSF_SATA_IN_ORDER_DATA 0x04 +#define WDSF_SATA_ASYNC_NOTIFY 0x05 +#define WDSF_SATA_SW_STTNGS_PRS 0x06 + /* Subcommands for SMART (features register) */ #define WDSM_RD_DATA 0xd0 #define WDSM_RD_THRESHOLDS 0xd1
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Mon Oct 24 16:12:26 UTC 2011 Added Files: src/external/gpl3/gdb/lib/libbfd/arch/sparc: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libbfd/arch/vax: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/sparc: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libdecnumber/arch/vax: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/sparc: config.h defs.mk init.c observer.h observer.inc version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdb/arch/vax: config.h defs.mk init.c observer.h observer.inc version.c xml-builtin.c src/external/gpl3/gdb/lib/libiberty/arch/sparc: config.h defs.mk src/external/gpl3/gdb/lib/libiberty/arch/vax: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/sparc: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/vax: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/sparc: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/vax: config.h defs.mk Log Message: Add sparc and vax. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/sparc/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/sparc/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/sparc/defs.mk \ src/external/gpl3/gdb/lib/libbfd/arch/sparc/targmatch.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libbfd/arch/vax/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/vax/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/vax/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/vax/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/vax/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/vax/defs.mk \ src/external/gpl3/gdb/lib/libbfd/arch/vax/targmatch.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libdecnumber/arch/sparc/config.h \ src/external/gpl3/gdb/lib/libdecnumber/arch/sparc/defs.mk \ src/external/gpl3/gdb/lib/libdecnumber/arch/sparc/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libdecnumber/arch/vax/config.h \ src/external/gpl3/gdb/lib/libdecnumber/arch/vax/defs.mk \ src/external/gpl3/gdb/lib/libdecnumber/arch/vax/gstdint.h cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libgdb/arch/sparc/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/sparc/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/sparc/init.c \ src/external/gpl3/gdb/lib/libgdb/arch/sparc/observer.h \ src/external/gpl3/gdb/lib/libgdb/arch/sparc/observer.inc \ src/external/gpl3/gdb/lib/libgdb/arch/sparc/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/sparc/xml-builtin.c cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libgdb/arch/vax/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/vax/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/vax/init.c \ src/external/gpl3/gdb/lib/libgdb/arch/vax/observer.h \ src/external/gpl3/gdb/lib/libgdb/arch/vax/observer.inc \ src/external/gpl3/gdb/lib/libgdb/arch/vax/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/vax/xml-builtin.c cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libiberty/arch/sparc/config.h \ src/external/gpl3/gdb/lib/libiberty/arch/sparc/defs.mk cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libiberty/arch/vax/config.h \ src/external/gpl3/gdb/lib/libiberty/arch/vax/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libopcodes/arch/sparc/config.h \ src/external/gpl3/gdb/lib/libopcodes/arch/sparc/defs.mk cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libopcodes/arch/vax/config.h \ src/external/gpl3/gdb/lib/libopcodes/arch/vax/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libreadline/arch/sparc/config.h \ src/external/gpl3/gdb/lib/libreadline/arch/sparc/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libreadline/arch/vax/config.h \ src/external/gpl3/gdb/lib/libreadline/arch/vax/defs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/bin/ln
Module Name:src Committed By: yamt Date: Mon Oct 24 16:15:46 UTC 2011 Modified Files: src/bin/ln: ln.1 Log Message: note what other ln implementations is. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/bin/ln/ln.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/ln/ln.1 diff -u src/bin/ln/ln.1:1.23 src/bin/ln/ln.1:1.24 --- src/bin/ln/ln.1:1.23 Sun Feb 27 06:02:07 2011 +++ src/bin/ln/ln.1 Mon Oct 24 16:15:46 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ln.1,v 1.23 2011/02/27 06:02:07 wiz Exp $ +.\ $NetBSD: ln.1,v 1.24 2011/10/24 16:15:46 yamt Exp $ .\ .\ Copyright (c) 1980, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -95,7 +95,7 @@ Same as .Fl h , for compatibility with other .Nm -implementations. +implementations, namely GNU coreutils. .It Fl s Create a symbolic link. .It Fl v
CVS commit: src/sys/arch
Module Name:src Committed By: christos Date: Mon Oct 24 16:49:02 UTC 2011 Modified Files: src/sys/arch: README Log Message: - Make the table of ports more machine readable: ^name\tarch\tdate\tdesc\n$ - Add the specific architecture instead of just the processor family where I knew it (please fill in the rest). - Add missing RS/6000 entry. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/README diff -u src/sys/arch/README:1.54 src/sys/arch/README:1.55 --- src/sys/arch/README:1.54 Thu Jan 27 14:09:06 2011 +++ src/sys/arch/README Mon Oct 24 12:49:02 2011 @@ -1,64 +1,62 @@ -$NetBSD: README,v 1.54 2011/01/27 19:09:06 pooka Exp $ +$NetBSD: README,v 1.55 2011/10/24 16:49:02 christos Exp $ -acorn26: Acorn ARM2- and ARM3-based machines (arm, 2509) -acorn32: Acorn computers Ltd. ARM 6/7/SA based machines (arm, 2008) -algor: Algorithmics, Ltd. MIPS evaluation boards (mips, 20010528) -alpha: Compaq (formerly Digital Equipment Corp.) Alpha (alpha, 19950213) -amd64: AMD's x86 64 bit architecture (x86_64, 20010619) -amiga: Commodore et al. Amiga (m68k, 19930902) -amigappc: Phase 5 Amiga (powerpc, 2525) -arc: MIPS Advanced Risc Computing spec machines (mips, 2123) -atari: Atari TT30, Falcon, and Hades (m68k, 19950326) -bebox: Be Inc. BeBox (powerpc, 19971014) -cats: Chalice Technologies, CATS motherboard (arm, 19981005) -cesfic: FIC8234 VME processor board (m68k, 20010514) -cobalt: Cobalt Networks Microservers (mips, 2319) -dreamcast: SEGA Dreamcast (sh3, 20010107) -emips: Machines based on Extensible MIPS (mips, 20110126) -evbarm: ARM-based eval boards (arm, 20010905) -evbmips: MIPS-based eval boards (mips, 20020307) -evbppc: PowerPC-based eval boards (powerpc, 20021209) -evbsh3: Hitachi SuperH(TM) sh3 and sh4 eval boards (sh3, 20010206) -ews4800mips: NEC's MIPS based EWS4800 workstations (ews4800mips, 20051229) -hp300: Hewlett Packard 300- and 400-series machines (m68k, 19930512) -hp700: Hewlett Packard 700-series machines (hppa, 20020606) -hpcarm: ARM based handheld PCs (arm, 20010220) -hpcmips: MIPS based handheld PCs (mips, 19990925) -hpcsh: Hitachi SuperH(TM) based handheld PCs (sh3, 20010117) -i386: Intel/AMD etc. x86 processor line (i386, 19930321) -ia64: Intel Itanium/Itanium2 processor based workstations (ia64, -) -ibmnws: IBM Network Station Thin Clients (powerpc, -) -iyonix: Castle Technology xscale based workstations (arm, 20040713) -landisk: SH4 processor based NAS appliances by I-O DATA (sh3, 20060901) -luna68k: LUNA product line of OMRON Tateishi Electric (m68k, 2105) -mac68k: Apple Macintosh (m68k, 19930929) -macppc: Apple Power Macintosh and clones (powerpc, 19980515) -mipsco: MIPS Corp Magnum 3000 computers (mips, 2812) -mmeye: Hitachi SuperH(TM) computer controlled camera (sh3) -mvme68k: Motorola's VMEbus 68K based single board computers (m68k, 19950725) -mvmeppc: Motorola's PowerPC machines running older PPCBUG - (powerpc, 20020227) -netwinder: StrongARM based Netwinder machines (arm, 20010609) -news68k: Sony's m68k based NET WORK STATION (m68k, 19991209) -newsmips: Sony's MIPS based NET WORK STATION (mips, 19980218) -next68k: NeXT Computer's cubes and slabs (m68k, 19980609) -ofppc: Open Firmware based PowerPC machines (powerpc, 19980528) -pmax: Digital Equipment Corp. MIPS based machines (mips, 19931012) -prep: PowerPC Reference Platform machines (powerpc, 2229) -sandpoint: Motorola Sandpoint reference platform and DINK32 machines - (powerpc, 20010211) -sbmips: Broadcom's SiByte processor evaluation boards (mips, 20020306) -sgimips: MIPS based Silicon Graphics machines (mips, 2614) -shark: Digital Network Appliance Reference Design (Shark) (arm, 19960131) -sparc: Sun Microsystems SPARC (sun4, sun4c, sun4m) 32 bit machines - (sparc, 19931002) -sparc64: Sun Microsystems UltraSPARC 64 bit machines (sparc64/sparc, 19980620) -sun2: Sun m68010 based machines (m68k, 20010328) -sun3: Sun m680[23]0 based machines (m68k, 19930625) -vax: Digital Equipment Corp. VAX machines (vax, 19940802) -x68k: Sharp X68000, X68030 (m68k, 19960505) -xen: Xen virtual machine monitor (xen, 20040311) -zaurus: Sharp Zaurus C3x00 PDAs (arm, 20061217) +acorn26 arm 2509 Acorn ARM2- and ARM3-based machines +acorn32 arm 2008 Acorn computers Ltd. ARM 6/7/SA based machines +algor mips 20010528 Algorithmics, Ltd. MIPS evaluation boards +alpha alpha 19950213 Compaq (formerly Digital Equipment Corp.) Alpha +amd64 x86_64 20010619 AMD's x86 64 bit architecture +amiga m68k 19930902 Commodore et al. Amiga +amigappc powerpc 2525 Phase 5 Amiga +arc mips 2123 MIPS Advanced Risc Computing spec machines +atari m68k 19950326 Atari TT30, Falcon, and Hades +bebox powerpc 19971014 Be Inc. BeBox +cats arm 19981005 Chalice Technologies, CATS
CVS commit: src/sys/arch
Module Name:src Committed By: christos Date: Mon Oct 24 17:21:29 UTC 2011 Modified Files: src/sys/arch: README Log Message: add all the possible build types for each arch To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/README diff -u src/sys/arch/README:1.55 src/sys/arch/README:1.56 --- src/sys/arch/README:1.55 Mon Oct 24 12:49:02 2011 +++ src/sys/arch/README Mon Oct 24 13:21:29 2011 @@ -1,39 +1,39 @@ -$NetBSD: README,v 1.55 2011/10/24 16:49:02 christos Exp $ +$NetBSD: README,v 1.56 2011/10/24 17:21:29 christos Exp $ acorn26 arm 2509 Acorn ARM2- and ARM3-based machines acorn32 arm 2008 Acorn computers Ltd. ARM 6/7/SA based machines -algor mips 20010528 Algorithmics, Ltd. MIPS evaluation boards +algor mipsel,mips64el 20010528 Algorithmics, Ltd. MIPS evaluation boards alpha alpha 19950213 Compaq (formerly Digital Equipment Corp.) Alpha amd64 x86_64 20010619 AMD's x86 64 bit architecture amiga m68k 19930902 Commodore et al. Amiga amigappc powerpc 2525 Phase 5 Amiga -arc mips 2123 MIPS Advanced Risc Computing spec machines +arc mipsel,mips64el 2123 MIPS Advanced Risc Computing spec machines atari m68k 19950326 Atari TT30, Falcon, and Hades bebox powerpc 19971014 Be Inc. BeBox cats arm 19981005 Chalice Technologies, CATS motherboard cesfic m68k 20010514 FIC8234 VME processor board -cobalt mips 2319 Cobalt Networks Microservers -dreamcast sh3 20010107 SEGA Dreamcast -emips mips 20110126 Machines based on Extensible MIPS +cobalt mipsel,mips64el 2319 Cobalt Networks Microservers +dreamcast sh3el 20010107 SEGA Dreamcast +emips mipseb 20110126 Machines based on Extensible MIPS evbarm armeb 20010905 ARM-based eval boards -evbmips mips64el 20020307 MIPS-based eval boards -evbppc powerpc 20021209 PowerPC-based eval boards -evbsh3 sh3 20010206 Hitachi SuperH(TM) sh3 and sh4 eval boards -ews4800mips mips 20051229 NEC's MIPS based EWS4800 workstations +evbmips mipseb,mipsel,mips64eb,mips64el 20020307 MIPS-based eval boards +evbppc powerpc,powerpc64 20021209 PowerPC-based eval boards +evbsh3 sh3eb,sh3el 20010206 Hitachi SuperH(TM) sh3 and sh4 eval boards +ews4800mips mipseb 20051229 NEC's MIPS based EWS4800 workstations hp300 m68k 19930512 Hewlett Packard 300- and 400-series machines hp700 hppa 20020606 Hewlett Packard 700-series machines hpcarm arm 20010220 ARM based handheld PCs -hpcmips mips 19990925 MIPS based handheld PCs +hpcmips mipsel 19990925 MIPS based handheld PCs hpcsh sh3el 20010117 Hitachi SuperH(TM) based handheld PCs i386 i386 19930321 Intel/AMD etc. x86 processor line ia64 ia64 Intel Itanium/Itanium2 processor based workstations ibmnws powerpc IBM Network Station Thin Clients iyonix arm 20040713 Castle Technology xscale based workstations -landisk sh3 20060901 SH4 processor based NAS appliances by I-O DATA +landisk sh3el 20060901 SH4 processor based NAS appliances by I-O DATA luna68k m68k 2105 LUNA product line of OMRON Tateishi Electric mac68k m68k 19930929 Apple Macintosh -macppc powerpc 19980515 Apple Power Macintosh and clones -mipsco mips 2812 MIPS Corp Magnum 3000 computers +macppc powerpc,powerpc64 19980515 Apple Power Macintosh and clones +mipsco mipseb 2812 MIPS Corp Magnum 3000 computers mmeye sh3eb 19990913 Hitachi SuperH(TM) computer controlled camera mvme68k m68k 19950725 Motorola's VMEbus 68K based single board computers mvmeppc powerpc 20020227 Motorola's PowerPC machines running older PPCBUG @@ -41,13 +41,13 @@ netwinder arm 20010609 StrongARM based N news68k m68k 19991209 Sony's m68k based NET WORK STATION newsmips mipseb 19980218 Sony's MIPS based NET WORK STATION next68k m68k 19980609 NeXT Computer's cubes and slabs -ofppc powerpc 19980528 Open Firmware based PowerPC machines -pmax mipsel 19931012 Digital Equipment Corp. MIPS based machines +ofppc powerpc,powerpc64 19980528 Open Firmware based PowerPC machines +pmax mipsel,mips64el 19931012 Digital Equipment Corp. MIPS based machines prep powerpc 2229 PowerPC Reference Platform machines rs6000 powerpc 20071217 MCA-based IBM RS/6000 wokstations sandpoint powerpc 20010211 Motorola Sandpoint reference platform and DINK32 machines -sbmips mips 20020306 Broadcom's SiByte processor evaluation boards -sgimips mips64eb 2614 MIPS based Silicon Graphics machines +sbmips mipseb,mipsel,mips64eb,mips64el 20020306 Broadcom's SiByte processor evaluation boards +sgimips mipseb,mips64eb 2614 MIPS based Silicon Graphics machines shark arm 19960131 Digital Network Appliance Reference Design (Shark) sparc sparc 19931002 Sun Microsystems SPARC (sun4, sun4c, sun4m) 32 bit machines sparc64 sparc64/sparc 19980620 Sun Microsystems UltraSPARC 64 bit machines
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: jym
Date: Mon Oct 24 18:13:51 UTC 2011
Modified Files:
src/sys/arch/xen/xen: xbdback_xenbus.c
Log Message:
Move disconnection code to a separate function, similar to what is done
with xbdback_connect.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/xen/xen/xbdback_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.46 src/sys/arch/xen/xen/xbdback_xenbus.c:1.47
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.46 Wed Aug 24 20:49:34 2011
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Mon Oct 24 18:13:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.46 2011/08/24 20:49:34 jym Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.47 2011/10/24 18:13:50 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.46 2011/08/24 20:49:34 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbdback_xenbus.c,v 1.47 2011/10/24 18:13:50 jym Exp $);
#include sys/types.h
#include sys/param.h
@@ -628,12 +628,31 @@ err:
return -1;
}
+static int
+xbdback_disconnect(struct xbdback_instance *xbdi)
+{
+ int s;
+
+ hypervisor_mask_event(xbdi-xbdi_evtchn);
+ event_remove_handler(xbdi-xbdi_evtchn, xbdback_evthandler,
+ xbdi);
+ xbdi-xbdi_status = DISCONNECTING;
+ s = splbio();
+ xbdi_put(xbdi);
+ while (xbdi-xbdi_status != DISCONNECTED) {
+ tsleep(xbdi-xbdi_status, PRIBIO, xbddis, 0);
+ }
+ splx(s);
+ xenbus_switch_state(xbdi-xbdi_xbusd, NULL, XenbusStateClosing);
+
+ return 0;
+}
+
static void
xbdback_frontend_changed(void *arg, XenbusState new_state)
{
struct xbdback_instance *xbdi = arg;
struct xenbus_device *xbusd = xbdi-xbdi_xbusd;
- int s;
XENPRINTF((xbdback %s: new state %d\n, xbusd-xbusd_path, new_state));
switch(new_state) {
@@ -646,17 +665,7 @@ xbdback_frontend_changed(void *arg, Xenb
xbdback_connect(xbdi);
break;
case XenbusStateClosing:
- hypervisor_mask_event(xbdi-xbdi_evtchn);
- event_remove_handler(xbdi-xbdi_evtchn, xbdback_evthandler,
- xbdi);
- xbdi-xbdi_status = DISCONNECTING;
- s = splbio();
- xbdi_put(xbdi);
- while (xbdi-xbdi_status != DISCONNECTED) {
- tsleep(xbdi-xbdi_status, PRIBIO, xbddis, 0);
- }
- splx(s);
- xenbus_switch_state(xbusd, NULL, XenbusStateClosing);
+ xbdback_disconnect(xbdi);
break;
case XenbusStateClosed:
/* otherend_changed() should handle it for us */
CVS commit: src/external/gpl3/gdb
Module Name:src
Committed By: mrg
Date: Mon Oct 24 18:42:41 UTC 2011
Modified Files:
src/external/gpl3/gdb/dist/gdb/config/sparc: nbsdelf.mh
src/external/gpl3/gdb/lib/libgdb/arch/sparc: defs.mk
Log Message:
add nbsd-nat.o to NATDEPFILES. fixes gdb link issues.
normalise with sparc64 version.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gdb/dist/gdb/config/sparc/nbsdelf.mh
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libgdb/arch/sparc/defs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/config/sparc/nbsdelf.mh
diff -u src/external/gpl3/gdb/dist/gdb/config/sparc/nbsdelf.mh:1.1.1.1 src/external/gpl3/gdb/dist/gdb/config/sparc/nbsdelf.mh:1.2
--- src/external/gpl3/gdb/dist/gdb/config/sparc/nbsdelf.mh:1.1.1.1 Sat Sep 24 20:14:57 2011
+++ src/external/gpl3/gdb/dist/gdb/config/sparc/nbsdelf.mh Mon Oct 24 18:42:41 2011
@@ -1,5 +1,5 @@
# Host: NetBSD/sparc ELF
NATDEPFILES= fork-child.o inf-ptrace.o \
- sparc-nat.o sparcnbsd-nat.o bsd-kvm.o
+ nbsd-nat.o sparcnbsd-nat.o sparc-nat.o bsd-kvm.o
LOADLIBES= -lkvm
Index: src/external/gpl3/gdb/lib/libgdb/arch/sparc/defs.mk
diff -u src/external/gpl3/gdb/lib/libgdb/arch/sparc/defs.mk:1.1 src/external/gpl3/gdb/lib/libgdb/arch/sparc/defs.mk:1.2
--- src/external/gpl3/gdb/lib/libgdb/arch/sparc/defs.mk:1.1 Mon Oct 24 16:12:25 2011
+++ src/external/gpl3/gdb/lib/libgdb/arch/sparc/defs.mk Mon Oct 24 18:42:41 2011
@@ -3,5 +3,5 @@
# Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp
#
G_INTERNAL_CFLAGS=-I. -I${GNUHOSTDIST}/gdb -I${GNUHOSTDIST}/gdb/common -I${GNUHOSTDIST}/gdb/config -DLOCALEDIR=\/usr/share/locale\ -DHAVE_CONFIG_H -I${GNUHOSTDIST}/gdb/../include/opcode -I${GNUHOSTDIST}/gdb/../opcodes/.. -I${GNUHOSTDIST}/gdb/../readline/.. -I../bfd -I${GNUHOSTDIST}/gdb/../bfd -I${GNUHOSTDIST}/gdb/../include -I../libdecnumber -I${GNUHOSTDIST}/gdb/../libdecnumber -I./../intl -I${GNUHOSTDIST}/gdb/gnulib -Ignulib -DMI_OUT=1 -DTUI=1 -Wall -Wdeclaration-after-statement -Wpointer-arith -Wformat-nonliteral -Wno-pointer-sign -Wno-unused -Wunused-value -Wunused-function -Wno-switch -Wno-char-subscripts
-G_LIBGDB_OBS=sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o corelow.o solib.o solib-svr4.o ser-base.o ser-unix.o ser-pipe.o ser-tcp.o fork-child.o inf-ptrace.o sparc-nat.o sparcnbsd-nat.o bsd-kvm.o remote.o dcache.o tracepoint.o ax-general.o ax-gdb.o remote-fileio.o cli-dump.o cli-decode.o cli-script.o cli-cmds.o cli-setshow.o cli-logging.o cli-interp.o cli-utils.o mi-out.o mi-console.o mi-cmds.o mi-cmd-env.o mi-cmd-var.o mi-cmd-break.o mi-cmd-stack.o mi-cmd-file.o mi-cmd-disas.o mi-symbol-cmds.o mi-cmd-target.o mi-interp.o mi-main.o mi-parse.o mi-getopt.o tui-command.o tui-data.o tui-disasm.o tui-file.o tui.o tui-hooks.o tui-interp.o tui-io.o tui-layout.o tui-out.o tui-main.o tui-regs.o tui-source.o tui-stack.o tui-win.o tui-windata.o tui-wingeneral.o tui-winsource.o tui.o python.o py-value.o py-prettyprint.o py-auto-load.o elfread.o posix-hdep.o c-exp.o cp-name-parser.o objc-exp.o ada-exp.o jv-exp.o f-exp.o m2-exp.o p-exp.o version.o annotate.o
addrmap.o auxv.o bfd-target.o blockframe.o breakpoint.o findvar.o regcache.o charset.o disasm.o dummy-frame.o dfp.o source.o value.o eval.o valops.o valarith.o valprint.o printcmd.o block.o symtab.o psymtab.o symfile.o symmisc.o linespec.o dictionary.o infcall.o infcmd.o infrun.o expprint.o environ.o stack.o thread.o exceptions.o filesystem.o inf-child.o interps.o main.o macrotab.o macrocmd.o macroexp.o macroscope.o mi-common.o event-loop.o event-top.o inf-loop.o completer.o gdbarch.o arch-utils.o gdbtypes.o osabi.o copying.o memattr.o mem-break.o target.o parse.o language.o buildsym.o findcmd.o std-regs.o signals.o exec.o reverse.o bcache.o objfiles.o observer.o minsyms.o maint.o demangle.o dbxread.o coffread.o coff-pe-read.o dwarf2read.o mipsread.o stabsread.o corefile.o dwarf2expr.o dwarf2loc.o dwarf2-frame.o ada-lang.o c-lang.o d-lang.o f-lang.o objc-lang.o ada-tasks.o ui-out.o cli-out.o varobj.o vec.o wrapper.o jv-lang.o jv-valprint.o jv
-typeprint.o m2-lang.o opencl-lang.o p-lang.o p-typeprint.o p-valprint.o sentinel-frame.o complaints.o typeprint.o ada-typeprint.o c-typeprint.o f-typeprint.o m2-typeprint.o ada-valprint.o c-valprint.o cp-valprint.o d-valprint.o f-valprint.o m2-valprint.o serial.o mdebugread.o top.o utils.o ui-file.o user-regs.o frame.o frame-unwind.o doublest.o frame-base.o inline-frame.o gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o cp-namespace.o reggroups.o regset.o trad-frame.o tramp-frame.o solib.o solib-target.o prologue-value.o memory-map.o memrange.o xml-support.o xml-syscall.o target-descriptions.o target-memory.o xml-tdesc.o xml-builtin.o inferior.o osdata.o gdb_usleep.o record.o gcore.o
CVS commit: src/sbin/atactl
Module Name:src
Committed By: jakllsch
Date: Mon Oct 24 19:13:04 UTC 2011
Modified Files:
src/sbin/atactl: atactl.c
Log Message:
constify
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sbin/atactl/atactl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.61 src/sbin/atactl/atactl.c:1.62
--- src/sbin/atactl/atactl.c:1.61 Mon Oct 24 15:56:17 2011
+++ src/sbin/atactl/atactl.c Mon Oct 24 19:13:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atactl.c,v 1.61 2011/10/24 15:56:17 jakllsch Exp $ */
+/* $NetBSD: atactl.c,v 1.62 2011/10/24 19:13:03 jakllsch Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.61 2011/10/24 15:56:17 jakllsch Exp $);
+__RCSID($NetBSD: atactl.c,v 1.62 2011/10/24 19:13:03 jakllsch Exp $);
#endif
@@ -102,14 +102,14 @@ struct bitinfo {
__dead static void usage(void);
static void ata_command(struct atareq *);
-static void print_bitinfo(const char *, const char *, u_int, struct bitinfo *);
-static void print_bitinfo2(const char *, const char *, u_int, u_int, struct bitinfo *);
+static void print_bitinfo(const char *, const char *, u_int, const struct bitinfo *);
+static void print_bitinfo2(const char *, const char *, u_int, u_int, const struct bitinfo *);
static void print_smart_status(void *, void *);
-static void print_error_entry(int, struct ata_smart_error *);
-static void print_selftest_entry(int, struct ata_smart_selftest *);
+static void print_error_entry(int, const struct ata_smart_error *);
+static void print_selftest_entry(int, const struct ata_smart_selftest *);
-static void print_error(void *);
-static void print_selftest(void *);
+static void print_error(const void *);
+static void print_selftest(const void *);
static struct ataparams *getataparams(void);
@@ -129,9 +129,9 @@ static void device_checkpower(int, char
static void device_smart(int, char *[]);
static void device_security(int, char *[]);
-static void device_smart_temp(struct ata_smart_attr *, uint64_t);
+static void device_smart_temp(const struct ata_smart_attr *, uint64_t);
-static struct command device_commands[] = {
+static const struct command device_commands[] = {
{ identify, , device_identify },
{ setidle, idle-timer, device_setidle },
{ apm, disable|set #, device_apm },
@@ -148,7 +148,7 @@ static struct command device_commands[]
static void bus_reset(int, char *[]);
-static struct command bus_commands[] = {
+static const struct command bus_commands[] = {
{ reset, , bus_reset },
{ NULL, NULL, NULL },
};
@@ -158,7 +158,7 @@ static struct command bus_commands[] = {
* device identification.
*/
-static struct bitinfo ata_caps[] = {
+static const struct bitinfo ata_caps[] = {
{ WDC_CAP_DMA, DMA },
{ WDC_CAP_LBA, LBA },
{ ATA_CAP_STBY, ATA standby timer values },
@@ -167,7 +167,7 @@ static struct bitinfo ata_caps[] = {
{ 0, NULL },
};
-static struct bitinfo ata_vers[] = {
+static const struct bitinfo ata_vers[] = {
{ WDC_VER_ATA1, ATA-1 },
{ WDC_VER_ATA2, ATA-2 },
{ WDC_VER_ATA3, ATA-3 },
@@ -178,7 +178,7 @@ static struct bitinfo ata_vers[] = {
{ 0, NULL },
};
-static struct bitinfo ata_cmd_set1[] = {
+static const struct bitinfo ata_cmd_set1[] = {
{ WDC_CMD1_NOP, NOP command },
{ WDC_CMD1_RB, READ BUFFER command },
{ WDC_CMD1_WB, WRITE BUFFER command },
@@ -196,7 +196,7 @@ static struct bitinfo ata_cmd_set1[] = {
{ 0, NULL },
};
-static struct bitinfo ata_cmd_set2[] = {
+static const struct bitinfo ata_cmd_set2[] = {
{ ATA_CMD2_FCE, FLUSH CACHE EXT command },
{ WDC_CMD2_FC, FLUSH CACHE command },
{ WDC_CMD2_DCO, Device Configuration Overlay feature set },
@@ -213,7 +213,7 @@ static struct bitinfo ata_cmd_set2[] = {
{ 0, NULL },
};
-static struct bitinfo ata_cmd_ext[] = {
+static const struct bitinfo ata_cmd_ext[] = {
{ ATA_CMDE_TLCONT, Time-limited R/W feature set R/W Continuous mode },
{ ATA_CMDE_TL, Time-limited Read/Write },
{ ATA_CMDE_URGW, URG bit for WRITE STREAM DMA/PIO },
@@ -230,7 +230,7 @@ static struct bitinfo ata_cmd_ext[] = {
{ 0, NULL },
};
-static struct bitinfo ata_sata_caps[] = {
+static const struct bitinfo ata_sata_caps[] = {
{ SATA_SIGNAL_GEN1, 1.5Gb/s signaling },
{ SATA_SIGNAL_GEN2, 3.0Gb/s signaling },
{ SATA_NATIVE_CMDQ, Native Command Queuing },
@@ -239,7 +239,7 @@ static struct bitinfo ata_sata_caps[] =
{ 0, NULL },
};
-static struct bitinfo ata_sata_feat[] = {
+static const struct bitinfo ata_sata_feat[] = {
{ SATA_NONZERO_OFFSETS, Non-zero Offset DMA },
{ SATA_DMA_SETUP_AUTO, DMA Setup Auto Activate },
{ SATA_DRIVE_PWR_MGMT, Device-Initiated Interface Power Managment },
@@ -251,7 +251,7 @@ static struct bitinfo ata_sata_feat[] =
static const struct {
const int id;
const char
CVS commit: src/sbin/atactl
Module Name:src
Committed By: jakllsch
Date: Mon Oct 24 19:15:42 UTC 2011
Modified Files:
src/sbin/atactl: atactl.c
Log Message:
use C99 fixed-width integer types
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sbin/atactl/atactl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.62 src/sbin/atactl/atactl.c:1.63
--- src/sbin/atactl/atactl.c:1.62 Mon Oct 24 19:13:03 2011
+++ src/sbin/atactl/atactl.c Mon Oct 24 19:15:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atactl.c,v 1.62 2011/10/24 19:13:03 jakllsch Exp $ */
+/* $NetBSD: atactl.c,v 1.63 2011/10/24 19:15:42 jakllsch Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.62 2011/10/24 19:13:03 jakllsch Exp $);
+__RCSID($NetBSD: atactl.c,v 1.63 2011/10/24 19:15:42 jakllsch Exp $);
#endif
@@ -55,38 +55,38 @@ __RCSID($NetBSD: atactl.c,v 1.62 2011/1
struct ata_smart_error {
struct {
- u_int8_t device_control;
- u_int8_t features;
- u_int8_t sector_count;
- u_int8_t sector_number;
- u_int8_t cylinder_low;
- u_int8_t cylinder_high;
- u_int8_t device_head;
- u_int8_t command;
- u_int8_t timestamp[4];
+ uint8_t device_control;
+ uint8_t features;
+ uint8_t sector_count;
+ uint8_t sector_number;
+ uint8_t cylinder_low;
+ uint8_t cylinder_high;
+ uint8_t device_head;
+ uint8_t command;
+ uint8_t timestamp[4];
} command[5];
struct {
- u_int8_t reserved;
- u_int8_t error;
- u_int8_t sector_count;
- u_int8_t sector_number;
- u_int8_t cylinder_low;
- u_int8_t cylinder_high;
- u_int8_t device_head;
- u_int8_t status;
- u_int8_t extended_error[19];
- u_int8_t state;
- u_int8_t lifetime[2];
+ uint8_t reserved;
+ uint8_t error;
+ uint8_t sector_count;
+ uint8_t sector_number;
+ uint8_t cylinder_low;
+ uint8_t cylinder_high;
+ uint8_t device_head;
+ uint8_t status;
+ uint8_t extended_error[19];
+ uint8_t state;
+ uint8_t lifetime[2];
} error_data;
} __packed;
struct ata_smart_errorlog {
- u_int8_t data_structure_revision;
- u_int8_t mostrecenterror;
+ uint8_t data_structure_revision;
+ uint8_t mostrecenterror;
struct ata_smart_error log_entries[5];
- u_int16_t device_error_count;
- u_int8_t reserved[57];
- u_int8_t checksum;
+ uint16_t device_error_count;
+ uint8_t reserved[57];
+ uint8_t checksum;
} __packed;
struct command {
@@ -494,17 +494,17 @@ print_smart_status(void *vbuf, void *tbu
int flags;
int i, j;
int aid;
- u_int8_t checksum;
+ uint8_t checksum;
for (i = checksum = 0; i 512; i++)
- checksum += ((const u_int8_t *) value_buf)[i];
+ checksum += ((const uint8_t *) value_buf)[i];
if (checksum != 0) {
fprintf(stderr, SMART attribute values checksum error\n);
return;
}
for (i = checksum = 0; i 512; i++)
- checksum += ((const u_int8_t *) threshold_buf)[i];
+ checksum += ((const uint8_t *) threshold_buf)[i];
if (checksum != 0) {
fprintf(stderr, SMART attribute thresholds checksum error\n);
return;
@@ -566,7 +566,7 @@ static const struct {
{ 127, Abort off-line test },
{ 129, Short captive },
{ 130, Extended captive },
- { 256, Unknown test }, /* larger then u_int8_t */
+ { 256, Unknown test }, /* larger then uint8_t */
{ 0, NULL }
};
@@ -647,11 +647,11 @@ static void
print_error(const void *buf)
{
const struct ata_smart_errorlog *erlog = buf;
- u_int8_t checksum;
+ uint8_t checksum;
int i;
for (i = checksum = 0; i 512; i++)
- checksum += ((const u_int8_t *) buf)[i];
+ checksum += ((const uint8_t *) buf)[i];
if (checksum != 0) {
fprintf(stderr, SMART error log checksum error\n);
return;
@@ -717,11 +717,11 @@ static void
print_selftest(const void *buf)
{
const struct ata_smart_selftestlog *stlog = buf;
- u_int8_t checksum;
+ uint8_t checksum;
int i;
for (i = checksum = 0; i 512; i++)
- checksum += ((const u_int8_t *) buf)[i];
+ checksum += ((const uint8_t *) buf)[i];
if (checksum != 0) {
fprintf(stderr, SMART selftest log checksum error\n);
return;
CVS commit: src/sys/dev/ata
Module Name:src
Committed By: jakllsch
Date: Mon Oct 24 20:52:34 UTC 2011
Modified Files:
src/sys/dev/ata: atareg.h
Log Message:
SATA_SIGNAL_GEN3 definition for Serial ATA capabilities word in
IDENTIFY DEVICE structure.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ata/atareg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/atareg.h
diff -u src/sys/dev/ata/atareg.h:1.39 src/sys/dev/ata/atareg.h:1.40
--- src/sys/dev/ata/atareg.h:1.39 Mon Oct 24 16:09:58 2011
+++ src/sys/dev/ata/atareg.h Mon Oct 24 20:52:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atareg.h,v 1.39 2011/10/24 16:09:58 jakllsch Exp $ */
+/* $NetBSD: atareg.h,v 1.40 2011/10/24 20:52:34 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -367,6 +367,7 @@ struct ataparams {
uint16_t atap_sata_caps; /* 76: */
#define SATA_SIGNAL_GEN1 0x02
#define SATA_SIGNAL_GEN2 0x04
+#define SATA_SIGNAL_GEN3 0x08
#define SATA_NATIVE_CMDQ 0x0100
#define SATA_HOST_PWR_MGMT 0x0200
#define SATA_PHY_EVNT_CNT 0x0400
CVS commit: src/sys/dev/pci/hdaudio
Module Name:src
Committed By: jmcneill
Date: Mon Oct 24 22:20:59 UTC 2011
Modified Files:
src/sys/dev/pci/hdaudio: hdaudio_ids.c hdaudio_ids.h
Log Message:
add VMware codec ID
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/hdaudio/hdaudio_ids.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/hdaudio/hdaudio_ids.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/hdaudio/hdaudio_ids.c
diff -u src/sys/dev/pci/hdaudio/hdaudio_ids.c:1.4 src/sys/dev/pci/hdaudio/hdaudio_ids.c:1.5
--- src/sys/dev/pci/hdaudio/hdaudio_ids.c:1.4 Thu Oct 6 22:25:00 2011
+++ src/sys/dev/pci/hdaudio/hdaudio_ids.c Mon Oct 24 22:20:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_ids.c,v 1.4 2011/10/06 22:25:00 jmcneill Exp $ */
+/* $NetBSD: hdaudio_ids.c,v 1.5 2011/10/24 22:20:59 jmcneill Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio_ids.c,v 1.4 2011/10/06 22:25:00 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio_ids.c,v 1.5 2011/10/24 22:20:59 jmcneill Exp $);
#include sys/types.h
#include sys/param.h
@@ -241,6 +241,9 @@ static const struct hdaudio_id {
{ HDA_VENDOR_SIGMATEL2, 0x76d4, 92HD83C1C5 },
{ HDA_VENDOR_SIGMATEL2, 0x76d5, 92HD81B1C5 },
{ HDA_VENDOR_SIGMATEL2, HDA_PRODUCT_ANY, Sigmatel },
+ /* VMware */
+ { HDA_VENDOR_VMWARE, 0x1975, Virtual HDA },
+ { HDA_VENDOR_VMWARE, HDA_PRODUCT_ANY, VMware },
};
void
Index: src/sys/dev/pci/hdaudio/hdaudio_ids.h
diff -u src/sys/dev/pci/hdaudio/hdaudio_ids.h:1.2 src/sys/dev/pci/hdaudio/hdaudio_ids.h:1.3
--- src/sys/dev/pci/hdaudio/hdaudio_ids.h:1.2 Mon Sep 13 22:37:02 2010
+++ src/sys/dev/pci/hdaudio/hdaudio_ids.h Mon Oct 24 22:20:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_ids.h,v 1.2 2010/09/13 22:37:02 jmcneill Exp $ */
+/* $NetBSD: hdaudio_ids.h,v 1.3 2011/10/24 22:20:59 jmcneill Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -38,6 +38,7 @@
#define HDA_VENDOR_SIGMATEL2 0x111d
#define HDA_VENDOR_ANALOG_DEVICES 0x11d4
#define HDA_VENDOR_CONEXANT 0x14f1
+#define HDA_VENDOR_VMWARE 0x15ad
#define HDA_VENDOR_CMEDIA 0x434d
#define HDA_VENDOR_INTEL 0x8086
#define HDA_VENDOR_SIGMATEL 0x8384
CVS commit: src/sys/dev/pci/hdaudio
Module Name:src
Committed By: jmcneill
Date: Tue Oct 25 00:00:13 UTC 2011
Modified Files:
src/sys/dev/pci/hdaudio: hdafg.c
Log Message:
hdafg_halt_output: disable digital output
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/hdaudio/hdafg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/hdaudio/hdafg.c
diff -u src/sys/dev/pci/hdaudio/hdafg.c:1.9 src/sys/dev/pci/hdaudio/hdafg.c:1.10
--- src/sys/dev/pci/hdaudio/hdafg.c:1.9 Mon Oct 24 02:08:22 2011
+++ src/sys/dev/pci/hdaudio/hdafg.c Tue Oct 25 00:00:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.9 2011/10/24 02:08:22 jmcneill Exp $ */
+/* $NetBSD: hdafg.c,v 1.10 2011/10/25 00:00:13 jmcneill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.9 2011/10/24 02:08:22 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.10 2011/10/25 00:00:13 jmcneill Exp $);
#include sys/types.h
#include sys/param.h
@@ -3840,6 +3840,34 @@ static int
hdafg_halt_output(void *opaque)
{
struct hdaudio_audiodev *ad = opaque;
+ struct hdafg_softc *sc = ad-ad_sc;
+ struct hdaudio_assoc *as = ad-ad_sc-sc_assocs;
+ struct hdaudio_widget *w;
+ uint16_t dfmt;
+ int i, j;
+
+ /* Disable digital outputs */
+ for (i = 0; i sc-sc_nassocs; i++) {
+ if (as[i].as_enable == false)
+ continue;
+ if (as[i].as_dir != HDAUDIO_PINDIR_OUT)
+ continue;
+ for (j = 0; j HDAUDIO_MAXPINS; j++) {
+ if (as[i].as_dacs[j] == 0)
+continue;
+ w = hdafg_widget_lookup(sc, as[i].as_dacs[j]);
+ if (w == NULL || w-w_enable == false)
+continue;
+ if (w-w_p.aw_cap COP_AWCAP_DIGITAL) {
+dfmt = hdaudio_command(sc-sc_codec, w-w_nid,
+CORB_GET_DIGITAL_CONVERTER_CONTROL, 0)
+0xff;
+dfmt = ~COP_DIGITAL_CONVCTRL1_DIGEN;
+hdaudio_command(sc-sc_codec, w-w_nid,
+CORB_SET_DIGITAL_CONVERTER_CONTROL_1, dfmt);
+ }
+ }
+ }
hdaudio_stream_stop(ad-ad_playback);
CVS commit: src/lib/libisns
Module Name:src
Committed By: christos
Date: Tue Oct 25 00:02:30 UTC 2011
Modified Files:
src/lib/libisns: isns.h isns_pdu.c
Log Message:
make length unsigned.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/lib/libisns/isns.h \
src/lib/libisns/isns_pdu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libisns/isns.h
diff -u src/lib/libisns/isns.h:1.1.1.1 src/lib/libisns/isns.h:1.2
--- src/lib/libisns/isns.h:1.1.1.1 Sat Jan 15 20:22:50 2011
+++ src/lib/libisns/isns.h Mon Oct 24 20:02:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isns.h,v 1.1.1.1 2011/01/16 01:22:50 agc Exp $ */
+/* $NetBSD: isns.h,v 1.2 2011/10/25 00:02:30 christos Exp $ */
/*-
* Copyright (c) 2004,2009 The NetBSD Foundation, Inc.
@@ -59,8 +59,8 @@ void isns_stop(ISNS_HANDLE);
ISNS_TRANS isns_new_trans(ISNS_HANDLE, uint16_t, uint16_t);
void isns_free_trans(ISNS_TRANS);
int isns_send_trans(ISNS_TRANS, const struct timespec *, uint32_t *);
-int isns_add_tlv(ISNS_TRANS, uint32_t, int, const void *);
-int isns_get_tlv(ISNS_TRANS, int, uint32_t *, int *, void **);
+int isns_add_tlv(ISNS_TRANS, uint32_t, uint32_t, const void *);
+int isns_get_tlv(ISNS_TRANS, int, uint32_t *, uint32_t *, void **);
int isns_add_string(ISNS_TRANS, uint32_t, const char *);
Index: src/lib/libisns/isns_pdu.c
diff -u src/lib/libisns/isns_pdu.c:1.1.1.1 src/lib/libisns/isns_pdu.c:1.2
--- src/lib/libisns/isns_pdu.c:1.1.1.1 Sat Jan 15 20:22:50 2011
+++ src/lib/libisns/isns_pdu.c Mon Oct 24 20:02:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: isns_pdu.c,v 1.1.1.1 2011/01/16 01:22:50 agc Exp $ */
+/* $NetBSD: isns_pdu.c,v 1.2 2011/10/25 00:02:30 christos Exp $ */
/*-
* Copyright (c) 2004,2009 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
-__RCSID($NetBSD: isns_pdu.c,v 1.1.1.1 2011/01/16 01:22:50 agc Exp $);
+__RCSID($NetBSD: isns_pdu.c,v 1.2 2011/10/25 00:02:30 christos Exp $);
#include sys/types.h
@@ -576,7 +576,7 @@ int
isns_add_string(ISNS_TRANS trans, uint32_t tag, const char *s)
{
/* Add string, including required NULL. */
- return isns_add_tlv(trans, tag, (int)strlen(s)+1, s);
+ return isns_add_tlv(trans, tag, (uint32_t)strlen(s) + 1, s);
}
@@ -584,7 +584,8 @@ isns_add_string(ISNS_TRANS trans, uint32
* isns_add_tlv - adds a TLV to an existing transaction
*/
int
-isns_add_tlv(ISNS_TRANS trans, uint32_t tag, int data_len, const void *data_p)
+isns_add_tlv(ISNS_TRANS trans, uint32_t tag, uint32_t data_len,
+const void *data_p)
{
struct isns_trans_s *trans_p;
uint8_t tlv_buf[ISNS_TLV_HDR_SIZE];
@@ -629,8 +630,8 @@ isns_add_tlv(ISNS_TRANS trans, uint32_t
* ENOMEM - could not allocate storage for spanning TLV data
*/
int
-isns_get_tlv(ISNS_TRANS trans, int which_tlv, uint32_t *tag_p, int *data_len_p,
-void **data_pp)
+isns_get_tlv(ISNS_TRANS trans, int which_tlv, uint32_t *tag_p,
+uint32_t *data_len_p, void **data_pp)
{
struct isns_trans_s *trans_p;
struct isns_get_tlv_info_s *info_p;
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Oct 25 05:03:57 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9/man9.x86: Makefile Added Files: src/share/man/man9/man9.x86: rdmsr.9 Log Message: Briefly document the basic RDMSR/WRMSR functions. To generate a diff of this commit: cvs rdiff -u -r1.1696 -r1.1697 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/man9.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man9/man9.x86/rdmsr.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1696 src/distrib/sets/lists/comp/mi:1.1697 --- src/distrib/sets/lists/comp/mi:1.1696 Mon Oct 24 07:33:26 2011 +++ src/distrib/sets/lists/comp/mi Tue Oct 25 05:03:55 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1696 2011/10/24 07:33:26 yamt Exp $ +# $NetBSD: mi,v 1.1697 2011/10/25 05:03:55 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -10857,11 +10857,14 @@ ./usr/share/man/cat9/x86/nmi.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/nmi_disestablish.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/nmi_establish.0 comp-sys-catman .cat +./usr/share/man/cat9/x86/rdmsr.0 comp-sys-catman .cat +./usr/share/man/cat9/x86/rdmsr_safe.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/tsc.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/tsc_sync_ap.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/tsc_sync_bp.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/tsc_sync_drift.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/tsc_tc_init.0 comp-sys-catman .cat +./usr/share/man/cat9/x86/wrmsr.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/x86_msr_xcall.0 comp-sys-catman .cat ./usr/share/man/cat9/xc_broadcast.0 comp-sys-catman .cat ./usr/share/man/cat9/xc_unicast.0 comp-sys-catman .cat @@ -16902,11 +16905,14 @@ ./usr/share/man/html9/x86/nmi.html comp-sys-htmlman html ./usr/share/man/html9/x86/nmi_disestablish.html comp-sys-htmlman html ./usr/share/man/html9/x86/nmi_establish.html comp-sys-htmlman html +./usr/share/man/html9/x86/rdmsr.html comp-sys-htmlman html +./usr/share/man/html9/x86/rdmsr_safe.html comp-sys-htmlman html ./usr/share/man/html9/x86/tsc.html comp-sys-htmlman html ./usr/share/man/html9/x86/tsc_sync_ap.html comp-sys-htmlman html ./usr/share/man/html9/x86/tsc_sync_bp.html comp-sys-htmlman html ./usr/share/man/html9/x86/tsc_sync_drift.html comp-sys-htmlman html ./usr/share/man/html9/x86/tsc_tc_init.html comp-sys-htmlman html +./usr/share/man/html9/x86/wrmsr.html comp-sys-htmlman html ./usr/share/man/html9/x86/x86_msr_xcall.html comp-sys-htmlman html ./usr/share/man/html9/xc_broadcast.html comp-sys-htmlman html ./usr/share/man/html9/xc_unicast.html comp-sys-htmlman html @@ -23204,11 +23210,14 @@ ./usr/share/man/man9/x86/nmi.9 comp-sys-man .man ./usr/share/man/man9/x86/nmi_disestablish.9 comp-sys-man .man ./usr/share/man/man9/x86/nmi_establish.9 comp-sys-man .man +./usr/share/man/man9/x86/rdmsr.9 comp-sys-man .man +./usr/share/man/man9/x86/rdmsr_safe.9 comp-sys-man .man ./usr/share/man/man9/x86/tsc.9 comp-sys-man .man ./usr/share/man/man9/x86/tsc_sync_ap.9 comp-sys-man .man ./usr/share/man/man9/x86/tsc_sync_bp.9 comp-sys-man .man ./usr/share/man/man9/x86/tsc_sync_drift.9 comp-sys-man .man ./usr/share/man/man9/x86/tsc_tc_init.9 comp-sys-man .man +./usr/share/man/man9/x86/wrmsr.9 comp-sys-man .man ./usr/share/man/man9/x86/x86_msr_xcall.9 comp-sys-man .man ./usr/share/man/man9/xc_broadcast.9 comp-sys-man .man ./usr/share/man/man9/xc_unicast.9 comp-sys-man .man Index: src/share/man/man9/man9.x86/Makefile diff -u src/share/man/man9/man9.x86/Makefile:1.3 src/share/man/man9/man9.x86/Makefile:1.4 --- src/share/man/man9/man9.x86/Makefile:1.3 Fri Mar 11 19:50:33 2011 +++ src/share/man/man9/man9.x86/Makefile Tue Oct 25 05:03:57 2011 @@ -1,12 +1,15 @@ -# $NetBSD: Makefile,v 1.3 2011/03/11 19:50:33 jruoho Exp $ +# $NetBSD: Makefile,v 1.4 2011/10/25 05:03:57 jruoho Exp $ -MAN= nmi.9 tsc.9 x86_msr_xcall.9 +MAN= nmi.9 rdmsr.9 tsc.9 x86_msr_xcall.9 MANSUBDIR=/x86 MLINKS+=nmi.9 nmi_establish.9 \ nmi.9 nmi_disestablish.9 +MLINKS+=rdmsr.9 rdmsr_safe.9 \ + rdmsr.9 wrmsr.9 + MLINKS+=tsc.9 tsc_tc_init.9 \ tsc.9 tsc_sync_ap.9 \ tsc.9 tsc_sync_bp.9 \ Added files: Index: src/share/man/man9/man9.x86/rdmsr.9 diff -u /dev/null src/share/man/man9/man9.x86/rdmsr.9:1.1 --- /dev/null Tue Oct 25 05:03:57 2011 +++ src/share/man/man9/man9.x86/rdmsr.9 Tue Oct 25 05:03:57 2011 @@ -0,0 +1,112 @@ +.\ $NetBSD: rdmsr.9,v 1.1 2011/10/25 05:03:57 jruoho Exp $ +.\ +.\ Copyright (c) 2011 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Jukka Ruohonen. +.\ +.\ Redistribution and use in source and
CVS commit: src/share/man/man9/man9.x86
Module Name:src Committed By: jruoho Date: Tue Oct 25 05:04:33 UTC 2011 Modified Files: src/share/man/man9/man9.x86: x86_msr_xcall.9 Log Message: Xref rdmsr(9). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/man9.x86/x86_msr_xcall.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/man9.x86/x86_msr_xcall.9 diff -u src/share/man/man9/man9.x86/x86_msr_xcall.9:1.3 src/share/man/man9/man9.x86/x86_msr_xcall.9:1.4 --- src/share/man/man9/man9.x86/x86_msr_xcall.9:1.3 Sat Aug 21 10:38:51 2010 +++ src/share/man/man9/man9.x86/x86_msr_xcall.9 Tue Oct 25 05:04:33 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: x86_msr_xcall.9,v 1.3 2010/08/21 10:38:51 wiz Exp $ +.\ $NetBSD: x86_msr_xcall.9,v 1.4 2011/10/25 05:04:33 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 21, 2010 +.Dd October 25, 2011 .Dt X86_MSR_XCALL 9 x86 .Os .Sh NAME @@ -94,4 +94,5 @@ xc = xc_broadcast(0, (xcfunc_t)x86_msr_x xc_wait(xc); .Ed .Sh SEE ALSO +.Xr rdmsr 9 , .Xr xcall 9
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Oct 25 05:41:35 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9/man9.x86: Makefile rdmsr.9 tsc.9 Log Message: Also mention rdtsc() in passing. To generate a diff of this commit: cvs rdiff -u -r1.1697 -r1.1698 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/man9.x86/Makefile cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/man9.x86/rdmsr.9 cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/man9.x86/tsc.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1697 src/distrib/sets/lists/comp/mi:1.1698 --- src/distrib/sets/lists/comp/mi:1.1697 Tue Oct 25 05:03:55 2011 +++ src/distrib/sets/lists/comp/mi Tue Oct 25 05:41:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1697 2011/10/25 05:03:55 jruoho Exp $ +# $NetBSD: mi,v 1.1698 2011/10/25 05:41:33 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -10859,6 +10859,7 @@ ./usr/share/man/cat9/x86/nmi_establish.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/rdmsr.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/rdmsr_safe.0 comp-sys-catman .cat +./usr/share/man/cat9/x86/rdtsc.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/tsc.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/tsc_sync_ap.0 comp-sys-catman .cat ./usr/share/man/cat9/x86/tsc_sync_bp.0 comp-sys-catman .cat @@ -16907,6 +16908,7 @@ ./usr/share/man/html9/x86/nmi_establish.html comp-sys-htmlman html ./usr/share/man/html9/x86/rdmsr.html comp-sys-htmlman html ./usr/share/man/html9/x86/rdmsr_safe.html comp-sys-htmlman html +./usr/share/man/html9/x86/rdtsc.html comp-sys-htmlman html ./usr/share/man/html9/x86/tsc.html comp-sys-htmlman html ./usr/share/man/html9/x86/tsc_sync_ap.html comp-sys-htmlman html ./usr/share/man/html9/x86/tsc_sync_bp.html comp-sys-htmlman html @@ -23212,6 +23214,7 @@ ./usr/share/man/man9/x86/nmi_establish.9 comp-sys-man .man ./usr/share/man/man9/x86/rdmsr.9 comp-sys-man .man ./usr/share/man/man9/x86/rdmsr_safe.9 comp-sys-man .man +./usr/share/man/man9/x86/rdtsc.9 comp-sys-man .man ./usr/share/man/man9/x86/tsc.9 comp-sys-man .man ./usr/share/man/man9/x86/tsc_sync_ap.9 comp-sys-man .man ./usr/share/man/man9/x86/tsc_sync_bp.9 comp-sys-man .man Index: src/share/man/man9/man9.x86/Makefile diff -u src/share/man/man9/man9.x86/Makefile:1.4 src/share/man/man9/man9.x86/Makefile:1.5 --- src/share/man/man9/man9.x86/Makefile:1.4 Tue Oct 25 05:03:57 2011 +++ src/share/man/man9/man9.x86/Makefile Tue Oct 25 05:41:35 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/10/25 05:03:57 jruoho Exp $ +# $NetBSD: Makefile,v 1.5 2011/10/25 05:41:35 jruoho Exp $ MAN= nmi.9 rdmsr.9 tsc.9 x86_msr_xcall.9 @@ -10,7 +10,8 @@ MLINKS+=nmi.9 nmi_establish.9 \ MLINKS+=rdmsr.9 rdmsr_safe.9 \ rdmsr.9 wrmsr.9 -MLINKS+=tsc.9 tsc_tc_init.9 \ +MLINKS+=tsc.9 rdtsc.9 \ + tsc.9 tsc_tc_init.9 \ tsc.9 tsc_sync_ap.9 \ tsc.9 tsc_sync_bp.9 \ tsc.9 tsc_sync_drift.9 Index: src/share/man/man9/man9.x86/rdmsr.9 diff -u src/share/man/man9/man9.x86/rdmsr.9:1.1 src/share/man/man9/man9.x86/rdmsr.9:1.2 --- src/share/man/man9/man9.x86/rdmsr.9:1.1 Tue Oct 25 05:03:57 2011 +++ src/share/man/man9/man9.x86/rdmsr.9 Tue Oct 25 05:41:35 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: rdmsr.9,v 1.1 2011/10/25 05:03:57 jruoho Exp $ +.\ $NetBSD: rdmsr.9,v 1.2 2011/10/25 05:41:35 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -109,4 +109,5 @@ instruction, available in via .Fn x86_cpuid . .Sh SEE ALSO +.Xr rdtsc 9 , .Xr x86_msr_xcall 9 Index: src/share/man/man9/man9.x86/tsc.9 diff -u src/share/man/man9/man9.x86/tsc.9:1.3 src/share/man/man9/man9.x86/tsc.9:1.4 --- src/share/man/man9/man9.x86/tsc.9:1.3 Sun Mar 13 04:57:21 2011 +++ src/share/man/man9/man9.x86/tsc.9 Tue Oct 25 05:41:35 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: tsc.9,v 1.3 2011/03/13 04:57:21 jruoho Exp $ +.\ $NetBSD: tsc.9,v 1.4 2011/10/25 05:41:35 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 13, 2011 +.Dd October 25, 2011 .Dt TSC 9 x86 .Os .Sh NAME @@ -35,6 +35,8 @@ .Nd Time Stamp Counter .Sh SYNOPSIS .In x86/x86/tsc.h +.Ft uint64_t +.Fn rdtsc void .Ft void .Fn tsc_tc_init void .Ft void @@ -85,6 +87,11 @@ But the basic premise is still guarantee is a monotonically increasing counter. .Sh FUNCTIONS .Bl -tag -width abcd +.It Fn rdtsc +The +.Fn rdtsc +function returns the value read from +.Dv RDTSC . .It Fn tsc_tc_init The .Fn tsc_tc_init @@ -148,4 +155,5 @@ attach. .Xr gettimeofday 2 , .Xr hpet 4 , .Xr hz 9 , +.Xr rdmsr 9 , .Xr timecounter 9
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Tue Oct 25 05:54:16 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch sparc, sparc64, arm and powerpc to GDB 7.
To generate a diff of this commit:
cvs rdiff -u -r1.684 -r1.685 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.684 src/share/mk/bsd.own.mk:1.685
--- src/share/mk/bsd.own.mk:1.684 Tue Oct 11 13:54:00 2011
+++ src/share/mk/bsd.own.mk Tue Oct 25 05:54:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.684 2011/10/11 13:54:00 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.685 2011/10/25 05:54:15 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -79,7 +79,11 @@ USE_COMPILERCRTSTUFF?= yes
# Platforms using GDB 7
#
.if ${MACHINE_ARCH} == i386 || \
-${MACHINE_ARCH} == x86_64
+${MACHINE_ARCH} == x86_64 || \
+${MACHINE_ARCH} == sparc64 || \
+${MACHINE_ARCH} == sparc|| \
+${MACHINE_ARCH} == arm || \
+${MACHINE_ARCH} == powerpc
HAVE_GDB?= 7
.else
# default to GDB6
