CVS commit: xsrc/external/mit/glproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 06:41:13 UTC 2010 Update of /cvsroot/xsrc/external/mit/glproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27730 Log Message: initial import of glproto-1.4.12 Status: Vendor Tag: xorg Release Tags: glproto-1-4-12 U xsrc/external/mit/glproto/dist/glproto.pc.in U xsrc/external/mit/glproto/dist/Makefile.in U xsrc/external/mit/glproto/dist/glxint.h U xsrc/external/mit/glproto/dist/ChangeLog U xsrc/external/mit/glproto/dist/configure.ac U xsrc/external/mit/glproto/dist/missing U xsrc/external/mit/glproto/dist/glxmd.h U xsrc/external/mit/glproto/dist/Makefile.am U xsrc/external/mit/glproto/dist/config.guess U xsrc/external/mit/glproto/dist/glxtokens.h U xsrc/external/mit/glproto/dist/README U xsrc/external/mit/glproto/dist/glxproto.h U xsrc/external/mit/glproto/dist/COPYING U xsrc/external/mit/glproto/dist/install-sh U xsrc/external/mit/glproto/dist/aclocal.m4 U xsrc/external/mit/glproto/dist/INSTALL U xsrc/external/mit/glproto/dist/configure U xsrc/external/mit/glproto/dist/config.sub U xsrc/external/mit/glproto/dist/glcore.h No conflicts created by this import
CVS commit: xsrc/external/mit/kbproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 06:41:19 UTC 2010 Update of /cvsroot/xsrc/external/mit/kbproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26198 Log Message: initial import of kbproto-1.0.5 Status: Vendor Tag: xorg Release Tags: kbproto-1-0-5 U xsrc/external/mit/kbproto/dist/kbproto.pc.in U xsrc/external/mit/kbproto/dist/Makefile.in U xsrc/external/mit/kbproto/dist/XKBsrv.h U xsrc/external/mit/kbproto/dist/ChangeLog U xsrc/external/mit/kbproto/dist/configure.ac U xsrc/external/mit/kbproto/dist/missing U xsrc/external/mit/kbproto/dist/Makefile.am U xsrc/external/mit/kbproto/dist/XKBproto.h U xsrc/external/mit/kbproto/dist/config.guess U xsrc/external/mit/kbproto/dist/XKBstr.h N xsrc/external/mit/kbproto/dist/README U xsrc/external/mit/kbproto/dist/COPYING U xsrc/external/mit/kbproto/dist/XKBgeom.h U xsrc/external/mit/kbproto/dist/install-sh U xsrc/external/mit/kbproto/dist/aclocal.m4 N xsrc/external/mit/kbproto/dist/INSTALL U xsrc/external/mit/kbproto/dist/configure U xsrc/external/mit/kbproto/dist/XKB.h U xsrc/external/mit/kbproto/dist/config.sub No conflicts created by this import
CVS commit: xsrc/external/mit/renderproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 06:41:24 UTC 2010 Update of /cvsroot/xsrc/external/mit/renderproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6048 Log Message: initial import of renderproto-0.11.1 Status: Vendor Tag: xorg Release Tags: renderproto-0-11-1 U xsrc/external/mit/renderproto/dist/renderproto.pc.in U xsrc/external/mit/renderproto/dist/renderproto.h U xsrc/external/mit/renderproto/dist/Makefile.in U xsrc/external/mit/renderproto/dist/ChangeLog U xsrc/external/mit/renderproto/dist/configure.ac U xsrc/external/mit/renderproto/dist/missing U xsrc/external/mit/renderproto/dist/Makefile.am N xsrc/external/mit/renderproto/dist/config.guess U xsrc/external/mit/renderproto/dist/renderproto.txt N xsrc/external/mit/renderproto/dist/README U xsrc/external/mit/renderproto/dist/COPYING U xsrc/external/mit/renderproto/dist/render.h U xsrc/external/mit/renderproto/dist/install-sh U xsrc/external/mit/renderproto/dist/aclocal.m4 U xsrc/external/mit/renderproto/dist/configure N xsrc/external/mit/renderproto/dist/INSTALL N xsrc/external/mit/renderproto/dist/config.sub No conflicts created by this import
CVS commit: xsrc/external/mit/videoproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 06:41:29 UTC 2010 Update of /cvsroot/xsrc/external/mit/videoproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27373 Log Message: initial import of videoproto-2.3.1 Status: Vendor Tag: xorg Release Tags: videoproto-2-3-1 N xsrc/external/mit/videoproto/dist/xv-protocol-v2.txt U xsrc/external/mit/videoproto/dist/Makefile.in U xsrc/external/mit/videoproto/dist/ChangeLog U xsrc/external/mit/videoproto/dist/configure.ac U xsrc/external/mit/videoproto/dist/missing U xsrc/external/mit/videoproto/dist/videoproto.pc.in U xsrc/external/mit/videoproto/dist/Makefile.am U xsrc/external/mit/videoproto/dist/XvMC.h N xsrc/external/mit/videoproto/dist/config.guess N xsrc/external/mit/videoproto/dist/README U xsrc/external/mit/videoproto/dist/COPYING U xsrc/external/mit/videoproto/dist/XvMCproto.h U xsrc/external/mit/videoproto/dist/install-sh U xsrc/external/mit/videoproto/dist/aclocal.m4 U xsrc/external/mit/videoproto/dist/Xv.h N xsrc/external/mit/videoproto/dist/INSTALL U xsrc/external/mit/videoproto/dist/configure N xsrc/external/mit/videoproto/dist/config.sub U xsrc/external/mit/videoproto/dist/Xvproto.h U xsrc/external/mit/videoproto/dist/vldXvMC.h No conflicts created by this import
CVS commit: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 06:41:37 UTC 2010 Update of /cvsroot/xsrc/external/mit/xproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2731 Log Message: initial import of xproto-7.0.18 Status: Vendor Tag: xorg Release Tags: xproto-7-0-18 U xsrc/external/mit/xproto/dist/ap_keysym.h U xsrc/external/mit/xproto/dist/keysym.h U xsrc/external/mit/xproto/dist/do-not-use-config.h.in U xsrc/external/mit/xproto/dist/Makefile.in U xsrc/external/mit/xproto/dist/XWDFile.h U xsrc/external/mit/xproto/dist/Xfuncs.h U xsrc/external/mit/xproto/dist/ChangeLog U xsrc/external/mit/xproto/dist/Xarch.h U xsrc/external/mit/xproto/dist/configure.ac U xsrc/external/mit/xproto/dist/missing U xsrc/external/mit/xproto/dist/Makefile.am U xsrc/external/mit/xproto/dist/Xpoll.h.in U xsrc/external/mit/xproto/dist/Xos_r.h U xsrc/external/mit/xproto/dist/Xw32defs.h U xsrc/external/mit/xproto/dist/config.guess U xsrc/external/mit/xproto/dist/Xproto.h U xsrc/external/mit/xproto/dist/README U xsrc/external/mit/xproto/dist/Xosdefs.h U xsrc/external/mit/xproto/dist/DECkeysym.h U xsrc/external/mit/xproto/dist/COPYING U xsrc/external/mit/xproto/dist/Xos.h U xsrc/external/mit/xproto/dist/install-sh U xsrc/external/mit/xproto/dist/Xfuncproto.h.in U xsrc/external/mit/xproto/dist/X.h U xsrc/external/mit/xproto/dist/XF86keysym.h U xsrc/external/mit/xproto/dist/aclocal.m4 U xsrc/external/mit/xproto/dist/keysymdef.h U xsrc/external/mit/xproto/dist/HPkeysym.h U xsrc/external/mit/xproto/dist/AUTHORS U xsrc/external/mit/xproto/dist/Xwindows.h U xsrc/external/mit/xproto/dist/Xwinsock.h U xsrc/external/mit/xproto/dist/Xdefs.h U xsrc/external/mit/xproto/dist/Xthreads.h U xsrc/external/mit/xproto/dist/Xalloca.h U xsrc/external/mit/xproto/dist/INSTALL U xsrc/external/mit/xproto/dist/Xatom.h U xsrc/external/mit/xproto/dist/xproto.pc.in U xsrc/external/mit/xproto/dist/configure U xsrc/external/mit/xproto/dist/Xprotostr.h U xsrc/external/mit/xproto/dist/config.sub U xsrc/external/mit/xproto/dist/Sunkeysym.h U xsrc/external/mit/xproto/dist/Xmd.h No conflicts created by this import
CVS commit: src/sys/dev/usb
Module Name:src Committed By: tsutsui Date: Sat Aug 14 08:06:54 UTC 2010 Modified Files: src/sys/dev/usb: if_axe.c Log Message: Remove dead assignment. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/if_axe.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/usb/if_axe.c diff -u src/sys/dev/usb/if_axe.c:1.38 src/sys/dev/usb/if_axe.c:1.39 --- src/sys/dev/usb/if_axe.c:1.38 Thu Jun 24 15:01:45 2010 +++ src/sys/dev/usb/if_axe.c Sat Aug 14 08:06:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.38 2010/06/24 15:01:45 tsutsui Exp $ */ +/* $NetBSD: if_axe.c,v 1.39 2010/08/14 08:06:54 tsutsui Exp $ */ /* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */ /* @@ -89,7 +89,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.38 2010/06/24 15:01:45 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.39 2010/08/14 08:06:54 tsutsui Exp $); #if defined(__NetBSD__) #include opt_inet.h @@ -1005,9 +1005,6 @@ memcpy(mtod(m, char *), buf, pktlen); - /* No errors; receive the packet. */ - pktlen -= ETHER_CRC_LEN + 4; - s = splnet(); bpf_mtap(ifp, m);
CVS commit: xsrc/external/mit/xextproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:08:25 UTC 2010 Update of /cvsroot/xsrc/external/mit/xextproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21515 Log Message: initial import of xextproto-7.1.2 Status: Vendor Tag: xorg Release Tags: xextproto-7-1-2 U xsrc/external/mit/xextproto/dist/geproto.h U xsrc/external/mit/xextproto/dist/cup.h U xsrc/external/mit/xextproto/dist/xtestext1proto.h U xsrc/external/mit/xextproto/dist/Makefile.in U xsrc/external/mit/xextproto/dist/shm.h U xsrc/external/mit/xextproto/dist/xtestext1const.h C xsrc/external/mit/xextproto/dist/shapestr.h U xsrc/external/mit/xextproto/dist/xtestconst.h U xsrc/external/mit/xextproto/dist/ChangeLog U xsrc/external/mit/xextproto/dist/mitmiscconst.h U xsrc/external/mit/xextproto/dist/configure.ac U xsrc/external/mit/xextproto/dist/cupproto.h U xsrc/external/mit/xextproto/dist/missing U xsrc/external/mit/xextproto/dist/EVIproto.h U xsrc/external/mit/xextproto/dist/Makefile.am U xsrc/external/mit/xextproto/dist/ge.h U xsrc/external/mit/xextproto/dist/lbx.h N xsrc/external/mit/xextproto/dist/config.guess U xsrc/external/mit/xextproto/dist/multibufproto.h U xsrc/external/mit/xextproto/dist/dpmsproto.h N xsrc/external/mit/xextproto/dist/README U xsrc/external/mit/xextproto/dist/shmproto.h U xsrc/external/mit/xextproto/dist/COPYING U xsrc/external/mit/xextproto/dist/mitmiscproto.h C xsrc/external/mit/xextproto/dist/syncstr.h U xsrc/external/mit/xextproto/dist/install-sh U xsrc/external/mit/xextproto/dist/dbe.h U xsrc/external/mit/xextproto/dist/aclocal.m4 U xsrc/external/mit/xextproto/dist/syncproto.h U xsrc/external/mit/xextproto/dist/securproto.h U xsrc/external/mit/xextproto/dist/secur.h U xsrc/external/mit/xextproto/dist/shapeproto.h U xsrc/external/mit/xextproto/dist/multibufconst.h U xsrc/external/mit/xextproto/dist/dpmsconst.h U xsrc/external/mit/xextproto/dist/xtestproto.h U xsrc/external/mit/xextproto/dist/EVI.h U xsrc/external/mit/xextproto/dist/shapeconst.h N xsrc/external/mit/xextproto/dist/INSTALL U xsrc/external/mit/xextproto/dist/lbxproto.h U xsrc/external/mit/xextproto/dist/xextproto.pc.in U xsrc/external/mit/xextproto/dist/configure C xsrc/external/mit/xextproto/dist/shmstr.h U xsrc/external/mit/xextproto/dist/syncconst.h N xsrc/external/mit/xextproto/dist/config.sub U xsrc/external/mit/xextproto/dist/dbeproto.h U xsrc/external/mit/xextproto/dist/agproto.h U xsrc/external/mit/xextproto/dist/ag.h N xsrc/external/mit/xextproto/dist/specs/Makefile.in N xsrc/external/mit/xextproto/dist/specs/security.xml N xsrc/external/mit/xextproto/dist/specs/Makefile.am N xsrc/external/mit/xextproto/dist/specs/appgroup.xml N xsrc/external/mit/xextproto/dist/specs/multibuf.xml N xsrc/external/mit/xextproto/dist/specs/geproto.xml N xsrc/external/mit/xextproto/dist/specs/dpms.xml N xsrc/external/mit/xextproto/dist/specs/sync.xml N xsrc/external/mit/xextproto/dist/specs/shape.xml N xsrc/external/mit/xextproto/dist/specs/shm.xml N xsrc/external/mit/xextproto/dist/specs/tog-cup.xml N xsrc/external/mit/xextproto/dist/specs/evi.xml N xsrc/external/mit/xextproto/dist/specs/dbe.xml N xsrc/external/mit/xextproto/dist/specs/xtest.xml 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xextproto/dist
CVS commit: xsrc/external/mit/xextproto/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Aug 14 08:09:59 UTC 2010
Added Files:
xsrc/external/mit/xextproto/dist: shapestr.h syncstr.h
Removed Files:
xsrc/external/mit/xextproto/dist: geproto.txt
Log Message:
merge xextproto 7.1.2.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xextproto/dist/geproto.txt
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xextproto/dist/shapestr.h \
xsrc/external/mit/xextproto/dist/syncstr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: xsrc/external/mit/xextproto/dist/shapestr.h
diff -u /dev/null xsrc/external/mit/xextproto/dist/shapestr.h:1.3
--- /dev/null Sat Aug 14 08:09:59 2010
+++ xsrc/external/mit/xextproto/dist/shapestr.h Sat Aug 14 08:09:59 2010
@@ -0,0 +1,8 @@
+#ifndef _SHAPESTR_H_
+#define _SHAPESTR_H_
+
+#warning shapestr.h is obsolete and may be removed in the future.
+#warning include X11/extensions/shapeproto.h for the protocol defines.
+#include X11/extensions/shapeproto.h
+
+#endif /* _SHAPESTR_H_ */
Index: xsrc/external/mit/xextproto/dist/syncstr.h
diff -u /dev/null xsrc/external/mit/xextproto/dist/syncstr.h:1.3
--- /dev/null Sat Aug 14 08:09:59 2010
+++ xsrc/external/mit/xextproto/dist/syncstr.h Sat Aug 14 08:09:59 2010
@@ -0,0 +1,184 @@
+/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
+/*
+
+Copyright 1991, 1993, 1994, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+/***
+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
+and Olivetti Research Limited, Cambridge, England.
+
+All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of Digital or Olivetti
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+**/
+/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
+
+#ifndef _SYNCSTR_H_
+#define _SYNCSTR_H_
+
+#include X11/extensions/syncproto.h
+
+#ifdef _SYNC_SERVER
+
+#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
+
+typedef struct _SyncCounter {
+ClientPtr client; /* Owning client. 0 for system counters */
+XSyncCounter id; /* resource ID */
+CARD64 value; /* counter value */
+struct _SyncTriggerList *pTriglist; /* list of triggers */
+Bool beingDestroyed; /* in process of going away */
+struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
+} SyncCounter;
+
+/*
+ * The System Counter interface
+ */
+
+typedef enum {
+XSyncCounterNeverChanges,
+XSyncCounterNeverIncreases,
+XSyncCounterNeverDecreases,
+XSyncCounterUnrestricted
+} SyncCounterType;
+
+typedef struct _SysCounterInfo {
+char *name;
+CARD64 resolution;
+CARD64 bracket_greater;
+CARD64 bracket_less;
+SyncCounterType counterType; /* how can this counter change */
+void(*QueryValue)(
+ pointer
CVS commit: src/sys/dev/usb
Module Name:src Committed By: tsutsui Date: Sat Aug 14 08:10:49 UTC 2010 Modified Files: src/sys/dev/usb: if_axe.c Log Message: Ugh, no, revert previous. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/if_axe.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/usb/if_axe.c diff -u src/sys/dev/usb/if_axe.c:1.39 src/sys/dev/usb/if_axe.c:1.40 --- src/sys/dev/usb/if_axe.c:1.39 Sat Aug 14 08:06:54 2010 +++ src/sys/dev/usb/if_axe.c Sat Aug 14 08:10:49 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.39 2010/08/14 08:06:54 tsutsui Exp $ */ +/* $NetBSD: if_axe.c,v 1.40 2010/08/14 08:10:49 tsutsui Exp $ */ /* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */ /* @@ -89,7 +89,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.39 2010/08/14 08:06:54 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.40 2010/08/14 08:10:49 tsutsui Exp $); #if defined(__NetBSD__) #include opt_inet.h @@ -1005,6 +1005,9 @@ memcpy(mtod(m, char *), buf, pktlen); + /* No errors; receive the packet. */ + pktlen -= ETHER_CRC_LEN + 4; + s = splnet(); bpf_mtap(ifp, m);
CVS commit: xsrc/external/mit/xf86-input-vmmouse/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:30:10 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-input-vmmouse/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20486 Log Message: initial import of xf86-input-vmmouse-12.6.10 Status: Vendor Tag: xorg Release Tags: xf86-input-vmmouse-12-6-10 U xsrc/external/mit/xf86-input-vmmouse/dist/missing U xsrc/external/mit/xf86-input-vmmouse/dist/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/ChangeLog U xsrc/external/mit/xf86-input-vmmouse/dist/configure.ac U xsrc/external/mit/xf86-input-vmmouse/dist/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/config.guess U xsrc/external/mit/xf86-input-vmmouse/dist/README U xsrc/external/mit/xf86-input-vmmouse/dist/COPYING U xsrc/external/mit/xf86-input-vmmouse/dist/config.h.in U xsrc/external/mit/xf86-input-vmmouse/dist/install-sh U xsrc/external/mit/xf86-input-vmmouse/dist/aclocal.m4 U xsrc/external/mit/xf86-input-vmmouse/dist/ltmain.sh U xsrc/external/mit/xf86-input-vmmouse/dist/INSTALL U xsrc/external/mit/xf86-input-vmmouse/dist/configure U xsrc/external/mit/xf86-input-vmmouse/dist/depcomp U xsrc/external/mit/xf86-input-vmmouse/dist/config.sub U xsrc/external/mit/xf86-input-vmmouse/dist/src/xf86OSmouse.h U xsrc/external/mit/xf86-input-vmmouse/dist/src/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/src/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/src/vmmouse.c U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_proto.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_defs.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_client.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/shared/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_client.c U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_proto.c U xsrc/external/mit/xf86-input-vmmouse/dist/man/vmmouse_detect.man U xsrc/external/mit/xf86-input-vmmouse/dist/man/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/man/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/man/vmmouse.man U xsrc/external/mit/xf86-input-vmmouse/dist/tools/vmmouse_detect.c U xsrc/external/mit/xf86-input-vmmouse/dist/tools/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/tools/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/tools/hal-probe-vmmouse.in U xsrc/external/mit/xf86-input-vmmouse/dist/tools/69-xorg-vmmouse.rules.in U xsrc/external/mit/xf86-input-vmmouse/dist/tools/50-vmmouse.conf U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/11-x11-vmmouse.fdi U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-apm/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:31:08 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-apm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6391 Log Message: initial import of xf86-video-apm-1.2.3 Status: Vendor Tag: xorg Release Tags: xf86-video-apm-1-2-3 U xsrc/external/mit/xf86-video-apm/dist/missing U xsrc/external/mit/xf86-video-apm/dist/ltmain.sh U xsrc/external/mit/xf86-video-apm/dist/README U xsrc/external/mit/xf86-video-apm/dist/Makefile.in N xsrc/external/mit/xf86-video-apm/dist/INSTALL U xsrc/external/mit/xf86-video-apm/dist/config.guess U xsrc/external/mit/xf86-video-apm/dist/depcomp U xsrc/external/mit/xf86-video-apm/dist/COPYING U xsrc/external/mit/xf86-video-apm/dist/Makefile.am U xsrc/external/mit/xf86-video-apm/dist/config.sub U xsrc/external/mit/xf86-video-apm/dist/ChangeLog U xsrc/external/mit/xf86-video-apm/dist/configure U xsrc/external/mit/xf86-video-apm/dist/config.h.in U xsrc/external/mit/xf86-video-apm/dist/install-sh U xsrc/external/mit/xf86-video-apm/dist/aclocal.m4 U xsrc/external/mit/xf86-video-apm/dist/configure.ac U xsrc/external/mit/xf86-video-apm/dist/src/apm_pcirename.h U xsrc/external/mit/xf86-video-apm/dist/src/apm_funcs.c U xsrc/external/mit/xf86-video-apm/dist/src/apm_video.c U xsrc/external/mit/xf86-video-apm/dist/src/apm.h U xsrc/external/mit/xf86-video-apm/dist/src/apm_cursor.c U xsrc/external/mit/xf86-video-apm/dist/src/apm_accel.c U xsrc/external/mit/xf86-video-apm/dist/src/Makefile.in U xsrc/external/mit/xf86-video-apm/dist/src/apm_driver.c U xsrc/external/mit/xf86-video-apm/dist/src/Makefile.am U xsrc/external/mit/xf86-video-apm/dist/src/apm_i2c.c U xsrc/external/mit/xf86-video-apm/dist/src/apm_dga.c U xsrc/external/mit/xf86-video-apm/dist/src/apm_regs.h U xsrc/external/mit/xf86-video-apm/dist/man/Makefile.am U xsrc/external/mit/xf86-video-apm/dist/man/Makefile.in U xsrc/external/mit/xf86-video-apm/dist/man/apm.man No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-ark/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:32:01 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-ark/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2790 Log Message: initial import of xf86-video-ark-0.7.3 Status: Vendor Tag: xorg Release Tags: xf86-video-ark-0-7-3 U xsrc/external/mit/xf86-video-ark/dist/COPYING U xsrc/external/mit/xf86-video-ark/dist/configure.ac U xsrc/external/mit/xf86-video-ark/dist/missing U xsrc/external/mit/xf86-video-ark/dist/depcomp U xsrc/external/mit/xf86-video-ark/dist/README U xsrc/external/mit/xf86-video-ark/dist/config.h.in U xsrc/external/mit/xf86-video-ark/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ark/dist/configure U xsrc/external/mit/xf86-video-ark/dist/install-sh U xsrc/external/mit/xf86-video-ark/dist/ChangeLog U xsrc/external/mit/xf86-video-ark/dist/Makefile.in U xsrc/external/mit/xf86-video-ark/dist/Makefile.am N xsrc/external/mit/xf86-video-ark/dist/INSTALL U xsrc/external/mit/xf86-video-ark/dist/config.sub U xsrc/external/mit/xf86-video-ark/dist/ltmain.sh U xsrc/external/mit/xf86-video-ark/dist/config.guess U xsrc/external/mit/xf86-video-ark/dist/src/ark_reg.h U xsrc/external/mit/xf86-video-ark/dist/src/ark_accel.c U xsrc/external/mit/xf86-video-ark/dist/src/ark.h U xsrc/external/mit/xf86-video-ark/dist/src/Makefile.am U xsrc/external/mit/xf86-video-ark/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ark/dist/src/ark_driver.c No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-ast/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:32:51 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-ast/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8761 Log Message: initial import of xf86-video-ast-0.91.10 Status: Vendor Tag: xorg Release Tags: xf86-video-ast-0-91-10 U xsrc/external/mit/xf86-video-ast/dist/missing U xsrc/external/mit/xf86-video-ast/dist/Makefile.in U xsrc/external/mit/xf86-video-ast/dist/ChangeLog U xsrc/external/mit/xf86-video-ast/dist/configure.ac U xsrc/external/mit/xf86-video-ast/dist/Makefile.am U xsrc/external/mit/xf86-video-ast/dist/config.guess U xsrc/external/mit/xf86-video-ast/dist/README U xsrc/external/mit/xf86-video-ast/dist/COPYING U xsrc/external/mit/xf86-video-ast/dist/config.h.in U xsrc/external/mit/xf86-video-ast/dist/install-sh U xsrc/external/mit/xf86-video-ast/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ast/dist/ltmain.sh N xsrc/external/mit/xf86-video-ast/dist/INSTALL U xsrc/external/mit/xf86-video-ast/dist/configure U xsrc/external/mit/xf86-video-ast/dist/depcomp U xsrc/external/mit/xf86-video-ast/dist/config.sub U xsrc/external/mit/xf86-video-ast/dist/src/ast_pcirename.h U xsrc/external/mit/xf86-video-ast/dist/src/Makefile.in C xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c U xsrc/external/mit/xf86-video-ast/dist/src/Makefile.am U xsrc/external/mit/xf86-video-ast/dist/src/ast_2dtool.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_tool.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_driver.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_cursor.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_2dtool.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_mode.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_mode.h U xsrc/external/mit/xf86-video-ast/dist/src/ast.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_cursor.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-ast/dist
CVS commit: xsrc/external/mit/xf86-video-chips/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:33:20 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-chips/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17599 Log Message: initial import of xf86-video-chips-1.2.3 Status: Vendor Tag: xorg Release Tags: xf86-video-chips-1-2-3 U xsrc/external/mit/xf86-video-chips/dist/config.sub U xsrc/external/mit/xf86-video-chips/dist/COPYING U xsrc/external/mit/xf86-video-chips/dist/depcomp U xsrc/external/mit/xf86-video-chips/dist/configure.ac U xsrc/external/mit/xf86-video-chips/dist/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/ltmain.sh U xsrc/external/mit/xf86-video-chips/dist/README U xsrc/external/mit/xf86-video-chips/dist/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/missing U xsrc/external/mit/xf86-video-chips/dist/configure U xsrc/external/mit/xf86-video-chips/dist/ChangeLog U xsrc/external/mit/xf86-video-chips/dist/aclocal.m4 U xsrc/external/mit/xf86-video-chips/dist/install-sh N xsrc/external/mit/xf86-video-chips/dist/INSTALL U xsrc/external/mit/xf86-video-chips/dist/config.h.in U xsrc/external/mit/xf86-video-chips/dist/config.guess U xsrc/external/mit/xf86-video-chips/dist/util/modClock.c U xsrc/external/mit/xf86-video-chips/dist/util/mRegs.c U xsrc/external/mit/xf86-video-chips/dist/util/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/util/dRegs.c U xsrc/external/mit/xf86-video-chips/dist/util/Makefile.am U xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_pcirename.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_bank.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_cursor.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_BltHiQV.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_dga.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_accel.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_Blitter.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_ddc.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_video.c U xsrc/external/mit/xf86-video-chips/dist/src/ct_shadow.c U xsrc/external/mit/xf86-video-chips/dist/src/Makefile.am C xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c U xsrc/external/mit/xf86-video-chips/dist/src/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/src/ct_BlitMM.h U xsrc/external/mit/xf86-video-chips/dist/src/ct_regs.c U xsrc/external/mit/xf86-video-chips/dist/man/chips.man U xsrc/external/mit/xf86-video-chips/dist/man/Makefile.in U xsrc/external/mit/xf86-video-chips/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-chips/dist
CVS commit: xsrc/external/mit/xf86-video-i128/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:33:37 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-i128/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4200 Log Message: initial import of xf86-video-i128-1.3.4 Status: Vendor Tag: xorg Release Tags: xf86-video-i128-1-3-4 U xsrc/external/mit/xf86-video-i128/dist/missing U xsrc/external/mit/xf86-video-i128/dist/Makefile.in U xsrc/external/mit/xf86-video-i128/dist/COPYING U xsrc/external/mit/xf86-video-i128/dist/ChangeLog U xsrc/external/mit/xf86-video-i128/dist/configure.ac U xsrc/external/mit/xf86-video-i128/dist/Makefile.am U xsrc/external/mit/xf86-video-i128/dist/config.guess U xsrc/external/mit/xf86-video-i128/dist/README U xsrc/external/mit/xf86-video-i128/dist/config.h.in U xsrc/external/mit/xf86-video-i128/dist/install-sh U xsrc/external/mit/xf86-video-i128/dist/aclocal.m4 U xsrc/external/mit/xf86-video-i128/dist/ltmain.sh N xsrc/external/mit/xf86-video-i128/dist/INSTALL U xsrc/external/mit/xf86-video-i128/dist/configure U xsrc/external/mit/xf86-video-i128/dist/depcomp U xsrc/external/mit/xf86-video-i128/dist/config.sub U xsrc/external/mit/xf86-video-i128/dist/src/Makefile.in U xsrc/external/mit/xf86-video-i128/dist/src/IBMRGB.h U xsrc/external/mit/xf86-video-i128/dist/src/i128_driver.c U xsrc/external/mit/xf86-video-i128/dist/src/Makefile.am U xsrc/external/mit/xf86-video-i128/dist/src/i128pcirename.h U xsrc/external/mit/xf86-video-i128/dist/src/i128IBMDAC.c U xsrc/external/mit/xf86-video-i128/dist/src/i128reg.h U xsrc/external/mit/xf86-video-i128/dist/src/i128exa.c U xsrc/external/mit/xf86-video-i128/dist/src/i128.h U xsrc/external/mit/xf86-video-i128/dist/src/i128accel.c U xsrc/external/mit/xf86-video-i128/dist/src/i128init.c U xsrc/external/mit/xf86-video-i128/dist/src/i128dga.c U xsrc/external/mit/xf86-video-i128/dist/src/Ti302X.h U xsrc/external/mit/xf86-video-i128/dist/man/Makefile.in U xsrc/external/mit/xf86-video-i128/dist/man/Makefile.am U xsrc/external/mit/xf86-video-i128/dist/man/i128.man No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-mga/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:33:58 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-mga/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25911 Log Message: initial import of xf86-video-mga-1.4.13 Status: Vendor Tag: xorg Release Tags: xf86-video-mga-1-4-13 U xsrc/external/mit/xf86-video-mga/dist/missing U xsrc/external/mit/xf86-video-mga/dist/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/COPYING U xsrc/external/mit/xf86-video-mga/dist/ChangeLog U xsrc/external/mit/xf86-video-mga/dist/configure.ac U xsrc/external/mit/xf86-video-mga/dist/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/config.guess U xsrc/external/mit/xf86-video-mga/dist/README U xsrc/external/mit/xf86-video-mga/dist/INSTALL U xsrc/external/mit/xf86-video-mga/dist/README_HALLIB U xsrc/external/mit/xf86-video-mga/dist/config.h.in U xsrc/external/mit/xf86-video-mga/dist/install-sh U xsrc/external/mit/xf86-video-mga/dist/aclocal.m4 U xsrc/external/mit/xf86-video-mga/dist/ltmain.sh U xsrc/external/mit/xf86-video-mga/dist/mga_PInS.txt U xsrc/external/mit/xf86-video-mga/dist/configure U xsrc/external/mit/xf86-video-mga/dist/depcomp U xsrc/external/mit/xf86-video-mga/dist/config.sub U xsrc/external/mit/xf86-video-mga/dist/src/mgareg_flags.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.c U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/src/mga_macros.h U xsrc/external/mit/xf86-video-mga/dist/src/clientlx.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_driver.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_hwcurs.c U xsrc/external/mit/xf86-video-mga/dist/src/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/src/binding.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_arc.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_g450pll.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_esc.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_video.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_maven.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dga.c U xsrc/external/mit/xf86-video-mga/dist/src/client.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dripriv.h U xsrc/external/mit/xf86-video-mga/dist/src/mga.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_bios.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_common.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_halmod.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dh.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_storm.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_dri.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_exa.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_sarea.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_ucode.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_vga.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_shadow.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_reg.h U xsrc/external/mit/xf86-video-mga/dist/src/mga_dacG.c U xsrc/external/mit/xf86-video-mga/dist/src/mga_merge.c U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/man/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/man/mga.man U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.in U xsrc/external/mit/xf86-video-mga/dist/util/Makefile.am U xsrc/external/mit/xf86-video-mga/dist/util/stormdwg.c U xsrc/external/mit/xf86-video-mga/dist/util/README No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-vmware/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:34:24 UTC 2010 Update of /cvsroot/xsrc/external/mit/xf86-video-vmware/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27108 Log Message: initial import of xf86-video-vmware-11.0.2 Status: Vendor Tag: xorg Release Tags: xf86-video-vmware-11-0-2 U xsrc/external/mit/xf86-video-vmware/dist/missing U xsrc/external/mit/xf86-video-vmware/dist/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/COPYING U xsrc/external/mit/xf86-video-vmware/dist/ChangeLog U xsrc/external/mit/xf86-video-vmware/dist/configure.ac U xsrc/external/mit/xf86-video-vmware/dist/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/config.guess U xsrc/external/mit/xf86-video-vmware/dist/README U xsrc/external/mit/xf86-video-vmware/dist/config.h.in U xsrc/external/mit/xf86-video-vmware/dist/install-sh U xsrc/external/mit/xf86-video-vmware/dist/aclocal.m4 U xsrc/external/mit/xf86-video-vmware/dist/ltmain.sh U xsrc/external/mit/xf86-video-vmware/dist/INSTALL N xsrc/external/mit/xf86-video-vmware/dist/compile U xsrc/external/mit/xf86-video-vmware/dist/configure U xsrc/external/mit/xf86-video-vmware/dist/depcomp U xsrc/external/mit/xf86-video-vmware/dist/config.sub U xsrc/external/mit/xf86-video-vmware/dist/src/vm_device_version.h C xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarecurs.c U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/src/svga_reg.h U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/src/svga_struct.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarexinerama.c U xsrc/external/mit/xf86-video-vmware/dist/src/includeCheck.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_limits.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_escape.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarevideo.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrlproto.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_modes.h U xsrc/external/mit/xf86-video-vmware/dist/src/guest_os.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_overlay.h U xsrc/external/mit/xf86-video-vmware/dist/src/vm_basic_types.h U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.h U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.c U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/man/vmware.man U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-vmware/dist
CVS commit: xsrc/external/mit/xf86-video-apm/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:38:45 UTC 2010 Removed Files: xsrc/external/mit/xf86-video-apm/dist: README.sgml xsrc/external/mit/xf86-video-apm/dist/src: apm_rush.c Log Message: merge xf86-video-apm-1.2.3 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-apm/dist/README.sgml cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xf86-video-apm/dist/src/apm_rush.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ast/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sat Aug 14 08:39:31 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-ast/dist/src: ast_vgatool.c
Log Message:
merge xf86-video-ast-0.91.10
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c
diff -u xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c:1.3 xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c:1.4
--- xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c:1.3 Fri Aug 21 23:51:36 2009
+++ xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c Sat Aug 14 08:39:31 2010
@@ -219,7 +219,7 @@
/* Get Bandwidth */
/* Modify DARM utilization to 60% for AST1100/2100 16bits DRAM, ycc...@032508 */
- if ( ((pAST-jChipType == AST2100) || (pAST-jChipType == AST1100) || (pAST-jChipType == AST2200) || (pAST-jChipType == AST2150)) (ulDRAMBusWidth == 16) )
+ if ( ((pAST-jChipType == AST2100) || (pAST-jChipType == AST1100) || (pAST-jChipType == AST2200) || (pAST-jChipType == AST2150) || (pAST-jChipType == AST2300)) (ulDRAMBusWidth == 16) )
DRAMEfficiency = 600;
ulDRAMBandwidth = ulMCLK * ulDRAMBusWidth * 2 / 8;
ActualDRAMBandwidth = ulDRAMBandwidth * DRAMEfficiency / 1000;
@@ -235,7 +235,7 @@
ulDCLK = ActualDRAMBandwidth / ((pScrn-bitsPerPixel+1) / 8);
/* Add for AST2100, ycc...@061807 */
- if ((pAST-jChipType == AST2100) || (pAST-jChipType == AST2200))
+ if ((pAST-jChipType == AST2100) || (pAST-jChipType == AST2200) || (pAST-jChipType == AST2300))
{
if (ulDCLK 200) ulDCLK = 200;
}
@@ -451,18 +451,18 @@
/* SCU settings */
*(ULONG *) (pAST-MMIOVirtualAddr + 0xF004) = 0x1e6e;
*(ULONG *) (pAST-MMIOVirtualAddr + 0xF000) = 0x1;
-xf86UDelay(1);
+usleep(1);
*(ULONG *) (pAST-MMIOVirtualAddr + 0x12000) = 0x1688A8A8;
ulData = *(ULONG *) (pAST-MMIOVirtualAddr + 0x12004);
ulData = 0xfffb;
*(ULONG *) (pAST-MMIOVirtualAddr + 0x12004) = ulData;
-xf86UDelay(1);
+usleep(1);
/* I2C settings */
*(ULONG *) (pAST-MMIOVirtualAddr + 0xF004) = I2C_BASE;
*(ULONG *) (pAST-MMIOVirtualAddr + 0xF000) = 0x1;
-xf86UDelay(1);
+usleep(1);
/* I2C Start */
*(ULONG *) (ulI2CBase + 0x00) = 0x0;
@@ -537,7 +537,17 @@
ch = GetReg(pAST-RelocateIO+0x43);
-return (ch 0x01);
+if (ch)
+{
+
+vASTOpenKey(pScrn);
+
+GetIndexRegMask(CRTC_PORT, 0xB6, 0xFF, ch);
+
+return (ch 0x04);
+}
+
+return (0);
}
void vEnableVGA(ScrnInfoPtr pScrn)
@@ -553,11 +563,18 @@
UCHAR ExtRegInfo[] = {
0x0F,
-0x07,
+0x04,
0x1C,
0xFF
};
+UCHAR ExtRegInfo_AST2300[] = {
+0x0F,
+0x04,
+0x1D,
+0xFF
+};
+
void vSetDefExtReg(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST;
@@ -572,7 +589,11 @@
}
/* Set Ext. Reg */
-pjExtRegInfo = ExtRegInfo;
+if (pAST-jChipType == AST2300)
+pjExtRegInfo = ExtRegInfo_AST2300;
+else
+pjExtRegInfo = ExtRegInfo;
+
jIndex = 0xA0;
while (*(UCHAR *) (pjExtRegInfo) != 0xFF)
{
@@ -581,6 +602,10 @@
pjExtRegInfo++;
}
+/* disable standard IO/MEM decode if secondary */
+if (!xf86IsPrimaryPci(pAST-PciInfo))
+SetIndexRegMask(CRTC_PORT,0xA1, 0xFF, 0x03);
+
/* Set Ext. Default */
SetIndexRegMask(CRTC_PORT,0x8C, 0x00, 0x01);
SetIndexRegMask(CRTC_PORT,0xB7, 0x00, 0x00);
@@ -782,7 +807,7 @@
if (pjDRAMRegInfo-Index == 0xFF00) /* Delay function */
{
for (i=0; i15; i++)
- xf86UDelay(pjDRAMRegInfo-Data);
+usleep(pjDRAMRegInfo-Data);
}
else if ( (pjDRAMRegInfo-Index == 0x0004) (pAST-jChipType != AST2000) )
{
CVS commit: xsrc/external/mit/xf86-video-chips/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Aug 14 08:41:10 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-chips/dist/src: ct_driver.c
Removed Files:
xsrc/external/mit/xf86-video-chips/dist: README.sgml
Log Message:
merge xf86-video-chips-1.2.3
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-chips/dist/README.sgml
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c
diff -u xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.4 xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.5
--- xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c:1.4 Thu Oct 15 22:53:26 2009
+++ xsrc/external/mit/xf86-video-chips/dist/src/ct_driver.c Sat Aug 14 08:41:09 2010
@@ -103,7 +103,9 @@
#include mibstore.h
/* All drivers using the mi banking wrapper need this */
+#ifdef HAVE_ISA
#include mibank.h
+#endif
/* All drivers using the mi colormap manipulation need this */
#include micmap.h
@@ -761,10 +763,12 @@
{
int chip = chipid 0x;
+#ifdef HAVE_ISA
if (busid == BUS_ISA) {
if ((chip == CHIPS_CT64200) || (chip == CHIPS_CT64300))
return ChipsWingineOptions;
}
+#endif
if (busid == BUS_PCI) {
if ((chip = CHIPS_CT65550) (chip = CHIPS_CT69030))
return ChipsHiQVOptions;
@@ -1463,6 +1467,13 @@
from = X_CONFIG;
}
+#ifndef HAVE_ISA
+if (!(cPtr-Flags ChipsLinearSupport)) {
+ xf86DrvMsg(pScrn-scrnIndex, X_ERROR, Linear framebuffer required\n);
+ return FALSE;
+}
+#endif
+
/* linear base */
if (cPtr-Flags ChipsLinearSupport) {
if (cPtr-pEnt-location.type == BUS_PCI) {
@@ -2567,6 +2578,13 @@
from = X_CONFIG;
}
+#ifndef HAVE_ISA
+if (!(cPtr-Flags ChipsLinearSupport)) {
+ xf86DrvMsg(pScrn-scrnIndex, X_ERROR, Linear framebuffer required\n);
+ return FALSE;
+}
+#endif
+
/* linear base */
if (useLinear) {
unsigned char mask = 0xF8;
@@ -3030,6 +3048,13 @@
from = X_CONFIG;
}
+#ifndef HAVE_ISA
+if (!(cPtr-Flags ChipsLinearSupport)) {
+ xf86DrvMsg(pScrn-scrnIndex, X_ERROR, Linear framebuffer required\n);
+ return FALSE;
+}
+#endif
+
/* linear base */
if (useLinear) {
unsigned char mask;
@@ -3642,12 +3667,12 @@
(cPtr-Flags ChipsLinearSupport))
CHIPSResetVideo(pScrn);
-/*xf86UDelay(5);*/
+/*usleep(5);*/
chipsHWCursorOn(cPtr, pScrn);
/* cursor settle delay */
-xf86UDelay(5);
+usleep(5);
CHIPSAdjustFrame(pScrn-scrnIndex, pScrn-frameX0, pScrn-frameY0, 0);
-xf86UDelay(5);
+usleep(5);
return TRUE;
}
@@ -4040,6 +4065,7 @@
cPtr-HWCursorShown = FALSE;
+#ifdef HAVE_ISA
if (!(cPtr-Flags ChipsLinearSupport)) {
miBankInfoPtr pBankInfo;
@@ -4119,7 +4145,9 @@
/* Initialise cursor functions */
miDCInitialize (pScreen, xf86GetPointerScreenFuncs());
-} else {
+} else
+#endif /* HAVE_ISA */
+{
/* !!! Only support linear addressing for now. This might change */
/* Setup pointers to free space in video ram */
#define CHIPSALIGN(size, align) (currentaddr - ((currentaddr - size) ~align))
@@ -4581,7 +4609,9 @@
if (!pScrn-vtSema)
return;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) 8
xf86EnableAccess(pScrn);
+#endif
switch (PowerManagementMode) {
case DPMSModeOn:
/* Screen: On; HSync: On, VSync: On */
CVS commit: xsrc/external/mit/xf86-video-i128/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 08:42:14 UTC 2010 Removed Files: xsrc/external/mit/xf86-video-i128/dist: README.sgml Log Message: merge xf86-video-i128-1.3.4 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-i128/dist/README.sgml Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: tsutsui Date: Sat Aug 14 08:42:15 UTC 2010 Modified Files: src/sys/dev/usb: if_axe.c Log Message: Apply rev 1.39 again. The assignment is not dead, but just a leftover that causes a RX bug. Now axe(4) can receive fragmented packets. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/dev/usb/if_axe.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/usb/if_axe.c diff -u src/sys/dev/usb/if_axe.c:1.40 src/sys/dev/usb/if_axe.c:1.41 --- src/sys/dev/usb/if_axe.c:1.40 Sat Aug 14 08:10:49 2010 +++ src/sys/dev/usb/if_axe.c Sat Aug 14 08:42:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.40 2010/08/14 08:10:49 tsutsui Exp $ */ +/* $NetBSD: if_axe.c,v 1.41 2010/08/14 08:42:15 tsutsui Exp $ */ /* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */ /* @@ -89,7 +89,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.40 2010/08/14 08:10:49 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.41 2010/08/14 08:42:15 tsutsui Exp $); #if defined(__NetBSD__) #include opt_inet.h @@ -1005,9 +1005,6 @@ memcpy(mtod(m, char *), buf, pktlen); - /* No errors; receive the packet. */ - pktlen -= ETHER_CRC_LEN + 4; - s = splnet(); bpf_mtap(ifp, m);
CVS commit: xsrc/external/mit/xf86-video-vmware/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sat Aug 14 08:44:02 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-vmware/dist/src: vmwaremodule.c
Log Message:
merge xf86-video-vmware-11.0.2
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c
diff -u xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.3 xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.4
--- xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c:1.3 Sat May 29 05:11:48 2010
+++ xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodule.c Sat Aug 14 08:44:02 2010
@@ -144,7 +144,7 @@
return FALSE;
}
-static Bool
+static void
vmware_chain_module(pointer opts)
{
int vmwlegacy_devices;
@@ -173,6 +173,7 @@
matched = vmwlegacy_devices;
}
+/* Xorg -configure returns 1 from xf86MatchDevice with NULL gdevs */
for (i = 0; gdevs i vmware_devices; i++) {
gdev = gdevs[i];
gdev-driver = driver_name;
@@ -206,7 +207,6 @@
vmware_setup(pointer module, pointer opts, int *errmaj, int *errmin)
{
static Bool setupDone = 0;
-int ret;
/* This module should be loaded only once, but check to be sure. */
if (!setupDone) {
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sat Aug 14 08:51:32 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/include/xextproto: Makefile
Log Message:
re-enable shapestr.h and syncstr.h, from xextproto 7.1.2.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/include/xextproto/Makefile
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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.112 src/distrib/sets/lists/xcomp/mi:1.113
--- src/distrib/sets/lists/xcomp/mi:1.112 Sun Jul 18 10:58:06 2010
+++ src/distrib/sets/lists/xcomp/mi Sat Aug 14 08:51:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.112 2010/07/18 10:58:06 mrg Exp $
+# $NetBSD: mi,v 1.113 2010/08/14 08:51:32 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -5641,14 +5641,14 @@
./usr/X11R7/include/X11/extensions/shape.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shapeconst.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shapeproto.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/shapestr.h -unknown- obsolete
+./usr/X11R7/include/X11/extensions/shapestr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shm.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shmproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/shmstr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/sync.h -unknown- xorg
./usr/X11R7/include/X11/extensions/syncconst.h -unknown- xorg
./usr/X11R7/include/X11/extensions/syncproto.h -unknown- xorg
-./usr/X11R7/include/X11/extensions/syncstr.h -unknown- obsolete
+./usr/X11R7/include/X11/extensions/syncstr.h -unknown- xorg
./usr/X11R7/include/X11/extensions/vldXvMC.h -unknown- xorg
./usr/X11R7/include/X11/extensions/xcmiscproto.h -unknown- xorg
./usr/X11R7/include/X11/extensions/xcmiscstr.h -unknown- xorg
Index: src/external/mit/xorg/include/xextproto/Makefile
diff -u src/external/mit/xorg/include/xextproto/Makefile:1.4 src/external/mit/xorg/include/xextproto/Makefile:1.5
--- src/external/mit/xorg/include/xextproto/Makefile:1.4 Sat May 22 05:44:08 2010
+++ src/external/mit/xorg/include/xextproto/Makefile Sat Aug 14 08:51:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/22 05:44:08 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/08/14 08:51:32 mrg Exp $
.include bsd.own.mk
@@ -35,7 +35,7 @@
xtestext1proto.h \
xtestproto.h
# XXX XXX XXX xorg-server 1.7 won't need this
-INCS+= shmstr.h
+INCS+= shapestr.h shmstr.h syncstr.h
#
INCSDIR=${X11INCDIR}/X11/extensions
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: tsutsui
Date: Sat Aug 14 09:02:17 UTC 2010
Modified Files:
src/sys/dev/usb: if_axe.c
Log Message:
Make pointer arithmetics of RX buf in axe_rxeof() more readable
to avoid further confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/if_axe.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/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.41 src/sys/dev/usb/if_axe.c:1.42
--- src/sys/dev/usb/if_axe.c:1.41 Sat Aug 14 08:42:15 2010
+++ src/sys/dev/usb/if_axe.c Sat Aug 14 09:02:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.41 2010/08/14 08:42:15 tsutsui Exp $ */
+/* $NetBSD: if_axe.c,v 1.42 2010/08/14 09:02:17 tsutsui Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.41 2010/08/14 08:42:15 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.42 2010/08/14 09:02:17 tsutsui Exp $);
#if defined(__NetBSD__)
#include opt_inet.h
@@ -926,7 +926,7 @@
struct ifnet *ifp;
uint8_t *buf;
uint32_t total_len;
- uint16_t pktlen = 0;
+ u_int rxlen, pktlen;
struct mbuf *m;
struct axe_sframe_hdr hdr;
int s;
@@ -963,31 +963,28 @@
ifp-if_ierrors++;
goto done;
}
- buf += pktlen;
memcpy(hdr, buf, sizeof(hdr));
total_len -= sizeof(hdr);
+ buf += sizeof(hdr);
if ((hdr.len ^ hdr.ilen) != 0x) {
ifp-if_ierrors++;
goto done;
}
- pktlen = le16toh(hdr.len);
- if (pktlen total_len) {
-ifp-if_ierrors++;
-goto done;
- }
-
- buf += sizeof(hdr);
-
- pktlen = roundup2(pktlen, 2);
- if (total_len pktlen)
+ rxlen = le16toh(hdr.len);
+ if (total_len rxlen) {
+pktlen = total_len;
total_len = 0;
- else
-total_len -= pktlen;
+ } else {
+total_len -= rxlen;
+pktlen = rxlen;
+ }
+ rxlen = roundup2(rxlen, 2);
+
} else { /* AX172 */
- pktlen = total_len;
+ pktlen = rxlen = total_len;
total_len = 0;
}
@@ -1004,6 +1001,7 @@
m-m_pkthdr.len = m-m_len = pktlen;
memcpy(mtod(m, char *), buf, pktlen);
+ buf += rxlen;
s = splnet();
CVS commit: xsrc/external/mit/xf86-video-vmware/include
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:10:27 UTC 2010 Modified Files: xsrc/external/mit/xf86-video-vmware/include: config.h Log Message: update this for xf86-video-vmware 11.0.2 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-vmware/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-vmware/include/config.h diff -u xsrc/external/mit/xf86-video-vmware/include/config.h:1.4 xsrc/external/mit/xf86-video-vmware/include/config.h:1.5 --- xsrc/external/mit/xf86-video-vmware/include/config.h:1.4 Sun May 23 06:35:51 2010 +++ xsrc/external/mit/xf86-video-vmware/include/config.h Sat Aug 14 09:10:27 2010 @@ -59,13 +59,13 @@ #define PACKAGE_NAME xf86-video-vmware /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-vmware 11.0.1 +#define PACKAGE_STRING xf86-video-vmware 11.0.2 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-vmware /* Define to the version of this package. */ -#define PACKAGE_VERSION 11.0.1 +#define PACKAGE_VERSION 11.0.2 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 11 @@ -74,10 +74,10 @@ #define PACKAGE_VERSION_MINOR 0 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 1 +#define PACKAGE_VERSION_PATCHLEVEL 2 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 11.0.1 +#define VERSION 11.0.2
CVS commit: xsrc/external/mit/xmore/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:12:44 UTC 2010 Update of /cvsroot/xsrc/external/mit/xmore/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12467 Log Message: initial import of xmore-1.0.2 Status: Vendor Tag: xorg Release Tags: xmore-1-0-2 U xsrc/external/mit/xmore/dist/Makefile.am U xsrc/external/mit/xmore/dist/xmore.h U xsrc/external/mit/xmore/dist/config.guess U xsrc/external/mit/xmore/dist/INSTALL U xsrc/external/mit/xmore/dist/Makefile.in U xsrc/external/mit/xmore/dist/README U xsrc/external/mit/xmore/dist/xmore.sgml U xsrc/external/mit/xmore/dist/install-sh U xsrc/external/mit/xmore/dist/xmore.man U xsrc/external/mit/xmore/dist/aclocal.m4 U xsrc/external/mit/xmore/dist/ChangeLog U xsrc/external/mit/xmore/dist/COPYING U xsrc/external/mit/xmore/dist/configure U xsrc/external/mit/xmore/dist/xmore.c U xsrc/external/mit/xmore/dist/config.sub U xsrc/external/mit/xmore/dist/configure.ac U xsrc/external/mit/xmore/dist/config.h.in U xsrc/external/mit/xmore/dist/missing U xsrc/external/mit/xmore/dist/depcomp N xsrc/external/mit/xmore/dist/app-defaults/XMore No conflicts created by this import
CVS commit: xsrc/external/mit/xrandr/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:12:47 UTC 2010 Update of /cvsroot/xsrc/external/mit/xrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26256 Log Message: initial import of xrandr-1.3.3 Status: Vendor Tag: xorg Release Tags: xrandr-1-3-3 U xsrc/external/mit/xrandr/dist/config.guess C xsrc/external/mit/xrandr/dist/xrandr.c U xsrc/external/mit/xrandr/dist/missing U xsrc/external/mit/xrandr/dist/aclocal.m4 U xsrc/external/mit/xrandr/dist/COPYING U xsrc/external/mit/xrandr/dist/xrandr_test.pl U xsrc/external/mit/xrandr/dist/config.h.in U xsrc/external/mit/xrandr/dist/depcomp U xsrc/external/mit/xrandr/dist/Makefile.in U xsrc/external/mit/xrandr/dist/config.sub U xsrc/external/mit/xrandr/dist/README U xsrc/external/mit/xrandr/dist/keystone.5c U xsrc/external/mit/xrandr/dist/ChangeLog U xsrc/external/mit/xrandr/dist/Makefile.am U xsrc/external/mit/xrandr/dist/xrandr.man U xsrc/external/mit/xrandr/dist/install-sh U xsrc/external/mit/xrandr/dist/INSTALL U xsrc/external/mit/xrandr/dist/configure U xsrc/external/mit/xrandr/dist/configure.ac 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrandr/dist
CVS commit: xsrc/external/mit/xmore/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:13:42 UTC 2010 Removed Files: xsrc/external/mit/xmore/dist: AUTHORS NEWS XMore.ad compile mkinstalldirs print.c print.h printdialog.c printdialog.h printdialogprivates.h Log Message: merge xmore 1.0.2. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmore/dist/AUTHORS \ xsrc/external/mit/xmore/dist/NEWS xsrc/external/mit/xmore/dist/XMore.ad \ xsrc/external/mit/xmore/dist/compile \ xsrc/external/mit/xmore/dist/mkinstalldirs \ xsrc/external/mit/xmore/dist/print.c xsrc/external/mit/xmore/dist/print.h \ xsrc/external/mit/xmore/dist/printdialog.c \ xsrc/external/mit/xmore/dist/printdialog.h \ xsrc/external/mit/xmore/dist/printdialogprivates.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xrandr/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Aug 14 09:14:01 UTC 2010
Modified Files:
xsrc/external/mit/xrandr/dist: xrandr.c
Removed Files:
xsrc/external/mit/xrandr/dist: AUTHORS NEWS
Log Message:
merge xrandr 1.3.3.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xrandr/dist/AUTHORS \
xsrc/external/mit/xrandr/dist/NEWS
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xrandr/dist/xrandr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xrandr/dist/xrandr.c
diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.3 xsrc/external/mit/xrandr/dist/xrandr.c:1.4
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.3 Sun Nov 8 11:40:22 2009
+++ xsrc/external/mit/xrandr/dist/xrandr.c Sat Aug 14 09:14:01 2010
@@ -41,10 +41,6 @@
#include config.h
#endif
-#if RANDR_MAJOR 1 || (RANDR_MAJOR == 1 RANDR_MINOR = 2)
-#define HAS_RANDR_1_2 1
-#endif
-
static char *program_name;
static Display *dpy;
static Window root;
@@ -113,15 +109,10 @@
fprintf(stderr, --verbose\n);
fprintf(stderr, --dryrun\n);
fprintf(stderr, --nograb\n);
-#if HAS_RANDR_1_2
fprintf(stderr, --prop or --properties\n);
fprintf(stderr, --fb widthxheight\n);
fprintf(stderr, --fbmm widthxheight\n);
fprintf(stderr, --dpi dpi/output\n);
-#if 0
-fprintf(stderr, --clone\n);
-fprintf(stderr, --extend\n);
-#endif
fprintf(stderr, --output output\n);
fprintf(stderr, --auto\n);
fprintf(stderr, --mode mode\n);
@@ -151,7 +142,6 @@
fprintf(stderr, --rmmode name\n);
fprintf(stderr, --addmode output name\n);
fprintf(stderr, --delmode output name\n);
-#endif
exit(1);
/*NOTREACHED*/
@@ -181,6 +171,12 @@
va_end (ap);
}
+/* Because fmin requires C99 suppport */
+static inline double dmin (double x, double y)
+{
+return x y ? x : y;
+}
+
static char *
rotation_name (Rotation rotation)
{
@@ -211,13 +207,12 @@
return invalid reflection;
}
-#if HAS_RANDR_1_2
-typedef enum _policy {
-clone, extend
-} policy_t;
-
typedef enum _relation {
-left_of, right_of, above, below, same_as,
+relation_left_of,
+relation_right_of,
+relation_above,
+relation_below,
+relation_same_as,
} relation_t;
typedef struct {
@@ -335,6 +330,8 @@
float blue;
} gamma;
+float brightness;
+
Bool primary;
Bool found;
@@ -637,6 +634,7 @@
fatal (out of memory\n);
output-next = NULL;
output-found = False;
+output-brightness = 1.0;
*outputs_tail = output;
outputs_tail = output-next;
return output;
@@ -947,6 +945,96 @@
return False;
}
+/* Returns the index of the last value in an array 0x */
+static int
+find_last_non_clamped(CARD16 array[], int size) {
+int i;
+for (i = size - 1; i 0; i--) {
+if (array[i] 0x)
+ return i;
+}
+return 0;
+}
+
+static void
+set_gamma_info(output_t *output)
+{
+XRRCrtcGamma *gamma;
+double i1, v1, i2, v2;
+int size, middle, last_best, last_red, last_green, last_blue;
+CARD16 *best_array;
+
+if (!output-crtc_info)
+ return;
+
+size = XRRGetCrtcGammaSize(dpy, output-crtc_info-crtc.xid);
+if (!size) {
+ warning(Failed to get size of gamma for output %s\n, output-output.string);
+ return;
+}
+
+gamma = XRRGetCrtcGamma(dpy, output-crtc_info-crtc.xid);
+if (!gamma) {
+ warning(Failed to get gamma for output %s\n, output-output.string);
+ return;
+}
+
+/*
+ * Here is a bit tricky because gamma is a whole curve for each
+ * color. So, typically, we need to represent 3 * 256 values as 3 + 1
+ * values. Therefore, we approximate the gamma curve (v) by supposing
+ * it always follows the way we set it: a power function (i^g)
+ * multiplied by a brightness (b).
+ * v = i^g * b
+ * so g = (ln(v) - ln(b))/ln(i)
+ * and b can be found using two points (v1,i1) and (v2, i2):
+ * b = e^((ln(v2)*ln(i1) - ln(v1)*ln(i2))/ln(i1/i2))
+ * For the best resolution, we select i2 at the highest place not
+ * clamped and i1 at i2/2. Note that if i2 = 1 (as in most normal
+ * cases), then b = v2.
+ */
+last_red = find_last_non_clamped(gamma-red, size);
+last_green = find_last_non_clamped(gamma-green, size);
+last_blue = find_last_non_clamped(gamma-blue, size);
+best_array = gamma-red;
+last_best = last_red;
+if (last_green last_best) {
+ last_best = last_green;
+ best_array = gamma-green;
+}
+if (last_blue last_best) {
+ last_best = last_blue;
+ best_array = gamma-blue;
+}
+if (last_best == 0)
+ last_best = 1;
+
+middle = last_best / 2;
+i1 = (double)(middle + 1) / size;
+v1 = (double)(best_array[middle]) / 65535;
+i2 = (double)(last_best + 1) / size;
+v2 = (double)(best_array[last_best]) / 65535;
+
CVS commit: xsrc/external/mit/xset/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:14:15 UTC 2010 Removed Files: xsrc/external/mit/xset/dist: AUTHORS NEWS Log Message: merge xset 1.2.0. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xset/dist/AUTHORS \ xsrc/external/mit/xset/dist/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xmore
Module Name:src Committed By: mrg Date: Sat Aug 14 09:25:35 UTC 2010 Modified Files: src/external/mit/xorg/bin/xmore: Makefile Log Message: cope with XMore.ad - XMore. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xmore/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xmore/Makefile diff -u src/external/mit/xorg/bin/xmore/Makefile:1.2 src/external/mit/xorg/bin/xmore/Makefile:1.3 --- src/external/mit/xorg/bin/xmore/Makefile:1.2 Sun Apr 19 21:36:47 2009 +++ src/external/mit/xorg/bin/xmore/Makefile Sat Aug 14 09:25:35 2010 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2009/04/19 21:36:47 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2010/08/14 09:25:35 mrg Exp $ .include bsd.own.mk PROG= xmore -APPDEFS= XMore.ad +APPDEFS= XMore SRCS= xmore.c
CVS commit: src/external/mit/xorg/bin/xmore
Module Name:src
Committed By: mrg
Date: Sat Aug 14 09:26:46 UTC 2010
Modified Files:
src/external/mit/xorg/bin/xmore: Makefile
Log Message:
.. also find XMore.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xmore/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xmore/Makefile
diff -u src/external/mit/xorg/bin/xmore/Makefile:1.3 src/external/mit/xorg/bin/xmore/Makefile:1.4
--- src/external/mit/xorg/bin/xmore/Makefile:1.3 Sat Aug 14 09:25:35 2010
+++ src/external/mit/xorg/bin/xmore/Makefile Sat Aug 14 09:26:46 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/08/14 09:25:35 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2010/08/14 09:26:46 mrg Exp $
.include bsd.own.mk
@@ -13,7 +13,7 @@
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} \
${LIBICE} ${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: xsrc/external/mit/libXau/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:47:01 UTC 2010 Update of /cvsroot/xsrc/external/mit/libXau/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23714 Log Message: initial import of libXau-1.0.6 Status: Vendor Tag: xorg Release Tags: libXau-1-0-6 U xsrc/external/mit/libXau/dist/AuUnlock.c U xsrc/external/mit/libXau/dist/missing U xsrc/external/mit/libXau/dist/config.guess U xsrc/external/mit/libXau/dist/AuFileName.c U xsrc/external/mit/libXau/dist/COPYING U xsrc/external/mit/libXau/dist/AUTHORS U xsrc/external/mit/libXau/dist/aclocal.m4 U xsrc/external/mit/libXau/dist/AuGetBest.c U xsrc/external/mit/libXau/dist/config.h.in U xsrc/external/mit/libXau/dist/AuWrite.c U xsrc/external/mit/libXau/dist/AuRead.c U xsrc/external/mit/libXau/dist/depcomp U xsrc/external/mit/libXau/dist/Makefile.in U xsrc/external/mit/libXau/dist/config.sub U xsrc/external/mit/libXau/dist/AuGetAddr.c U xsrc/external/mit/libXau/dist/AuDispose.c U xsrc/external/mit/libXau/dist/README U xsrc/external/mit/libXau/dist/ChangeLog U xsrc/external/mit/libXau/dist/Autest.c U xsrc/external/mit/libXau/dist/Makefile.am U xsrc/external/mit/libXau/dist/ltmain.sh U xsrc/external/mit/libXau/dist/AuLock.c U xsrc/external/mit/libXau/dist/install-sh U xsrc/external/mit/libXau/dist/xau.pc.in U xsrc/external/mit/libXau/dist/INSTALL U xsrc/external/mit/libXau/dist/configure U xsrc/external/mit/libXau/dist/configure.ac U xsrc/external/mit/libXau/dist/Xau.man U xsrc/external/mit/libXau/dist/include/X11/Xauth.h No conflicts created by this import
CVS commit: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:47:10 UTC 2010 Update of /cvsroot/xsrc/external/mit/libXi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9798 Log Message: initial import of libXi-1.3.2 Status: Vendor Tag: xorg Release Tags: libXi-1-3-2 U xsrc/external/mit/libXi/dist/Makefile.am U xsrc/external/mit/libXi/dist/COPYING U xsrc/external/mit/libXi/dist/aclocal.m4 C xsrc/external/mit/libXi/dist/INSTALL U xsrc/external/mit/libXi/dist/config.sub U xsrc/external/mit/libXi/dist/missing U xsrc/external/mit/libXi/dist/ChangeLog U xsrc/external/mit/libXi/dist/README U xsrc/external/mit/libXi/dist/config.guess U xsrc/external/mit/libXi/dist/Makefile.in U xsrc/external/mit/libXi/dist/configure.ac U xsrc/external/mit/libXi/dist/install-sh U xsrc/external/mit/libXi/dist/xi.pc.in U xsrc/external/mit/libXi/dist/ltmain.sh U xsrc/external/mit/libXi/dist/configure U xsrc/external/mit/libXi/dist/depcomp U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h U xsrc/external/mit/libXi/dist/man/XSetDeviceButtonMapping.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.man U xsrc/external/mit/libXi/dist/man/XIFreeDeviceInfo.man U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man U xsrc/external/mit/libXi/dist/man/XGrabDevice.txt U xsrc/external/mit/libXi/dist/man/XGetDeviceControl.man U xsrc/external/mit/libXi/dist/man/XIGetFocus.man U xsrc/external/mit/libXi/dist/man/XChangeDeviceControl.man U xsrc/external/mit/libXi/dist/man/XIUngrabButton.man U xsrc/external/mit/libXi/dist/man/XSendExtensionEvent.man U xsrc/external/mit/libXi/dist/man/XListDeviceProperties.man U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man U xsrc/external/mit/libXi/dist/man/XChangePointerDevice.man U xsrc/external/mit/libXi/dist/man/XIGrabFocusIn.man U xsrc/external/mit/libXi/dist/man/XGetSelectedExtensionEvents.man U xsrc/external/mit/libXi/dist/man/XSetDeviceFocus.txt U xsrc/external/mit/libXi/dist/man/XIGrabButton.txt U xsrc/external/mit/libXi/dist/man/XQueryDeviceState.man U xsrc/external/mit/libXi/dist/man/XChangeKeyboardDevice.man U xsrc/external/mit/libXi/dist/man/XIDefineCursor.man U xsrc/external/mit/libXi/dist/man/XChangeKeyboardDevice.txt U xsrc/external/mit/libXi/dist/man/Makefile.am U xsrc/external/mit/libXi/dist/man/XGetDeviceProperty.man U xsrc/external/mit/libXi/dist/man/XGetDeviceButtonMapping.man U xsrc/external/mit/libXi/dist/man/XIChangeProperty.txt U xsrc/external/mit/libXi/dist/man/XISetClientPointer.txt U xsrc/external/mit/libXi/dist/man/XIWarpPointer.txt U xsrc/external/mit/libXi/dist/man/XIChangeProperty.man U xsrc/external/mit/libXi/dist/man/XSetDeviceButtonMapping.txt U xsrc/external/mit/libXi/dist/man/XSendExtensionEvent.txt U xsrc/external/mit/libXi/dist/man/XGrabDevice.man U xsrc/external/mit/libXi/dist/man/Makefile.in U xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.man U xsrc/external/mit/libXi/dist/man/XIGrabDevice.man U xsrc/external/mit/libXi/dist/man/XGetFeedbackControl.man U xsrc/external/mit/libXi/dist/man/XIUndefineCursor.man U xsrc/external/mit/libXi/dist/man/XGetFeedbackControl.txt U xsrc/external/mit/libXi/dist/man/XIGrabButton.man U xsrc/external/mit/libXi/dist/man/XIQueryPointer.txt U xsrc/external/mit/libXi/dist/man/XQueryDeviceState.txt U xsrc/external/mit/libXi/dist/man/XIListProperties.txt U xsrc/external/mit/libXi/dist/man/XISetFocus.txt U xsrc/external/mit/libXi/dist/man/XAllowDeviceEvents.man U xsrc/external/mit/libXi/dist/man/XIWarpPointer.man U xsrc/external/mit/libXi/dist/man/XIUngrabFocusIn.man U xsrc/external/mit/libXi/dist/man/XIUngrabDevice.man U xsrc/external/mit/libXi/dist/man/XIGetProperty.man U xsrc/external/mit/libXi/dist/man/XSelectExtensionEvent.man U xsrc/external/mit/libXi/dist/man/XGetDeviceFocus.man U xsrc/external/mit/libXi/dist/man/XGetDeviceModifierMapping.man U xsrc/external/mit/libXi/dist/man/XDeleteDeviceProperty.man U xsrc/external/mit/libXi/dist/man/XGetExtensionVersion.man U xsrc/external/mit/libXi/dist/man/XGetDeviceDontPropagateList.man U xsrc/external/mit/libXi/dist/man/XIGrabEnter.txt U xsrc/external/mit/libXi/dist/man/XGetDeviceKeyMapping.txt U xsrc/external/mit/libXi/dist/man/XIGrabKeycode.man U xsrc/external/mit/libXi/dist/man/XIGrabEnter.man U xsrc/external/mit/libXi/dist/man/XDeviceBell.man U xsrc/external/mit/libXi/dist/man/XChangeDeviceDontPropagateList.man U xsrc/external/mit/libXi/dist/man/XGetDeviceMotionEvents.man U xsrc/external/mit/libXi/dist/man/XISetFocus.man U xsrc/external/mit/libXi/dist/man/XListDeviceProperties.txt U xsrc/external/mit/libXi/dist/man/XIQueryDevice.man U xsrc/external/mit/libXi/dist/man/XIListProperties.man U xsrc/external/mit/libXi/dist/man/XDeviceBell.txt U xsrc/external/mit/libXi/dist/man/XIDefineCursor.txt U xsrc/external/mit/libXi/dist/man/XChangeFeedbackControl.man U xsrc/external/mit/libXi/dist/man/XDeviceTimeCoord.man U xsrc/external/mit/libXi/dist/man/XAllowDeviceEvents.txt U
CVS commit: xsrc/external/mit/libXau/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:48:34 UTC 2010 Removed Files: xsrc/external/mit/libXau/dist: NEWS Log Message: merge libXaw 1.0.6 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXau/dist/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 09:48:51 UTC 2010 Added Files: xsrc/external/mit/libXi/dist: INSTALL Log Message: merge libXi 1.3.3 To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libXi/dist/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/libXi/dist/INSTALL diff -u /dev/null xsrc/external/mit/libXi/dist/INSTALL:1.3 --- /dev/null Sat Aug 14 09:48:51 2010 +++ xsrc/external/mit/libXi/dist/INSTALL Sat Aug 14 09:48:51 2010 @@ -0,0 +1,291 @@ +Installation Instructions +* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options += + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures + + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: tsutsui
Date: Sat Aug 14 09:57:13 UTC 2010
Modified Files:
src/sys/dev/usb: if_axe.c
Log Message:
Fix missed botch in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/if_axe.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/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.42 src/sys/dev/usb/if_axe.c:1.43
--- src/sys/dev/usb/if_axe.c:1.42 Sat Aug 14 09:02:17 2010
+++ src/sys/dev/usb/if_axe.c Sat Aug 14 09:57:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.42 2010/08/14 09:02:17 tsutsui Exp $ */
+/* $NetBSD: if_axe.c,v 1.43 2010/08/14 09:57:13 tsutsui Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.42 2010/08/14 09:02:17 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.43 2010/08/14 09:57:13 tsutsui Exp $);
#if defined(__NetBSD__)
#include opt_inet.h
@@ -978,10 +978,10 @@
pktlen = total_len;
total_len = 0;
} else {
-total_len -= rxlen;
pktlen = rxlen;
+rxlen = roundup2(rxlen, 2);
+total_len -= rxlen;
}
- rxlen = roundup2(rxlen, 2);
} else { /* AX172 */
pktlen = rxlen = total_len;
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 10:17:36 UTC 2010 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11604 Log Message: initial import of libdrm-2.4.21 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-21 U xsrc/external/mit/libdrm/dist/xf86drmMode.h C xsrc/external/mit/libdrm/dist/xf86atomic.h U xsrc/external/mit/libdrm/dist/missing U xsrc/external/mit/libdrm/dist/depcomp U xsrc/external/mit/libdrm/dist/xf86drmSL.c U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/config.guess U xsrc/external/mit/libdrm/dist/Makefile.am U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/install-sh U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/config.sub U xsrc/external/mit/libdrm/dist/Makefile.in U xsrc/external/mit/libdrm/dist/xf86drmMode.c U xsrc/external/mit/libdrm/dist/ltmain.sh U xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/aclocal.m4 U xsrc/external/mit/libdrm/dist/README U xsrc/external/mit/libdrm/dist/config.h.in U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/libdrm.pc.in U xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_resource.c U xsrc/external/mit/libdrm/dist/nouveau/nouveau_device.c U xsrc/external/mit/libdrm/dist/nouveau/nouveau_private.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_device.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_grobj.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_reloc.c U xsrc/external/mit/libdrm/dist/nouveau/nouveau_bo.c U xsrc/external/mit/libdrm/dist/nouveau/nouveau_notifier.c U xsrc/external/mit/libdrm/dist/nouveau/Makefile.am U xsrc/external/mit/libdrm/dist/nouveau/nouveau_resource.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_channel.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_grobj.c U xsrc/external/mit/libdrm/dist/nouveau/nouveau_notifier.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_bo.h U xsrc/external/mit/libdrm/dist/nouveau/libdrm_nouveau.pc.in U xsrc/external/mit/libdrm/dist/nouveau/Makefile.in U xsrc/external/mit/libdrm/dist/nouveau/nouveau_pushbuf.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_drmif.h U xsrc/external/mit/libdrm/dist/nouveau/nouveau_channel.c U xsrc/external/mit/libdrm/dist/nouveau/nouveau_pushbuf.c U xsrc/external/mit/libdrm/dist/nouveau/nouveau_reloc.h U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_space.c U xsrc/external/mit/libdrm/dist/radeon/Makefile.am U xsrc/external/mit/libdrm/dist/radeon/radeon_bo_int.h U xsrc/external/mit/libdrm/dist/radeon/radeon_cs.c U xsrc/external/mit/libdrm/dist/radeon/radeon_bo.c N xsrc/external/mit/libdrm/dist/radeon/bof.h U xsrc/external/mit/libdrm/dist/radeon/radeon_cs.h U xsrc/external/mit/libdrm/dist/radeon/libdrm_radeon.pc.in U xsrc/external/mit/libdrm/dist/radeon/Makefile.in U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.h U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.c U xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_int.h N xsrc/external/mit/libdrm/dist/radeon/bof.c U xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.h U xsrc/external/mit/libdrm/dist/radeon/radeon_bo.h C xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h U xsrc/external/mit/libdrm/dist/intel/Makefile.am U xsrc/external/mit/libdrm/dist/intel/Makefile.in U xsrc/external/mit/libdrm/dist/intel/mm.h U xsrc/external/mit/libdrm/dist/intel/mm.c U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c U xsrc/external/mit/libdrm/dist/intel/intel_chipset.h U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h U xsrc/external/mit/libdrm/dist/intel/libdrm_intel.pc.in U xsrc/external/mit/libdrm/dist/tests/drmtest.c U xsrc/external/mit/libdrm/dist/tests/openclose.c U xsrc/external/mit/libdrm/dist/tests/name_from_fd.c U xsrc/external/mit/libdrm/dist/tests/Makefile.am U xsrc/external/mit/libdrm/dist/tests/gem_flink.c U xsrc/external/mit/libdrm/dist/tests/setversion.c U xsrc/external/mit/libdrm/dist/tests/getversion.c U xsrc/external/mit/libdrm/dist/tests/gem_readwrite.c U xsrc/external/mit/libdrm/dist/tests/Makefile.in U xsrc/external/mit/libdrm/dist/tests/gem_mmap.c U xsrc/external/mit/libdrm/dist/tests/getstats.c U xsrc/external/mit/libdrm/dist/tests/dristat.c U xsrc/external/mit/libdrm/dist/tests/updatedraw.c U xsrc/external/mit/libdrm/dist/tests/getclient.c U xsrc/external/mit/libdrm/dist/tests/drmstat.c U xsrc/external/mit/libdrm/dist/tests/drmtest.h U xsrc/external/mit/libdrm/dist/tests/gem_basic.c U xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.am U xsrc/external/mit/libdrm/dist/tests/modeprint/modeprint.c U xsrc/external/mit/libdrm/dist/tests/modeprint/Makefile.in U
CVS commit: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 10:17:42 UTC 2010 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv879 Log Message: initial import of libpciaccess-0.12.0 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-12-0 U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/scanpci.c U xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c N xsrc/external/mit/libpciaccess/dist/src/x86_pci.c U xsrc/external/mit/libpciaccess/dist/src/scanpci.man U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/m4/ac_define_dir.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 U xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 U xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 No conflicts created by this import
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Aug 14 10:19:32 UTC 2010
Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
Removed Files:
xsrc/external/mit/libdrm/dist/nouveau: nouveau_class.h
Log Message:
merge libdrm 2.4.21.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/nouveau/nouveau_class.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.2 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.3
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.2 Sat May 22 22:13:17 2010
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h Sat Aug 14 10:19:31 2010
@@ -86,8 +86,8 @@
# define atomic_set(x, val) ((x)-atomic = (uint_t)(val))
# define atomic_inc(x) (atomic_inc_uint ((x)-atomic))
# define atomic_dec_and_test(x) (atomic_dec_uint_nv((x)-atomic) == 1)
-# define atomic_add(x, v) (atomic_add_uint((x)-atomic, (v)))
-# define atomic_dec(x, v) (atomic_dec_uint((x)-atomic, (v)))
+# define atomic_add(x, v) (atomic_add_int((x)-atomic, (v)))
+# define atomic_dec(x, v) (atomic_add_int((x)-atomic, -(v)))
# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint ((x)-atomic, oldv, newv)
#endif
Index: xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
diff -u xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.2 xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.3
--- xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.2 Sat May 22 21:47:42 2010
+++ xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c Sat Aug 14 10:19:32 2010
@@ -67,6 +67,8 @@
fprintf(stderr, __VA_ARGS__); \
} while (0)
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
typedef struct _drm_intel_bo_gem drm_intel_bo_gem;
struct drm_intel_gem_bo_bucket {
@@ -74,10 +76,6 @@
unsigned long size;
};
-/* Only cache objects up to 64MB. Bigger than that, and the rounding of the
- * size makes many operations fail that wouldn't otherwise.
- */
-#define DRM_INTEL_GEM_BO_BUCKETS 14
typedef struct _drm_intel_bufmgr_gem {
drm_intel_bufmgr bufmgr;
@@ -94,7 +92,8 @@
int exec_count;
/** Array of lists of cached gem objects of power-of-two sizes */
- struct drm_intel_gem_bo_bucket cache_bucket[DRM_INTEL_GEM_BO_BUCKETS];
+ struct drm_intel_gem_bo_bucket cache_bucket[14 * 4];
+ int num_buckets;
uint64_t gtt_size;
int available_fences;
@@ -286,7 +285,7 @@
{
int i;
- for (i = 0; i DRM_INTEL_GEM_BO_BUCKETS; i++) {
+ for (i = 0; i bufmgr_gem-num_buckets; i++) {
struct drm_intel_gem_bo_bucket *bucket =
bufmgr_gem-cache_bucket[i];
if (bucket-size = size) {
@@ -471,7 +470,7 @@
bo_gem-relocs = malloc(max_relocs *
sizeof(struct drm_i915_gem_relocation_entry));
bo_gem-reloc_target_info = malloc(max_relocs *
- sizeof(drm_intel_reloc_target *));
+ sizeof(drm_intel_reloc_target));
if (bo_gem-relocs == NULL || bo_gem-reloc_target_info == NULL) {
bo_gem-has_error = 1;
@@ -690,31 +689,39 @@
{
drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *)bufmgr;
drm_intel_bo *bo;
- unsigned long size, stride, aligned_y = y;
+ unsigned long size, stride;
+ uint32_t tiling;
int ret;
- /* If we're tiled, our allocations are in 8 or 32-row blocks,
- * so failure to align our height means that we won't allocate
- * enough pages.
- *
- * If we're untiled, we still have to align to 2 rows high
- * because the data port accesses 2x2 blocks even if the
- * bottom row isn't to be rendered, so failure to align means
- * we could walk off the end of the GTT and fault. This is
- * documented on 965, and may be the case on older chipsets
- * too so we try to be careful.
- */
- if (*tiling_mode == I915_TILING_NONE)
- aligned_y = ALIGN(y, 2);
- else if (*tiling_mode == I915_TILING_X)
- aligned_y = ALIGN(y, 8);
- else if (*tiling_mode == I915_TILING_Y)
- aligned_y = ALIGN(y, 32);
-
- stride = x * cpp;
- stride = drm_intel_gem_bo_tile_pitch(bufmgr_gem, stride, *tiling_mode);
- size = stride * aligned_y;
- size = drm_intel_gem_bo_tile_size(bufmgr_gem, size, tiling_mode);
+ do {
+ unsigned long aligned_y;
+
+ tiling = *tiling_mode;
+
+ /* If we're tiled, our allocations are in 8 or 32-row blocks,
+ * so failure to align our height means that we won't allocate
+ * enough pages.
+ *
+ * If we're untiled, we still have to align to 2 rows high
+ * because the data port accesses 2x2 blocks even if the
+ * bottom row isn't to be rendered, so failure to align means
+ * we could walk off the end of the GTT and fault. This is
+ * documented on 965, and may be the case on older chipsets
+ * too
CVS commit: src/external/mit/xorg/lib/libdrm_radeon
Module Name:src
Committed By: mrg
Date: Sat Aug 14 10:29:43 UTC 2010
Modified Files:
src/external/mit/xorg/lib/libdrm_radeon: Makefile
Log Message:
add bof.c for libdrm 2.4.21.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libdrm_radeon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libdrm_radeon/Makefile
diff -u src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.3 src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.4
--- src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.3 Thu Jun 3 09:43:16 2010
+++ src/external/mit/xorg/lib/libdrm_radeon/Makefile Sat Aug 14 10:29:43 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/03 09:43:16 veego Exp $
+# $NetBSD: Makefile,v 1.4 2010/08/14 10:29:43 mrg Exp $
.include bsd.own.mk
@@ -10,7 +10,8 @@
radeon_bo_gem.c \
radeon_cs.c \
radeon_cs_gem.c \
- radeon_cs_space.c
+ radeon_cs_space.c \
+ bof.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: tsutsui
Date: Sat Aug 14 10:30:11 UTC 2010
Modified Files:
src/sys/dev/usb: if_axe.c if_axereg.h
Log Message:
No need to keep TX/RX mbufs during xfers in struct axe_chain.
All xfers are done against axe_buf allocated by usbd_alloc_buffer()
and nothing touched preserved mbufs during xfers.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/if_axereg.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/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.43 src/sys/dev/usb/if_axe.c:1.44
--- src/sys/dev/usb/if_axe.c:1.43 Sat Aug 14 09:57:13 2010
+++ src/sys/dev/usb/if_axe.c Sat Aug 14 10:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.43 2010/08/14 09:57:13 tsutsui Exp $ */
+/* $NetBSD: if_axe.c,v 1.44 2010/08/14 10:30:11 tsutsui Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.43 2010/08/14 09:57:13 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.44 2010/08/14 10:30:11 tsutsui Exp $);
#if defined(__NetBSD__)
#include opt_inet.h
@@ -184,8 +184,6 @@
static int axe_tx_list_init(struct axe_softc *);
static int axe_rx_list_init(struct axe_softc *);
-static int axe_newbuf(struct axe_softc *, struct axe_chain *,
- struct mbuf *);
static int axe_encap(struct axe_softc *, struct mbuf *, int);
static void axe_rxeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void axe_txeof(usbd_xfer_handle, usbd_private_handle, usbd_status);
@@ -813,44 +811,6 @@
}
}
-/*
- * Initialize an RX descriptor and attach an MBUF cluster.
- */
-static int
-axe_newbuf(struct axe_softc *sc, struct axe_chain *c, struct mbuf *m)
-{
- struct mbuf *m_new = NULL;
-
- DPRINTFN(10,(%s: %s: enter\n, USBDEVNAME(sc-axe_dev),__func__));
-
- if (m == NULL) {
- MGETHDR(m_new, M_DONTWAIT, MT_DATA);
- if (m_new == NULL) {
- aprint_error_dev(sc-axe_dev, no memory for rx list
- -- packet dropped!\n);
- return ENOBUFS;
- }
-
- MCLGET(m_new, M_DONTWAIT);
- if ((m_new-m_flags M_EXT) == 0) {
- aprint_error_dev(sc-axe_dev, no memory for rx list
- -- packet dropped!\n);
- m_freem(m_new);
- return ENOBUFS;
- }
- m_new-m_len = m_new-m_pkthdr.len = MCLBYTES;
- } else {
- m_new = m;
- m_new-m_len = m_new-m_pkthdr.len = MCLBYTES;
- m_new-m_data = m_new-m_ext.ext_buf;
- }
-
- m_adj(m_new, ETHER_ALIGN);
- c-axe_mbuf = m_new;
-
- return 0;
-}
-
static int
axe_rx_list_init(struct axe_softc *sc)
{
@@ -865,8 +825,6 @@
c = cd-axe_rx_chain[i];
c-axe_sc = sc;
c-axe_idx = i;
- if (axe_newbuf(sc, c, NULL) == ENOBUFS)
- return ENOBUFS;
if (c-axe_xfer == NULL) {
c-axe_xfer = usbd_alloc_xfer(sc-axe_udev);
if (c-axe_xfer == NULL)
@@ -897,7 +855,6 @@
c = cd-axe_tx_chain[i];
c-axe_sc = sc;
c-axe_idx = i;
- c-axe_mbuf = NULL;
if (c-axe_xfer == NULL) {
c-axe_xfer = usbd_alloc_xfer(sc-axe_udev);
if (c-axe_xfer == NULL)
@@ -988,14 +945,22 @@
total_len = 0;
}
- m = c-axe_mbuf;
-
- /* XXX ugly */
- if (axe_newbuf(sc, c, NULL) == ENOBUFS) {
+ MGETHDR(m, M_DONTWAIT, MT_DATA);
+ if (m == NULL) {
ifp-if_ierrors++;
goto done;
}
+ if (pktlen MHLEN - ETHER_ALIGN) {
+ MCLGET(m, M_DONTWAIT);
+ if ((m-m_flags M_EXT) == 0) {
+m_freem(m);
+ifp-if_ierrors++;
+goto done;
+ }
+ }
+ m-m_data += ETHER_ALIGN;
+
ifp-if_ipackets++;
m-m_pkthdr.rcvif = ifp;
m-m_pkthdr.len = m-m_len = pktlen;
@@ -1066,9 +1031,6 @@
ifp-if_timer = 0;
ifp-if_flags = ~IFF_OACTIVE;
- m_freem(c-axe_mbuf);
- c-axe_mbuf = NULL;
-
if (!IFQ_IS_EMPTY(ifp-if_snd))
axe_start(ifp);
@@ -1170,7 +1132,7 @@
m_copydata(m, 0, m-m_pkthdr.len, c-axe_buf);
length = m-m_pkthdr.len;
}
- c-axe_mbuf = m;
+ m_freem(m);
usbd_setup_xfer(c-axe_xfer, sc-axe_ep[AXE_ENDPT_TX],
c, c-axe_buf, length, USBD_FORCE_SHORT_XFER | USBD_NO_COPY, 1,
@@ -1477,10 +1439,6 @@
/* Free RX resources. */
for (i = 0; i AXE_RX_LIST_CNT; i++) {
- if (sc-axe_cdata.axe_rx_chain[i].axe_mbuf != NULL) {
- m_freem(sc-axe_cdata.axe_rx_chain[i].axe_mbuf);
- sc-axe_cdata.axe_rx_chain[i].axe_mbuf = NULL;
- }
if (sc-axe_cdata.axe_rx_chain[i].axe_xfer != NULL) {
usbd_free_xfer(sc-axe_cdata.axe_rx_chain[i].axe_xfer);
sc-axe_cdata.axe_rx_chain[i].axe_xfer = NULL;
@@ -1489,10 +1447,6 @@
/* Free TX resources. */
for (i = 0; i AXE_TX_LIST_CNT; i++) {
- if (sc-axe_cdata.axe_tx_chain[i].axe_mbuf != NULL) {
- m_freem(sc-axe_cdata.axe_tx_chain[i].axe_mbuf);
- sc-axe_cdata.axe_tx_chain[i].axe_mbuf = NULL;
- }
if (sc-axe_cdata.axe_tx_chain[i].axe_xfer != NULL) {
usbd_free_xfer(sc-axe_cdata.axe_tx_chain[i].axe_xfer);
sc-axe_cdata.axe_tx_chain[i].axe_xfer = NULL;
Index: src/sys/dev/usb/if_axereg.h
diff
CVS commit: xsrc/external/mit/libXfixes/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 10:45:59 UTC 2010 Update of /cvsroot/xsrc/external/mit/libXfixes/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9694 Log Message: initial import of libXfixes-4.0.5 Status: Vendor Tag: xorg Release Tags: libXfixes-4-0-5 U xsrc/external/mit/libXfixes/dist/config.h.in U xsrc/external/mit/libXfixes/dist/config.sub U xsrc/external/mit/libXfixes/dist/configure U xsrc/external/mit/libXfixes/dist/ChangeLog U xsrc/external/mit/libXfixes/dist/config.guess U xsrc/external/mit/libXfixes/dist/INSTALL U xsrc/external/mit/libXfixes/dist/README U xsrc/external/mit/libXfixes/dist/configure.ac U xsrc/external/mit/libXfixes/dist/Makefile.in U xsrc/external/mit/libXfixes/dist/depcomp U xsrc/external/mit/libXfixes/dist/missing U xsrc/external/mit/libXfixes/dist/Makefile.am U xsrc/external/mit/libXfixes/dist/COPYING U xsrc/external/mit/libXfixes/dist/xfixes.pc.in U xsrc/external/mit/libXfixes/dist/install-sh U xsrc/external/mit/libXfixes/dist/ltmain.sh U xsrc/external/mit/libXfixes/dist/aclocal.m4 U xsrc/external/mit/libXfixes/dist/AUTHORS U xsrc/external/mit/libXfixes/dist/man/Xfixes.man U xsrc/external/mit/libXfixes/dist/man/Makefile.am U xsrc/external/mit/libXfixes/dist/man/Makefile.in U xsrc/external/mit/libXfixes/dist/include/X11/extensions/Xfixes.h U xsrc/external/mit/libXfixes/dist/src/SaveSet.c U xsrc/external/mit/libXfixes/dist/src/Makefile.in U xsrc/external/mit/libXfixes/dist/src/Region.c U xsrc/external/mit/libXfixes/dist/src/Xfixes.c U xsrc/external/mit/libXfixes/dist/src/Makefile.am U xsrc/external/mit/libXfixes/dist/src/Selection.c U xsrc/external/mit/libXfixes/dist/src/Cursor.c U xsrc/external/mit/libXfixes/dist/src/Xfixesint.h No conflicts created by this import
CVS commit: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 10:46:18 UTC 2010 Update of /cvsroot/xsrc/external/mit/libXfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11627 Log Message: initial import of libXfont-1.4.2 Status: Vendor Tag: xorg Release Tags: libXfont-1-4-2 U xsrc/external/mit/libXfont/dist/COPYING U xsrc/external/mit/libXfont/dist/Makefile.am U xsrc/external/mit/libXfont/dist/install-sh U xsrc/external/mit/libXfont/dist/configure.ac U xsrc/external/mit/libXfont/dist/configure U xsrc/external/mit/libXfont/dist/README U xsrc/external/mit/libXfont/dist/config.sub U xsrc/external/mit/libXfont/dist/depcomp U xsrc/external/mit/libXfont/dist/ltmain.sh U xsrc/external/mit/libXfont/dist/missing U xsrc/external/mit/libXfont/dist/AUTHORS U xsrc/external/mit/libXfont/dist/config.guess U xsrc/external/mit/libXfont/dist/xfont.pc.in U xsrc/external/mit/libXfont/dist/ChangeLog U xsrc/external/mit/libXfont/dist/Makefile.in U xsrc/external/mit/libXfont/dist/aclocal.m4 U xsrc/external/mit/libXfont/dist/config.h.in N xsrc/external/mit/libXfont/dist/INSTALL U xsrc/external/mit/libXfont/dist/doc/fontlib.xml U xsrc/external/mit/libXfont/dist/doc/fontlib.css U xsrc/external/mit/libXfont/dist/doc/fontlib.xsl U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontconf.h.in U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontxlfd.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bdfint.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmisc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bufio.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilst.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontencc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bitmap.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontshow.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfil.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilio.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/pcf.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontutil.h U xsrc/external/mit/libXfont/dist/src/Makefile.am U xsrc/external/mit/libXfont/dist/src/dummy.c U xsrc/external/mit/libXfont/dist/src/Makefile.in U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.am U xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.h U xsrc/external/mit/libXfont/dist/src/FreeType/fttools.c U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.c U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.h U xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c U xsrc/external/mit/libXfont/dist/src/FreeType/ft.h U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in U xsrc/external/mit/libXfont/dist/src/FreeType/ftenc.c U xsrc/external/mit/libXfont/dist/src/stubs/getnewfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.am U xsrc/external/mit/libXfont/dist/src/stubs/findoldfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/delfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/stfntcfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/regfpefunc.c U xsrc/external/mit/libXfont/dist/src/stubs/gettime.c U xsrc/external/mit/libXfont/dist/src/stubs/fatalerror.c U xsrc/external/mit/libXfont/dist/src/stubs/errorf.c U xsrc/external/mit/libXfont/dist/src/stubs/getdefptsize.c U xsrc/external/mit/libXfont/dist/src/stubs/servclient.c U xsrc/external/mit/libXfont/dist/src/stubs/initfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/stubs.h U xsrc/external/mit/libXfont/dist/src/stubs/setfntauth.c U xsrc/external/mit/libXfont/dist/src/stubs/csignal.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in U xsrc/external/mit/libXfont/dist/src/stubs/getcres.c U xsrc/external/mit/libXfont/dist/src/stubs/rmfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/cauthgen.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.am U xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c U xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c U xsrc/external/mit/libXfont/dist/src/fontfile/bitsource.c U xsrc/external/mit/libXfont/dist/src/fontfile/gunzip.c U xsrc/external/mit/libXfont/dist/src/fontfile/catalogue.c U xsrc/external/mit/libXfont/dist/src/fontfile/defaults.c U xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontscale.c U xsrc/external/mit/libXfont/dist/src/fontfile/renderers.c U xsrc/external/mit/libXfont/dist/src/fontfile/register.c U xsrc/external/mit/libXfont/dist/src/fontfile/bufio.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in U xsrc/external/mit/libXfont/dist/src/fontfile/fontdir.c C xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontencc.c U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.am U xsrc/external/mit/libXfont/dist/src/builtins/dir.c U xsrc/external/mit/libXfont/dist/src/builtins/fpe.c U
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: tsutsui
Date: Sat Aug 14 10:47:57 UTC 2010
Modified Files:
src/sys/dev/usb: if_axe.c if_axereg.h
Log Message:
- use uint8_t for xfer buffers and byte numbers
- use bool for sc_dying and sc_attached booleans
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/if_axereg.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/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.44 src/sys/dev/usb/if_axe.c:1.45
--- src/sys/dev/usb/if_axe.c:1.44 Sat Aug 14 10:30:11 2010
+++ src/sys/dev/usb/if_axe.c Sat Aug 14 10:47:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.44 2010/08/14 10:30:11 tsutsui Exp $ */
+/* $NetBSD: if_axe.c,v 1.45 2010/08/14 10:47:57 tsutsui Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.44 2010/08/14 10:30:11 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.45 2010/08/14 10:47:57 tsutsui Exp $);
#if defined(__NetBSD__)
#include opt_inet.h
@@ -732,7 +732,7 @@
callout_init(sc-axe_stat_ch, 0);
callout_setfunc(sc-axe_stat_ch, axe_tick, sc);
- sc-axe_attached = 1;
+ sc-axe_attached = true;
splx(s);
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc-axe_udev, sc-axe_dev);
@@ -751,7 +751,7 @@
if (!sc-axe_attached)
return 0;
- sc-axe_dying = 1;
+ sc-axe_dying = true;
/*
* Remove any pending tasks. They cannot be executing because they run
@@ -781,7 +781,7 @@
aprint_debug_dev(self, detach has active endpoints\n);
#endif
- sc-axe_attached = 0;
+ sc-axe_attached = false;
if (--sc-axe_refcnt = 0) {
/* Wait for processes to go away. */
@@ -804,7 +804,7 @@
switch (act) {
case DVACT_DEACTIVATE:
if_deactivate(sc-axe_ec.ec_if);
- sc-axe_dying = 1;
+ sc-axe_dying = true;
return 0;
default:
return EOPNOTSUPP;
@@ -965,7 +965,7 @@
m-m_pkthdr.rcvif = ifp;
m-m_pkthdr.len = m-m_len = pktlen;
- memcpy(mtod(m, char *), buf, pktlen);
+ memcpy(mtod(m, uint8_t *), buf, pktlen);
buf += rxlen;
s = splnet();
Index: src/sys/dev/usb/if_axereg.h
diff -u src/sys/dev/usb/if_axereg.h:1.11 src/sys/dev/usb/if_axereg.h:1.12
--- src/sys/dev/usb/if_axereg.h:1.11 Sat Aug 14 10:30:11 2010
+++ src/sys/dev/usb/if_axereg.h Sat Aug 14 10:47:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axereg.h,v 1.11 2010/08/14 10:30:11 tsutsui Exp $ */
+/* $NetBSD: if_axereg.h,v 1.12 2010/08/14 10:47:57 tsutsui Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -176,7 +176,7 @@
struct axe_chain {
struct axe_softc *axe_sc;
usbd_xfer_handle axe_xfer;
- char *axe_buf;
+ uint8_t *axe_buf;
int axe_accum;
int axe_idx;
};
@@ -216,8 +216,8 @@
struct callout axe_stat_ch;
int axe_refcnt;
- char axe_dying;
- char axe_attached;
+ bool axe_dying;
+ bool axe_attached;
struct usb_task axe_tick_task;
@@ -225,8 +225,8 @@
int axe_link;
- unsigned char axe_ipgs[3];
- unsigned char axe_phyaddrs[2];
+ uint8_t axe_ipgs[3];
+ uint8_t axe_phyaddrs[2];
struct timeval axe_rx_notice;
int axe_bufsz;
CVS commit: xsrc/external/mit/libXfixes/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 10:50:23 UTC 2010 Removed Files: xsrc/external/mit/libXfixes/dist: NEWS Log Message: merge libXfixes 4.0.5. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXfixes/dist/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libXfont/dist/src/fontfile
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 10:50:32 UTC 2010 Modified Files: xsrc/external/mit/libXfont/dist/src/fontfile: bunzip2.c Log Message: merge libXfont 1.4.2. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c diff -u xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c:1.2 xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c:1.3 --- xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c:1.2 Wed Jun 10 07:51:31 2009 +++ xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c Sat Aug 14 10:50:32 2010 @@ -2,33 +2,28 @@ written by Mark Eichin eic...@kitten.gen.ma.us September 1996. intended for inclusion in X11 public releases. */ -/* Copyright 2008 Sun Microsystems, Inc. All rights reserved. +/* + * Copyright © 2008 Sun Microsystems, Inc. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * Software), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL - * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - */ + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ #ifdef HAVE_CONFIG_H
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sat Aug 14 11:16:14 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_cpu.c
Log Message:
Check the cold-flag also in the notify handler.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_cpu.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/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.15 src/sys/dev/acpi/acpi_cpu.c:1.16
--- src/sys/dev/acpi/acpi_cpu.c:1.15 Fri Aug 13 16:21:50 2010
+++ src/sys/dev/acpi/acpi_cpu.c Sat Aug 14 11:16:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.c,v 1.15 2010/08/13 16:21:50 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.16 2010/08/14 11:16:14 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.15 2010/08/13 16:21:50 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.16 2010/08/14 11:16:14 jruoho Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -454,6 +454,9 @@
sc = device_private(self);
+ if (sc-sc_cold != false)
+ return;
+
switch (evt) {
case ACPICPU_C_NOTIFY:
CVS commit: xsrc/external/mit/libxcb/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 11:35:44 UTC 2010 Update of /cvsroot/xsrc/external/mit/libxcb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15795 Log Message: initial import of libxcb-1.7 Status: Vendor Tag: xorg Release Tags: libxcb-1-7 U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in U xsrc/external/mit/libxcb/dist/configure.ac U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in U xsrc/external/mit/libxcb/dist/Makefile.in U xsrc/external/mit/libxcb/dist/configure U xsrc/external/mit/libxcb/dist/NEWS U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in U xsrc/external/mit/libxcb/dist/autogen.sh U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in U xsrc/external/mit/libxcb/dist/xcb.pc.in U xsrc/external/mit/libxcb/dist/xcb-render.pc.in U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in U xsrc/external/mit/libxcb/dist/xcb-res.pc.in U xsrc/external/mit/libxcb/dist/xcb-record.pc.in U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in U xsrc/external/mit/libxcb/dist/missing U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in U xsrc/external/mit/libxcb/dist/depcomp U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in U xsrc/external/mit/libxcb/dist/README U xsrc/external/mit/libxcb/dist/INSTALL U xsrc/external/mit/libxcb/dist/config.guess U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in U xsrc/external/mit/libxcb/dist/COPYING U xsrc/external/mit/libxcb/dist/aclocal.m4 U xsrc/external/mit/libxcb/dist/Makefile.am U xsrc/external/mit/libxcb/dist/ltmain.sh U xsrc/external/mit/libxcb/dist/acinclude.m4 U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in U xsrc/external/mit/libxcb/dist/config.sub U xsrc/external/mit/libxcb/dist/install-sh U xsrc/external/mit/libxcb/dist/tools/constants U xsrc/external/mit/libxcb/dist/tools/README U xsrc/external/mit/libxcb/dist/tools/api_conv.pl U xsrc/external/mit/libxcb/dist/src/xcb_list.c U xsrc/external/mit/libxcb/dist/src/xcb_in.c U xsrc/external/mit/libxcb/dist/src/Makefile.in U xsrc/external/mit/libxcb/dist/src/xcb_auth.c U xsrc/external/mit/libxcb/dist/src/xcb_ext.c U xsrc/external/mit/libxcb/dist/src/c_client.py U xsrc/external/mit/libxcb/dist/src/xcbint.h U xsrc/external/mit/libxcb/dist/src/xcb_conn.c U xsrc/external/mit/libxcb/dist/src/xcb_util.c U xsrc/external/mit/libxcb/dist/src/xcb_out.c U xsrc/external/mit/libxcb/dist/src/xcb.h U xsrc/external/mit/libxcb/dist/src/xcbext.h U xsrc/external/mit/libxcb/dist/src/Makefile.am U xsrc/external/mit/libxcb/dist/src/config.h.in U xsrc/external/mit/libxcb/dist/src/xcb_xid.c U xsrc/external/mit/libxcb/dist/tests/check_public.c U xsrc/external/mit/libxcb/dist/tests/Makefile.in U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl U xsrc/external/mit/libxcb/dist/tests/check_all.c U xsrc/external/mit/libxcb/dist/tests/check_suites.h U xsrc/external/mit/libxcb/dist/tests/Makefile.am U xsrc/external/mit/libxcb/dist/doc/Makefile.in U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in U xsrc/external/mit/libxcb/dist/doc/Makefile.am U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css No conflicts created by this import
CVS commit: xsrc/external/mit/libxcb/include
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 11:38:31 UTC 2010 Modified Files: xsrc/external/mit/libxcb/include: config.h Log Message: update this for libxcb 1.7. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/libxcb/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libxcb/include/config.h diff -u xsrc/external/mit/libxcb/include/config.h:1.1 xsrc/external/mit/libxcb/include/config.h:1.2 --- xsrc/external/mit/libxcb/include/config.h:1.1 Sun Jul 18 07:04:52 2010 +++ xsrc/external/mit/libxcb/include/config.h Sat Aug 14 11:38:31 2010 @@ -60,7 +60,7 @@ #define PACKAGE_NAME libxcb /* Define to the full name and version of this package. */ -#define PACKAGE_STRING libxcb 1.6 +#define PACKAGE_STRING libxcb 1.7 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME libxcb @@ -69,7 +69,7 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.6 +#define PACKAGE_VERSION 1.7 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -78,7 +78,7 @@ #define USE_POLL 1 /* Version number of package */ -#define VERSION 1.6 +#define VERSION 1.7 /* XCB buffer queue size */ #define XCB_QUEUE_BUFFER_SIZE 16384
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: tsutsui
Date: Sat Aug 14 12:11:46 UTC 2010
Modified Files:
src/sys/dev/usb: if_axe.c
Log Message:
Don't free TX mbuf until it's passed to bpf(9).
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_axe.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/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.45 src/sys/dev/usb/if_axe.c:1.46
--- src/sys/dev/usb/if_axe.c:1.45 Sat Aug 14 10:47:57 2010
+++ src/sys/dev/usb/if_axe.c Sat Aug 14 12:11:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.45 2010/08/14 10:47:57 tsutsui Exp $ */
+/* $NetBSD: if_axe.c,v 1.46 2010/08/14 12:11:46 tsutsui Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.45 2010/08/14 10:47:57 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.46 2010/08/14 12:11:46 tsutsui Exp $);
#if defined(__NetBSD__)
#include opt_inet.h
@@ -1132,7 +1132,6 @@
m_copydata(m, 0, m-m_pkthdr.len, c-axe_buf);
length = m-m_pkthdr.len;
}
- m_freem(m);
usbd_setup_xfer(c-axe_xfer, sc-axe_ep[AXE_ENDPT_TX],
c, c-axe_buf, length, USBD_FORCE_SHORT_XFER | USBD_NO_COPY, 1,
@@ -1154,7 +1153,7 @@
axe_start(struct ifnet *ifp)
{
struct axe_softc *sc;
- struct mbuf *m_head = NULL;
+ struct mbuf *m;
sc = ifp-if_softc;
@@ -1164,22 +1163,23 @@
if ((ifp-if_flags (IFF_OACTIVE|IFF_RUNNING)) != IFF_RUNNING)
return;
- IFQ_POLL(ifp-if_snd, m_head);
- if (m_head == NULL) {
+ IFQ_POLL(ifp-if_snd, m);
+ if (m == NULL) {
return;
}
- if (axe_encap(sc, m_head, 0)) {
+ if (axe_encap(sc, m, 0)) {
ifp-if_flags |= IFF_OACTIVE;
return;
}
- IFQ_DEQUEUE(ifp-if_snd, m_head);
+ IFQ_DEQUEUE(ifp-if_snd, m);
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
*/
- bpf_mtap(ifp, m_head);
+ bpf_mtap(ifp, m);
+ m_freem(m);
ifp-if_flags |= IFF_OACTIVE;
CVS commit: src/usr.sbin/fwctl
Module Name:src Committed By: cegger Date: Sat Aug 14 16:23:49 UTC 2010 Modified Files: src/usr.sbin/fwctl: fwctl.8 Log Message: fwcontrol - fwctl To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/fwctl/fwctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/fwctl/fwctl.8 diff -u src/usr.sbin/fwctl/fwctl.8:1.8 src/usr.sbin/fwctl/fwctl.8:1.9 --- src/usr.sbin/fwctl/fwctl.8:1.8 Mon May 18 11:57:30 2009 +++ src/usr.sbin/fwctl/fwctl.8 Sat Aug 14 16:23:49 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: fwctl.8,v 1.8 2009/05/18 11:57:30 wiz Exp $ +.\ $NetBSD: fwctl.8,v 1.9 2010/08/14 16:23:49 cegger Exp $ .\ .\ Copyright (c) 2005 KIYOHARA Takashi .\ All rights reserved. @@ -161,7 +161,7 @@ with .Dq Li bs=144000 . .Pp -.Dl fwcontrol -R file.m2t +.Dl fwctl -R file.m2t .Pp Receive an MPEG TS stream from a camera producing MPEG transport stream. This has been tested with SONY HDR-FX1E camera that produces HD @@ -169,7 +169,7 @@ .Pp To send the stream from the camera over the network using TCP (which supprisingly works better with vlc), you can use -.Dl fwcontrol -R - | nc 192.168.10.11 9000 +.Dl fwctl -R - | nc 192.168.10.11 9000 with .Pa pkgsrc/net/netcat and to receive the stream, use @@ -180,7 +180,7 @@ since vlc is not fast enough to read UDP packets from buffers and thus it experiences dropouts when run directly. The sending side can use -.Dl fwcontrol -R - | nc 192.168.10.11 9000 +.Dl fwctl -R - | nc 192.168.10.11 9000 and to receive the stream, use .Dl nc -l -u -p 9000 | buffer -s 10k -b 1000 -m 20m -p 5 | vlc - .Pp
CVS commit: src/usr.sbin/fwctl
Module Name:src Committed By: pgoyette Date: Sat Aug 14 16:32:26 UTC 2010 Modified Files: src/usr.sbin/fwctl: fwctl.8 Log Message: Fix a typo To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/fwctl/fwctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/fwctl/fwctl.8 diff -u src/usr.sbin/fwctl/fwctl.8:1.9 src/usr.sbin/fwctl/fwctl.8:1.10 --- src/usr.sbin/fwctl/fwctl.8:1.9 Sat Aug 14 16:23:49 2010 +++ src/usr.sbin/fwctl/fwctl.8 Sat Aug 14 16:32:26 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: fwctl.8,v 1.9 2010/08/14 16:23:49 cegger Exp $ +.\ $NetBSD: fwctl.8,v 1.10 2010/08/14 16:32:26 pgoyette Exp $ .\ .\ Copyright (c) 2005 KIYOHARA Takashi .\ All rights reserved. @@ -77,7 +77,8 @@ by phy_config packet. .It Fl l Ar file Load hex dump file of the configuration ROM and parse it. -.It Fl M Ar modeExplicitly specify either +.It Fl M Ar mode +Explicitly specify either .Ar dv or .Ar mpeg
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Sat Aug 14 17:06:58 UTC 2010 Modified Files: src/share/man/man9: module.9 Log Message: Add an Authors section To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/module.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/module.9 diff -u src/share/man/man9/module.9:1.12 src/share/man/man9/module.9:1.13 --- src/share/man/man9/module.9:1.12 Wed Aug 11 20:10:55 2010 +++ src/share/man/man9/module.9 Sat Aug 14 17:06:58 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: module.9,v 1.12 2010/08/11 20:10:55 wiz Exp $ +.\ $NetBSD: module.9,v 1.13 2010/08/14 17:06:58 pgoyette Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -386,6 +386,14 @@ describes the public interface. .Sh SEE ALSO .Xr modctl 2 +.Sh AUTHORS +.An -nosplit +The +.Nm +system was written by +.An Andrew Doran Aq a...@netbsd.org . +This manual page was written by +.An Paul Goyette Aq pgoye...@netbsd.org . .Sh HISTORY The kernel module subsystem first appeared in .Nx 5.0 .
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Sat Aug 14 17:27:34 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_cpu_cstate.c acpi_cpu_pstate.c Log Message: Do not accidentally write zeros to (PSTATE_CNT and CST_CNT) registers. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/acpi/acpi_cpu_cstate.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/acpi_cpu_pstate.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/acpi/acpi_cpu_cstate.c diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.26 src/sys/dev/acpi/acpi_cpu_cstate.c:1.27 --- src/sys/dev/acpi/acpi_cpu_cstate.c:1.26 Sat Aug 14 05:41:22 2010 +++ src/sys/dev/acpi/acpi_cpu_cstate.c Sat Aug 14 17:27:34 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_cstate.c,v 1.26 2010/08/14 05:41:22 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_cstate.c,v 1.27 2010/08/14 17:27:34 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.26 2010/08/14 05:41:22 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.27 2010/08/14 17:27:34 jruoho Exp $); #include sys/param.h #include sys/cpu.h @@ -511,7 +511,7 @@ const uint8_t val = AcpiGbl_FADT.CstControl; const uint32_t addr = AcpiGbl_FADT.SmiCommand; - if (addr == 0) + if (addr == 0 || val == 0) return; (void)AcpiOsWritePort(addr, val, 8); Index: src/sys/dev/acpi/acpi_cpu_pstate.c diff -u src/sys/dev/acpi/acpi_cpu_pstate.c:1.18 src/sys/dev/acpi/acpi_cpu_pstate.c:1.19 --- src/sys/dev/acpi/acpi_cpu_pstate.c:1.18 Sat Aug 14 05:41:22 2010 +++ src/sys/dev/acpi/acpi_cpu_pstate.c Sat Aug 14 17:27:34 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_pstate.c,v 1.18 2010/08/14 05:41:22 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_pstate.c,v 1.19 2010/08/14 17:27:34 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_pstate.c,v 1.18 2010/08/14 05:41:22 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_pstate.c,v 1.19 2010/08/14 17:27:34 jruoho Exp $); #include sys/param.h #include sys/evcnt.h @@ -529,7 +529,7 @@ const uint8_t val = AcpiGbl_FADT.PstateControl; const uint32_t addr = AcpiGbl_FADT.SmiCommand; - if (addr == 0) + if (addr == 0 || val == 0) return; (void)AcpiOsWritePort(addr, val, 8);
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Aug 14 17:49:12 UTC 2010 Modified Files: src/share/man/man9: module.9 Log Message: Sort sections, remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man9/module.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/module.9 diff -u src/share/man/man9/module.9:1.13 src/share/man/man9/module.9:1.14 --- src/share/man/man9/module.9:1.13 Sat Aug 14 17:06:58 2010 +++ src/share/man/man9/module.9 Sat Aug 14 17:49:12 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: module.9,v 1.13 2010/08/14 17:06:58 pgoyette Exp $ +.\ $NetBSD: module.9,v 1.14 2010/08/14 17:49:12 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -386,17 +386,17 @@ describes the public interface. .Sh SEE ALSO .Xr modctl 2 -.Sh AUTHORS -.An -nosplit -The -.Nm -system was written by -.An Andrew Doran Aq a...@netbsd.org . -This manual page was written by -.An Paul Goyette Aq pgoye...@netbsd.org . .Sh HISTORY The kernel module subsystem first appeared in .Nx 5.0 . It replaces the .Dq Tn LKM subsystem from earlier releases. +.Sh AUTHORS +.An -nosplit +The +.Nm +system was written by +.An Andrew Doran Aq a...@netbsd.org . +This manual page was written by +.An Paul Goyette Aq pgoye...@netbsd.org .
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sat Aug 14 17:50:57 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_cpu_tstate.c
Log Message:
Simplify the FADT-based entry by faking (overriding) also the address.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpi_cpu_tstate.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/acpi/acpi_cpu_tstate.c
diff -u src/sys/dev/acpi/acpi_cpu_tstate.c:1.6 src/sys/dev/acpi/acpi_cpu_tstate.c:1.7
--- src/sys/dev/acpi/acpi_cpu_tstate.c:1.6 Sat Aug 14 05:41:22 2010
+++ src/sys/dev/acpi/acpi_cpu_tstate.c Sat Aug 14 17:50:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_tstate.c,v 1.6 2010/08/14 05:41:22 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_tstate.c,v 1.7 2010/08/14 17:50:57 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_tstate.c,v 1.6 2010/08/14 05:41:22 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_tstate.c,v 1.7 2010/08/14 17:50:57 jruoho Exp $);
#include sys/param.h
#include sys/evcnt.h
@@ -40,8 +40,6 @@
#define _COMPONENT ACPI_BUS_COMPONENT
ACPI_MODULE_NAME (acpi_cpu_tstate)
-#define ACPI_ADR_SPACE_FADT 0xFF
-
static void acpicpu_tstate_attach_print(struct acpicpu_softc *);
static void acpicpu_tstate_attach_evcnt(struct acpicpu_softc *);
static void acpicpu_tstate_detach_evcnt(struct acpicpu_softc *);
@@ -555,9 +553,10 @@
*/
sc-sc_tstate_control.reg_bitwidth = width;
sc-sc_tstate_control.reg_bitoffset = offset;
- sc-sc_tstate_control.reg_spaceid = ACPI_ADR_SPACE_FADT;
+ sc-sc_tstate_control.reg_spaceid = ACPI_ADR_SPACE_SYSTEM_IO;
- CTASSERT(ACPI_ADR_SPACE_FADT ACPI_ADR_SPACE_FIXED_HARDWARE);
+ sc-sc_tstate_status.reg_addr = sc-sc_object.ao_pblkaddr;
+ sc-sc_tstate_control.reg_addr = sc-sc_object.ao_pblkaddr;
return AE_OK;
}
@@ -646,15 +645,11 @@
break;
- case ACPI_ADR_SPACE_FADT:
case ACPI_ADR_SPACE_SYSTEM_IO:
addr = sc-sc_tstate_status.reg_addr;
offset = sc-sc_tstate_status.reg_bitoffset;
- if (method == ACPI_ADR_SPACE_FADT)
- addr = sc-sc_object.ao_pblkaddr;
-
(void)AcpiOsReadPort(addr, val, 8);
val = (val offset) 0x0F;
@@ -760,15 +755,11 @@
break;
- case ACPI_ADR_SPACE_FADT:
case ACPI_ADR_SPACE_SYSTEM_IO:
addr = sc-sc_tstate_control.reg_addr;
offset = sc-sc_tstate_control.reg_bitoffset;
- if (method == ACPI_ADR_SPACE_FADT)
- addr = sc-sc_object.ao_pblkaddr;
-
val = (ts-ts_control 0x0F) offset;
if (ts-ts_percent != 100 (val __BIT(4)) == 0) {
@@ -789,9 +780,6 @@
addr = sc-sc_tstate_status.reg_addr;
offset = sc-sc_tstate_status.reg_bitoffset;
- if (method == ACPI_ADR_SPACE_FADT)
- addr = sc-sc_object.ao_pblkaddr;
-
for (i = val = 0; i ACPICPU_T_STATE_RETRY; i++) {
(void)AcpiOsReadPort(addr, val, 8);
CVS commit: src/sys
Module Name:src
Committed By: jym
Date: Sat Aug 14 18:28:59 UTC 2010
Modified Files:
src/sys/dev/ieee1394: firewire.c
src/sys/netinet6: esp_aesctr.c esp_core.c
Log Message:
Fix some code paths where pointers are dereferenced after checking that
they are NULL (oops?)
XXX pull-ups for NetBSD-4 and NetBSD-5.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ieee1394/firewire.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet6/esp_aesctr.c
cvs rdiff -u -r1.45 -r1.46 src/sys/netinet6/esp_core.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/ieee1394/firewire.c
diff -u src/sys/dev/ieee1394/firewire.c:1.35 src/sys/dev/ieee1394/firewire.c:1.36
--- src/sys/dev/ieee1394/firewire.c:1.35 Sun May 23 18:56:58 2010
+++ src/sys/dev/ieee1394/firewire.c Sat Aug 14 18:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.35 2010/05/23 18:56:58 christos Exp $ */
+/* $NetBSD: firewire.c,v 1.36 2010/08/14 18:28:59 jym Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: firewire.c,v 1.35 2010/05/23 18:56:58 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: firewire.c,v 1.36 2010/08/14 18:28:59 jym Exp $);
#include sys/param.h
#include sys/bus.h
@@ -907,7 +907,7 @@
{
if (xfer == NULL) {
- aprint_error_dev(xfer-fc-bdev, xfer == NULL\n);
+ aprint_error(fw_xfer_free: xfer == NULL\n);
return;
}
fw_xfer_unload(xfer);
@@ -920,7 +920,7 @@
{
if (xfer == NULL) {
- aprint_error_dev(xfer-fc-bdev, xfer == NULL\n);
+ aprint_error(fw_xfer_free_buf: xfer == NULL\n);
return;
}
fw_xfer_unload(xfer);
Index: src/sys/netinet6/esp_aesctr.c
diff -u src/sys/netinet6/esp_aesctr.c:1.12 src/sys/netinet6/esp_aesctr.c:1.13
--- src/sys/netinet6/esp_aesctr.c:1.12 Sat Apr 18 14:58:05 2009
+++ src/sys/netinet6/esp_aesctr.c Sat Aug 14 18:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_aesctr.c,v 1.12 2009/04/18 14:58:05 tsutsui Exp $ */
+/* $NetBSD: esp_aesctr.c,v 1.13 2010/08/14 18:28:59 jym Exp $ */
/* $KAME: esp_aesctr.c,v 1.2 2003/07/20 00:29:37 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esp_aesctr.c,v 1.12 2009/04/18 14:58:05 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: esp_aesctr.c,v 1.13 2010/08/14 18:28:59 jym Exp $);
#include sys/param.h
#include sys/systm.h
@@ -79,10 +79,10 @@
const struct esp_algorithm *algo;
algo = esp_algorithm_lookup(sav-alg_enc);
- if (!algo) {
+ if (algo == NULL) {
ipseclog((LOG_ERR,
- esp_aeesctr_mature %s: unsupported algorithm.\n,
- algo-name));
+ esp_aesctr_mature: unsupported encryption algorithm %d\n,
+ sav-alg_enc));
return 1;
}
Index: src/sys/netinet6/esp_core.c
diff -u src/sys/netinet6/esp_core.c:1.45 src/sys/netinet6/esp_core.c:1.46
--- src/sys/netinet6/esp_core.c:1.45 Sat Apr 18 14:58:05 2009
+++ src/sys/netinet6/esp_core.c Sat Aug 14 18:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_core.c,v 1.45 2009/04/18 14:58:05 tsutsui Exp $ */
+/* $NetBSD: esp_core.c,v 1.46 2010/08/14 18:28:59 jym Exp $ */
/* $KAME: esp_core.c,v 1.53 2001/11/27 09:47:30 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esp_core.c,v 1.45 2009/04/18 14:58:05 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: esp_core.c,v 1.46 2010/08/14 18:28:59 jym Exp $);
#include opt_inet.h
@@ -404,9 +404,10 @@
}
algo = esp_algorithm_lookup(sav-alg_enc);
- if (!algo) {
+ if (algo == NULL) {
ipseclog((LOG_ERR,
- esp_cbc_mature %s: unsupported algorithm.\n, algo-name));
+ esp_cbc_mature: unsupported encryption algorithm %d\n,
+ sav-alg_enc));
return 1;
}
CVS commit: src/sys/dev/spi
Module Name:src
Committed By: jym
Date: Sat Aug 14 20:49:22 UTC 2010
Modified Files:
src/sys/dev/spi: spi.c
Log Message:
Fix the while condition: sleep while the SPI_F_DONE bit is not set.
'!' takes precedence over bitwise operation '', so use parenthesis.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/spi/spi.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/spi/spi.c
diff -u src/sys/dev/spi/spi.c:1.3 src/sys/dev/spi/spi.c:1.4
--- src/sys/dev/spi/spi.c:1.3 Sun May 4 14:21:56 2008
+++ src/sys/dev/spi/spi.c Sat Aug 14 20:49:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spi.c,v 1.3 2008/05/04 14:21:56 xtraeme Exp $ */
+/* $NetBSD: spi.c,v 1.4 2010/08/14 20:49:21 jym Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: spi.c,v 1.3 2008/05/04 14:21:56 xtraeme Exp $);
+__KERNEL_RCSID(0, $NetBSD: spi.c,v 1.4 2010/08/14 20:49:21 jym Exp $);
#include locators.h
@@ -271,7 +271,7 @@
s = splserial();
simple_lock(st-st_lock);
- while (!st-st_flags SPI_F_DONE) {
+ while (!(st-st_flags SPI_F_DONE)) {
ltsleep(st, PWAIT, spi_wait, 0, st-st_lock);
}
simple_unlock(st-st_lock);
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: jym
Date: Sat Aug 14 20:52:05 UTC 2010
Modified Files:
src/sys/dev/sun: sunkbd.c
Log Message:
Flush tty only when K_TXBUSY is not set.
'!' takes precedence over bitwise operation '', so use parenthesis.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/sun/sunkbd.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/sun/sunkbd.c
diff -u src/sys/dev/sun/sunkbd.c:1.27 src/sys/dev/sun/sunkbd.c:1.28
--- src/sys/dev/sun/sunkbd.c:1.27 Sat Mar 29 19:15:36 2008
+++ src/sys/dev/sun/sunkbd.c Sat Aug 14 20:52:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sunkbd.c,v 1.27 2008/03/29 19:15:36 tsutsui Exp $ */
+/* $NetBSD: sunkbd.c,v 1.28 2010/08/14 20:52:05 jym Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -51,7 +51,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sunkbd.c,v 1.27 2008/03/29 19:15:36 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: sunkbd.c,v 1.28 2010/08/14 20:52:05 jym Exp $);
#include sys/param.h
#include sys/systm.h
@@ -255,7 +255,7 @@
log(LOG_ERR, %s: input error (0x%x)\n,
device_xname(k-k_kbd.k_dev), c);
c = TTY_CHARMASK;
- if (!k-k_txflags K_TXBUSY) {
+ if (!(k-k_txflags K_TXBUSY)) {
ttyflush(tp, FREAD | FWRITE);
goto send_reset;
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jym
Date: Sat Aug 14 21:01:26 UTC 2010
Modified Files:
src/sys/dev/usb: if_atu.c
Log Message:
Only print the debug message about failed remapping when ATU_QUIRK_NO_REMAP
is not set in the atu_quirk flags.
'!' takes precedence over bitwise operation '', so use parenthesis.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/if_atu.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/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.38 src/sys/dev/usb/if_atu.c:1.39
--- src/sys/dev/usb/if_atu.c:1.38 Mon Apr 5 07:21:48 2010
+++ src/sys/dev/usb/if_atu.c Sat Aug 14 21:01:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.38 2010/04/05 07:21:48 joerg Exp $ */
+/* $NetBSD: if_atu.c,v 1.39 2010/08/14 21:01:26 jym Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_atu.c,v 1.38 2010/04/05 07:21:48 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_atu.c,v 1.39 2010/08/14 21:01:26 jym Exp $);
#include sys/param.h
@@ -897,7 +897,7 @@
DPRINTFN(15, (%s: sending remap\n, USBDEVNAME(sc-atu_dev)));
err = atu_usb_request(sc, DFU_REMAP, 0, 0, 0, NULL);
- if ((err) (! sc-atu_quirk ATU_QUIRK_NO_REMAP)) {
+ if ((err) !(sc-atu_quirk ATU_QUIRK_NO_REMAP)) {
DPRINTF((%s: remap failed!\n, USBDEVNAME(sc-atu_dev)));
return;
}
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src
Committed By: agc
Date: Sun Aug 15 02:39:46 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: reader.c
Log Message:
get rid of a debugging statement
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 \
src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/lib/reader.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.39 src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.40
--- src/crypto/external/bsd/netpgp/dist/src/lib/reader.c:1.39 Fri Aug 13 18:29:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/reader.c Sun Aug 15 02:39:46 2010
@@ -54,7 +54,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: reader.c,v 1.39 2010/08/13 18:29:41 agc Exp $);
+__RCSID($NetBSD: reader.c,v 1.40 2010/08/15 02:39:46 agc Exp $);
#endif
#include sys/types.h
@@ -2241,7 +2241,6 @@
if (cbinfo-cryptinfo.keydata == NULL) {
(void) fprintf(io-errs, get_passphrase_cb: NULL keydata\n);
} else {
-printf(get_passphrase_cb\n);
__ops_print_keydata(io, cbinfo-cryptinfo.pubring, cbinfo-cryptinfo.keydata, signature ,
cbinfo-cryptinfo.keydata-key.pubkey, 0);
}
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Sun Aug 15 04:35:17 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_cpu_tstate.c Log Message: Properly deal with the previous FADT-issue. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_cpu_tstate.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/acpi/acpi_cpu_tstate.c diff -u src/sys/dev/acpi/acpi_cpu_tstate.c:1.7 src/sys/dev/acpi/acpi_cpu_tstate.c:1.8 --- src/sys/dev/acpi/acpi_cpu_tstate.c:1.7 Sat Aug 14 17:50:57 2010 +++ src/sys/dev/acpi/acpi_cpu_tstate.c Sun Aug 15 04:35:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_tstate.c,v 1.7 2010/08/14 17:50:57 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_tstate.c,v 1.8 2010/08/15 04:35:16 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_tstate.c,v 1.7 2010/08/14 17:50:57 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_tstate.c,v 1.8 2010/08/15 04:35:16 jruoho Exp $); #include sys/param.h #include sys/evcnt.h @@ -549,14 +549,20 @@ sc-sc_tstate[i].ts_control = (count - i) | __BIT(3); /* - * Fake values for THROTTLE_CTLR. + * Fake values for throttling registers. */ - sc-sc_tstate_control.reg_bitwidth = width; - sc-sc_tstate_control.reg_bitoffset = offset; - sc-sc_tstate_control.reg_spaceid = ACPI_ADR_SPACE_SYSTEM_IO; + (void)memset(sc-sc_tstate_status, 0, sizeof(struct acpicpu_reg)); + (void)memset(sc-sc_tstate_control, 0, sizeof(struct acpicpu_reg)); + sc-sc_tstate_status.reg_bitwidth = width; + sc-sc_tstate_status.reg_bitoffset = offset; sc-sc_tstate_status.reg_addr = sc-sc_object.ao_pblkaddr; + sc-sc_tstate_status.reg_spaceid = ACPI_ADR_SPACE_SYSTEM_IO; + + sc-sc_tstate_control.reg_bitwidth = width; + sc-sc_tstate_control.reg_bitoffset = offset; sc-sc_tstate_control.reg_addr = sc-sc_object.ao_pblkaddr; + sc-sc_tstate_control.reg_spaceid = ACPI_ADR_SPACE_SYSTEM_IO; return AE_OK; }
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Sun Aug 15 05:09:30 UTC 2010 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Document T-states. One less item in CAVEATS. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/acpicpu.4 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/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.8 src/share/man/man4/acpicpu.4:1.9 --- src/share/man/man4/acpicpu.4:1.8 Wed Aug 11 17:28:59 2010 +++ src/share/man/man4/acpicpu.4 Sun Aug 15 05:09:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.8 2010/08/11 17:28:59 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.9 2010/08/15 05:09:30 jruoho Exp $ .\ .\ Coyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 11, 2010 +.Dd August 15, 2010 .Dt ACPICPU 4 .Os .Sh NAME @@ -44,9 +44,6 @@ Typically the .Tn ACPI processor functionality is grouped into so-called C-, P-, and T-states. -Presently, -.Nm -supports C- and P-states. .Ss C-states The processor power states, or C-states, are low-power modes that can be used when the @@ -186,6 +183,68 @@ implementation reacts to these events by imposing the dynamic maximum, but .Nm does not take any actions to manipulate the frequencies by itself. +.Ss T-states +Processor T-states, or +.Dq throttling states , +can be used to actively modulate the +time a processor is allowed to execute. +Outside the +.Tn ACPI +nomenclature, throttling may refer to +.Dq on-demand clock modulation +.Pq Tn ODCM , +among others. +.Pp +The concept of +.Dq duty cycle +is relevant to T-states. +It is generally defined to be a fraction of time that a system is in an +.Dq active +state. +The T0-state has always a duty cycle of 100 \%, +and thus, comparable to the C0-state, the processor is fully active. +Each additional higher-numbered T-state indicates lower duty cycles. +At most eight T-states may be available, although also T-states use +.Tn DVFS ; +both the maximum and the minimum available T-state may change dynamically. +.Pp +The duty cycle does not refer to the actual clock signal, +but to the time period in which the clock signal is allowed +to drive the processor chip. +For instance, if a T-state has a duty cycle of 75 \%, the +.Tn CPU +runs at the same clock frequency and uses the same voltage, +but 25 \% of the time the +.Tn CPU +is forced to idle. +Because of this, the use of T-states may +severely reduce system performance. +.Pp +There are two typical situations for throttling: +power management and thermal control. +As a technique to save power, +T-states are largely an artefact from the past. +There was a short period in the x86 lineage when P-states +were not yet available and throttling was considered +as an option to modulate the processor power consumption. +The approach was however quickly abandoned. +In modern x86 systems P-states should be preferred in all circumstances. +It is also more beneficial to move from the C0-state +to deeper C-states than it is to actively force down the +duty cycle of a processor. +.Pp +But T-states have retained their use as a last line +of defence against critical thermal conditions. +Many x86 processors include a catastrophic shutdown detector. +When the processor core temperature reaches this factory defined trip-point, +the processor execution is halted without any software control. +Before this fatal condition, it is possible to use throttling +for a short period of time in order to force the temperatures to lower levels. +The thermal control modulation is typically started only when +the system is in the highest-power P-state and +a high temperature situation exists. +After the temperatures have returned to non-critical levels, +the modulation ceases. .Ss Statistics The .Nm @@ -197,7 +256,7 @@ .Fl e flag). Note that valid per-CPU data is available only for C-states. -.Ss System information variables +.Ss System control variables The .Nm driver uses the same @@ -216,6 +275,7 @@ may however remove the system control variables without further notice. .Sh SEE ALSO .Xr acpi 4 , +.Xr acpitz 4 , .Xr cpu_idle 9 .Sh HISTORY The @@ -251,11 +311,9 @@ is currently supported only on Intel .Tn CPUs . .It -Neither processor thermal control (see +Processor thermal control (see .Xr acpitz 4 ) -nor -.Dq throttling -are currently supported. +is not yet supported. .It There is currently neither a well-defined, machine-independent .Tn API
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Sun Aug 15 05:17:39 UTC 2010 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Use capitals in a subtitle. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/acpicpu.4 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/man4/acpicpu.4 diff -u src/share/man/man4/acpicpu.4:1.9 src/share/man/man4/acpicpu.4:1.10 --- src/share/man/man4/acpicpu.4:1.9 Sun Aug 15 05:09:30 2010 +++ src/share/man/man4/acpicpu.4 Sun Aug 15 05:17:39 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.9 2010/08/15 05:09:30 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.10 2010/08/15 05:17:39 jruoho Exp $ .\ .\ Coyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi .\ All rights reserved. @@ -256,7 +256,7 @@ .Fl e flag). Note that valid per-CPU data is available only for C-states. -.Ss System control variables +.Ss System Control Variables The .Nm driver uses the same
