CVS commit: src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Wed Feb 23 08:27:18 UTC 2011 Modified Files: src/sys/arch/hp700/hp700: mainbus.c Log Message: Fix call to pmap_update. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/arch/hp700/hp700/mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp700/hp700/mainbus.c diff -u src/sys/arch/hp700/hp700/mainbus.c:1.78 src/sys/arch/hp700/hp700/mainbus.c:1.79 --- src/sys/arch/hp700/hp700/mainbus.c:1.78 Thu Feb 3 20:37:09 2011 +++ src/sys/arch/hp700/hp700/mainbus.c Wed Feb 23 08:27:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.78 2011/02/03 20:37:09 skrll Exp $ */ +/* $NetBSD: mainbus.c,v 1.79 2011/02/23 08:27:17 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.78 2011/02/03 20:37:09 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.79 2011/02/23 08:27:17 skrll Exp $); #include locators.h #include power.h @@ -1182,7 +1182,7 @@ size -= PAGE_SIZE; } } - pmap_update(); + pmap_update(pmap_kernel()); return (0); }
CVS commit: src
Module Name:src Committed By: jruoho Date: Wed Feb 23 08:52:17 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/share/man/man4/man4.x86: Makefile Added Files: src/share/man/man4/man4.x86: coretemp.4 Removed Files: src/share/man/man4: coretemp.4 Log Message: Move coretemp(4) to man4.x86. To generate a diff of this commit: cvs rdiff -u -r1.1291 -r1.1292 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.553 -r1.554 src/share/man/man4/Makefile cvs rdiff -u -r1.7 -r0 src/share/man/man4/coretemp.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/coretemp.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1291 src/distrib/sets/lists/man/mi:1.1292 --- src/distrib/sets/lists/man/mi:1.1291 Wed Feb 23 02:47:45 2011 +++ src/distrib/sets/lists/man/mi Wed Feb 23 08:52:16 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1291 2011/02/23 02:47:45 jmcneill Exp $ +# $NetBSD: mi,v 1.1292 2011/02/23 08:52:16 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -875,7 +875,7 @@ ./usr/share/man/cat4/cobalt/gt.0 man-sys-catman .cat ./usr/share/man/cat4/cobalt/intro.0 man-sys-catman .cat ./usr/share/man/cat4/com.0 man-sys-catman .cat -./usr/share/man/cat4/coretemp.0 man-sys-catman .cat +./usr/share/man/cat4/coretemp.0 man-obsolete obsolete ./usr/share/man/cat4/crypto.0 man-sys-catman .cat ./usr/share/man/cat4/cs.0 man-sys-catman .cat ./usr/share/man/cat4/cs80bus.0 man-sys-catman .cat @@ -1785,6 +1785,7 @@ ./usr/share/man/cat4/x68k/vs.0 man-sys-catman .cat ./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/balloon.0 man-sys-catman .cat +./usr/share/man/cat4/x86/coretemp.0 man-sys-catman .cat ./usr/share/man/cat4/x86/fwhrng.0 man-sys-catman .cat ./usr/share/man/cat4/x86/hpet.0 man-sys-catman .cat ./usr/share/man/cat4/x86/ichlpcib.0 man-sys-catman .cat @@ -3638,7 +3639,7 @@ ./usr/share/man/html4/cobalt/gt.html man-sys-htmlman html ./usr/share/man/html4/cobalt/intro.html man-sys-htmlman html ./usr/share/man/html4/com.html man-sys-htmlman html -./usr/share/man/html4/coretemp.html man-sys-htmlman html +./usr/share/man/html4/coretemp.html man-obsolete obsolete ./usr/share/man/html4/crypto.html man-sys-htmlman html ./usr/share/man/html4/cs.html man-sys-htmlman html ./usr/share/man/html4/cs80bus.html man-sys-htmlman html @@ -4468,6 +4469,7 @@ ./usr/share/man/html4/x68k/vs.html man-sys-htmlman html ./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html ./usr/share/man/html4/x86/balloon.html man-sys-htmlman html +./usr/share/man/html4/x86/coretemp.html man-sys-htmlman html ./usr/share/man/html4/x86/fwhrng.html man-sys-htmlman html ./usr/share/man/html4/x86/hpet.html man-sys-htmlman html ./usr/share/man/html4/x86/ichlpcib.html man-sys-htmlman html @@ -6176,7 +6178,7 @@ ./usr/share/man/man4/cobalt/gt.4 man-sys-man .man ./usr/share/man/man4/cobalt/intro.4 man-sys-man .man ./usr/share/man/man4/com.4 man-sys-man .man -./usr/share/man/man4/coretemp.4 man-sys-man .man +./usr/share/man/man4/coretemp.4 man-obsolete obsolete ./usr/share/man/man4/crypto.4 man-sys-man .man ./usr/share/man/man4/cs.4 man-sys-man .man ./usr/share/man/man4/cs80bus.4 man-sys-man .man @@ -7086,6 +7088,7 @@ ./usr/share/man/man4/x68k/vs.4 man-sys-man .man ./usr/share/man/man4/x86/amdpcib.4 man-sys-man .man ./usr/share/man/man4/x86/balloon.4 man-sys-man .man +./usr/share/man/man4/x86/coretemp.4 man-sys-man .man ./usr/share/man/man4/x86/fwhrng.4 man-sys-man .man ./usr/share/man/man4/x86/hpet.4 man-sys-man .man ./usr/share/man/man4/x86/ichlpcib.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.553 src/share/man/man4/Makefile:1.554 --- src/share/man/man4/Makefile:1.553 Wed Feb 23 02:47:46 2011 +++ src/share/man/man4/Makefile Wed Feb 23 08:52:16 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.553 2011/02/23 02:47:46 jmcneill Exp $ +# $NetBSD: Makefile,v 1.554 2011/02/23 08:52:16 jruoho Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -19,7 +19,7 @@ cac.4 cardbus.4 carp.4 cas.4 ccd.4 cd.4 \ cec.4 cgd.4 cfb.4 ch.4 chipsfb.4 ciphy.4 ciss.4 clcs.4 clct.4 clnp.4 \ clockctl.4 cltp.4 cmdide.4 cmpci.4 cms.4 cnw.4 \ - com.4 coretemp.4 crypto.4 cs80bus.4 cuda.4 cypide.4 \ + com.4 crypto.4 cs80bus.4 cuda.4 cypide.4 \ ddb.4 ddc.4 de.4 dge.4 dk.4 dm.4 dmoverio.4 \ dmphy.4 dpt.4 dpti.4 drm.4 drum.4 \ eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \ Index: src/share/man/man4/man4.x86/Makefile diff -u src/share/man/man4/man4.x86/Makefile:1.5
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: hannken
Date: Wed Feb 23 08:53:22 UTC 2011
Modified Files:
src/sys/ufs/ffs: ffs_snapshot.c
Log Message:
Quiesce CC ('blkno' may be used uninitialized in this function).
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/ufs/ffs/ffs_snapshot.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/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.107 src/sys/ufs/ffs/ffs_snapshot.c:1.108
--- src/sys/ufs/ffs/ffs_snapshot.c:1.107 Tue Feb 22 20:25:54 2011
+++ src/sys/ufs/ffs/ffs_snapshot.c Wed Feb 23 08:53:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.107 2011/02/22 20:25:54 he Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.108 2011/02/23 08:53:21 hannken Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.107 2011/02/22 20:25:54 he Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.108 2011/02/23 08:53:21 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -1826,6 +1826,8 @@
uint32_t gen;
int lower, upper, mid, snapshot_locked = 0, error = 0;
+ blkno = 0; /* XXX: GCC */
+
/*
* Check for valid snapshots.
*/
CVS commit: src/sys/arch/mmeye/include
Module Name:src Committed By: he Date: Wed Feb 23 09:06:48 UTC 2011 Modified Files: src/sys/arch/mmeye/include: loadfile_machdep.h Log Message: Since this port doesn't build its stand binaries with _STANDALONE defined, put in declarations of alloc() and dealloc() which are now used instead of malloc() / free(), so that the stand/ binaries build again. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mmeye/include/loadfile_machdep.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/arch/mmeye/include/loadfile_machdep.h diff -u src/sys/arch/mmeye/include/loadfile_machdep.h:1.5 src/sys/arch/mmeye/include/loadfile_machdep.h:1.6 --- src/sys/arch/mmeye/include/loadfile_machdep.h:1.5 Sat Feb 19 10:46:28 2011 +++ src/sys/arch/mmeye/include/loadfile_machdep.h Wed Feb 23 09:06:48 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_machdep.h,v 1.5 2011/02/19 10:46:28 kiyohara Exp $ */ +/* $NetBSD: loadfile_machdep.h,v 1.6 2011/02/23 09:06:48 he Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -45,3 +45,6 @@ #define PROGRESS(a) (void) printf a #define ALLOC(a) alloc(a) #define DEALLOC(a, b) dealloc(a, b) + +void *alloc(size_t); +void dealloc(void *, size_t);
CVS commit: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Wed Feb 23 09:12:53 UTC 2011 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6048 Log Message: initial import of xterm 269: - fixes/updates for fullscreen mode - add omitTranslation resource - removes some old defaults - random bug fixes - fixes for reverse mode - fix for utf-8 problem, also our PR/44344 Status: Vendor Tag: xorg Release Tags: xterm-269 U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/minstall.sh U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/trace.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/doublechr.c U xsrc/external/mit/xterm/dist/MANIFEST U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/cursor.c U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/UXTerm.ad U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/INSTALL U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/VTPrsTbl.c C xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/testxmc.c U xsrc/external/mit/xterm/dist/README.i18n U xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/xcharmouse.h U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/print.c U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/wcwidth.c U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/run-tic.sh U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/uxterm U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/Makefile.in U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/menu.h C xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/proto.h U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/os2main.c U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/88colres.pl U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/aclocal.m4 C xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/scrollbar.c C xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/xutf8.c U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/tabs.c U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl U xsrc/external/mit/xterm/dist/cachedGCs.c U xsrc/external/mit/xterm/dist/screen.c U xsrc/external/mit/xterm/dist/TekPrsTbl.c C xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/sinstall.sh U xsrc/external/mit/xterm/dist/icons/xterm-color_48x48.xcf U xsrc/external/mit/xterm/dist/icons/xterm_48x48.xcf U
CVS commit: xsrc/external/mit/xterm/dist
Module Name:xsrc
Committed By: mrg
Date: Wed Feb 23 09:14:10 UTC 2011
Modified Files:
xsrc/external/mit/xterm/dist: XTerm.ad linedata.c misc.c ptyx.h
xterm.man
Log Message:
merge xterm 269
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xterm/dist/XTerm.ad
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xterm/dist/misc.c \
xsrc/external/mit/xterm/dist/xterm.man
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xterm/dist/ptyx.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/xterm/dist/XTerm.ad
diff -u xsrc/external/mit/xterm/dist/XTerm.ad:1.5 xsrc/external/mit/xterm/dist/XTerm.ad:1.6
--- xsrc/external/mit/xterm/dist/XTerm.ad:1.5 Wed Jun 30 04:49:44 2010
+++ xsrc/external/mit/xterm/dist/XTerm.ad Wed Feb 23 09:14:10 2011
@@ -1,8 +1,8 @@
-! $XTermId: XTerm.ad,v 1.93 2010/06/15 10:55:59 tom Exp $
+! $XTermId: XTerm.ad,v 1.94 2011/01/19 22:05:58 tom Exp $
! -
! this file is part of xterm
!
-! Copyright 1996-2009,2010 by Thomas E. Dickey
+! Copyright 1996-2010,2011 by Thomas E. Dickey
!
! All Rights Reserved
!
@@ -43,6 +43,7 @@
*mainMenu.Label: Main Options
*mainMenu*toolbar*Label: Toolbar
+*mainMenu*fullscreen*Label: Full Screen
*mainMenu*securekbd*Label: Secure Keyboard
*mainMenu*allowsends*Label: Allow SendEvents
*mainMenu*redraw*Label: Redraw Window
Index: xsrc/external/mit/xterm/dist/linedata.c
diff -u xsrc/external/mit/xterm/dist/linedata.c:1.2 xsrc/external/mit/xterm/dist/linedata.c:1.3
--- xsrc/external/mit/xterm/dist/linedata.c:1.2 Wed Jun 30 04:49:44 2010
+++ xsrc/external/mit/xterm/dist/linedata.c Wed Feb 23 09:14:10 2011
@@ -1,8 +1,8 @@
-/* $XTermId: linedata.c,v 1.78 2010/04/14 23:41:10 tom Exp $ */
+/* $XTermId: linedata.c,v 1.79 2011/01/21 00:07:35 tom Exp $ */
/
-Copyright 2009,2010 by Thomas E. Dickey
+Copyright 2009-2010,2011 by Thomas E. Dickey
All Rights Reserved
@@ -189,7 +189,7 @@
#define CellDataSize(screen) (SizeOfCellData + screen-lineExtra)
#define CellDataAddr(screen, data, cell) \
- (CellData *)((char *)data + (cell * CellDataSize(screen)))
+ (CellData *)(void *) ((char *)data + (cell * CellDataSize(screen)))
CellData *
newCellData(XtermWidget xw, Cardinal count)
Index: xsrc/external/mit/xterm/dist/misc.c
diff -u xsrc/external/mit/xterm/dist/misc.c:1.7 xsrc/external/mit/xterm/dist/misc.c:1.8
--- xsrc/external/mit/xterm/dist/misc.c:1.7 Tue Nov 23 09:18:19 2010
+++ xsrc/external/mit/xterm/dist/misc.c Wed Feb 23 09:14:10 2011
@@ -1,7 +1,7 @@
-/* $XTermId: misc.c,v 1.511 2010/11/10 00:56:29 tom Exp $ */
+/* $XTermId: misc.c,v 1.520 2011/02/13 21:03:21 tom Exp $ */
/*
- * Copyright 1999-2009,2010 by Thomas E. Dickey
+ * Copyright 1999-2010,2011 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -250,17 +250,19 @@
#endif
static void
-setXUrgency(TScreen * screen, Bool enable)
+setXUrgency(XtermWidget xw, Bool enable)
{
+TScreen *screen = TScreenOf(xw);
+
if (screen-bellIsUrgent) {
- XWMHints *h = XGetWMHints(screen-display, VShellWindow);
+ XWMHints *h = XGetWMHints(screen-display, VShellWindow(xw));
if (h != 0) {
- if (enable) {
+ if (enable !(screen-select FOCUS)) {
h-flags |= XUrgencyHint;
} else {
h-flags = ~XUrgencyHint;
}
- XSetWMHints(screen-display, VShellWindow, h);
+ XSetWMHints(screen-display, VShellWindow(xw), h);
}
}
}
@@ -739,9 +741,9 @@
if (screen-quiet_grab
(event-mode == NotifyGrab || event-mode == NotifyUngrab)) {
- ;
+ /* EMPTY */ ;
} else if (event-type == FocusIn) {
- setXUrgency(screen, False);
+ setXUrgency(xw, False);
/*
* NotifyNonlinear only happens (on FocusIn) if the pointer was not in
@@ -856,7 +858,7 @@
#if defined(HAVE_XKB_BELL_EXT)
if (tony != None) {
- XkbBell(screen-display, VShellWindow, percent, tony);
+ XkbBell(screen-display, VShellWindow(xw), percent, tony);
} else
#endif
XBell(screen-display, percent);
@@ -874,7 +876,7 @@
return;
}
-setXUrgency(screen, True);
+setXUrgency(xw, True);
/* has enough time gone by that we are allowed to ring
the bell again? */
@@ -901,7 +903,7 @@
}
if (screen-poponbell)
- XRaiseWindow(screen-display, VShellWindow);
+ XRaiseWindow(screen-display, VShellWindow(xw));
if (screen-bellSuppressTime) {
/* now we change a property and wait for the notify event to come
@@ -972,19 +974,19 @@
}
Window
-WMFrameWindow(XtermWidget termw)
+WMFrameWindow(XtermWidget xw)
{
Window win_root, win_current, *children;
Window win_parent = 0;
unsigned int nchildren;
-win_current =
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Wed Feb 23 10:11:13 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: Use the wording BSD-like for the license of ACPICA. To generate a diff of this commit: cvs rdiff -u -r1.815 -r1.816 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.815 src/doc/3RDPARTY:1.816 --- src/doc/3RDPARTY:1.815 Wed Feb 23 01:09:18 2011 +++ src/doc/3RDPARTY Wed Feb 23 10:11:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.815 2011/02/23 01:09:18 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.816 2011/02/23 10:11:13 jruoho Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -31,7 +31,7 @@ Archive Site: http://www.acpica.org/downloads/unix2_source_code.php Home Page: http://www.acpica.org/ Mailing List: de...@acpica.org -License: BSD +License: BSD-like Responsible: jmcneill, jruoho Notes: The sources were integrated into src/sys/dev/acpi/acpica/Subsystem.
CVS commit: src/sys/arch
Module Name:src Committed By: jruoho Date: Wed Feb 23 11:43:23 UTC 2011 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/i386/conf: ALL GENERIC src/sys/arch/x86/conf: files.x86 src/sys/arch/x86/include: cpu.h cpuvar.h src/sys/arch/x86/x86: cpu.c est.c identcpu.c intel_busclock.c src/sys/arch/xen/conf: files.xen Added Files: src/sys/arch/x86/include: est.h Log Message: Move ENHANCED_SPEEDSTEP, or henceforth est(4), to the cpufeaturebus. To generate a diff of this commit: cvs rdiff -u -r1.312 -r1.313 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.293 -r1.294 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1020 -r1.1021 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/include/cpuvar.h cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/include/est.h cvs rdiff -u -r1.82 -r1.83 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/x86/est.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/x86/intel_busclock.c cvs rdiff -u -r1.110 -r1.111 src/sys/arch/xen/conf/files.xen Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.312 src/sys/arch/amd64/conf/GENERIC:1.313 --- src/sys/arch/amd64/conf/GENERIC:1.312 Wed Feb 23 00:46:29 2011 +++ src/sys/arch/amd64/conf/GENERIC Wed Feb 23 11:43:21 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.312 2011/02/23 00:46:29 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.313 2011/02/23 11:43:21 jruoho Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.312 $ +#ident GENERIC-$Revision: 1.313 $ maxusers 64 # estimated number of users @@ -78,15 +78,12 @@ #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -# Intel Enhanced Speedstep for EM64T CPUs -options ENHANCED_SPEEDSTEP -#options EST_FREQ_USERWRITE # any user can set frequency - # AMD PowerNow! and Cool`n'Quiet technology options POWERNOW_K8 -# Intel Core's on-die Thermal sensor -coretemp* at cpu? +# CPU features +coretemp* at cpu? # Intel on-die thermal sensor +est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) # Intel(R) On Demand Clock Modulation (aka ODCM) # options INTEL_ONDEMAND_CLOCKMOD Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.61 src/sys/arch/amd64/conf/XEN3_DOM0:1.62 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.61 Sat Nov 27 20:19:41 2010 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Feb 23 11:43:21 2011 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.61 2010/11/27 20:19:41 christos Exp $ +# $NetBSD: XEN3_DOM0,v 1.62 2011/02/23 11:43:21 jruoho Exp $ include arch/amd64/conf/std.xen @@ -20,10 +20,6 @@ #options VM86 # virtual 8086 emulation #options USER_LDT # user-settable LDT; used by WINE -# Enhanced SpeedStep Technology in the Pentium M -options ENHANCED_SPEEDSTEP -#options EST_FREQ_USERWRITE # any user can set frequency - # AMD PowerNow! and Cool`n'Quiet technology options POWERNOW_K8 Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.293 src/sys/arch/i386/conf/ALL:1.294 --- src/sys/arch/i386/conf/ALL:1.293 Wed Feb 23 00:45:56 2011 +++ src/sys/arch/i386/conf/ALL Wed Feb 23 11:43:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.293 2011/02/23 00:45:56 jmcneill Exp $ +# $NetBSD: ALL,v 1.294 2011/02/23 11:43:22 jruoho Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.293 $ +#ident ALL-$Revision: 1.294 $ maxusers 64 # estimated number of users @@ -29,21 +29,16 @@ options X86EMU # 386 Real Mode emulator options PAE # PAE mode (36 bits physical addressing) -# Enhanced SpeedStep Technology in the Pentium M -options ENHANCED_SPEEDSTEP -options EST_FREQ_USERWRITE # any user can set frequency - # AMD PowerNow! K7 options POWERNOW_K7 # AMD PowerNow! and Cool`n'Quiet technology options POWERNOW_K8 -# VIA PadLock -padlock0 at cpu0 - -# Intel Core's on-die Thermal sensor -coretemp* at cpu? +# CPU features +coretemp* at cpu? # Intel on-die thermal sensor +est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI) +padlock0 at cpu0 # VIA PadLock # Intel(R) On Demand Clock Modulation (aka ODCM) options INTEL_ONDEMAND_CLOCKMOD Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1020 src/sys/arch/i386/conf/GENERIC:1.1021 ---
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Wed Feb 23 11:48:05 UTC 2011 Modified Files: src/share/man/man4: alc.4 Log Message: remove ukphy xref To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/alc.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/alc.4 diff -u src/share/man/man4/alc.4:1.1 src/share/man/man4/alc.4:1.2 --- src/share/man/man4/alc.4:1.1 Wed Feb 23 02:47:46 2011 +++ src/share/man/man4/alc.4 Wed Feb 23 11:48:05 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: alc.4,v 1.1 2011/02/23 02:47:46 jmcneill Exp $ +.\ $NetBSD: alc.4,v 1.2 2011/02/23 11:48:05 jmcneill Exp $ .\ .\ Copyright (c) 2009 Kevin Lo ke...@openbsd.org .\ @@ -23,7 +23,6 @@ .Sh SYNOPSIS .Cd alc* at pci? .Cd atphy* at mii? -.Cd ukphy* at mii? .Sh DESCRIPTION The .Nm @@ -54,7 +53,6 @@ .Xr intro 4 , .Xr netintro 4 , .Xr pci 4 , -.Xr ukphy 4 , .Xr ifconfig 8 .Sh HISTORY The
CVS commit: src
Module Name:src Committed By: jruoho Date: Wed Feb 23 11:50:03 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.x86: Makefile Added Files: src/share/man/man4/man4.x86: est.4 Log Message: Add est(4). To generate a diff of this commit: cvs rdiff -u -r1.1292 -r1.1293 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/man4.x86/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/est.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1292 src/distrib/sets/lists/man/mi:1.1293 --- src/distrib/sets/lists/man/mi:1.1292 Wed Feb 23 08:52:16 2011 +++ src/distrib/sets/lists/man/mi Wed Feb 23 11:50:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1292 2011/02/23 08:52:16 jruoho Exp $ +# $NetBSD: mi,v 1.1293 2011/02/23 11:50:03 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1786,6 +1786,7 @@ ./usr/share/man/cat4/x86/amdpcib.0 man-sys-catman .cat ./usr/share/man/cat4/x86/balloon.0 man-sys-catman .cat ./usr/share/man/cat4/x86/coretemp.0 man-sys-catman .cat +./usr/share/man/cat4/x86/est.0 man-sys-catman .cat ./usr/share/man/cat4/x86/fwhrng.0 man-sys-catman .cat ./usr/share/man/cat4/x86/hpet.0 man-sys-catman .cat ./usr/share/man/cat4/x86/ichlpcib.0 man-sys-catman .cat @@ -4470,6 +4471,7 @@ ./usr/share/man/html4/x86/amdpcib.html man-sys-htmlman html ./usr/share/man/html4/x86/balloon.html man-sys-htmlman html ./usr/share/man/html4/x86/coretemp.html man-sys-htmlman html +./usr/share/man/html4/x86/est.html man-sys-htmlman html ./usr/share/man/html4/x86/fwhrng.html man-sys-htmlman html ./usr/share/man/html4/x86/hpet.html man-sys-htmlman html ./usr/share/man/html4/x86/ichlpcib.html man-sys-htmlman html @@ -7089,6 +7091,7 @@ ./usr/share/man/man4/x86/amdpcib.4 man-sys-man .man ./usr/share/man/man4/x86/balloon.4 man-sys-man .man ./usr/share/man/man4/x86/coretemp.4 man-sys-man .man +./usr/share/man/man4/x86/est.4 man-sys-man .man ./usr/share/man/man4/x86/fwhrng.4 man-sys-man .man ./usr/share/man/man4/x86/hpet.4 man-sys-man .man ./usr/share/man/man4/x86/ichlpcib.4 man-sys-man .man Index: src/share/man/man4/man4.x86/Makefile diff -u src/share/man/man4/man4.x86/Makefile:1.6 src/share/man/man4/man4.x86/Makefile:1.7 --- src/share/man/man4/man4.x86/Makefile:1.6 Wed Feb 23 08:52:16 2011 +++ src/share/man/man4/man4.x86/Makefile Wed Feb 23 11:50:03 2011 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2011/02/23 08:52:16 jruoho Exp $ +# $NetBSD: Makefile,v 1.7 2011/02/23 11:50:03 jruoho Exp $ -MAN= amdpcib.4 balloon.4 coretemp.4 fwhrng.4 hpet.4 ichlpcib.4 ioapic.4 +MAN= amdpcib.4 balloon.4 coretemp.4 est.4 \ + fwhrng.4 hpet.4 ichlpcib.4 ioapic.4 MANSUBDIR=/x86 Added files: Index: src/share/man/man4/man4.x86/est.4 diff -u /dev/null src/share/man/man4/man4.x86/est.4:1.1 --- /dev/null Wed Feb 23 11:50:03 2011 +++ src/share/man/man4/man4.x86/est.4 Wed Feb 23 11:50:03 2011 @@ -0,0 +1,73 @@ +.\ $NetBSD: est.4,v 1.1 2011/02/23 11:50:03 jruoho Exp $ +.\ +.\ Copyright (c) 2011 Jukka Ruohonen jruoho...@iki.fi +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Neither the name of the author nor the names of any +.\contributors may be used to endorse or promote products derived +.\from this software without specific prior written permission. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. +.\ +.Dd February 23, 2011 +.Dt EST 4 +.Os +.Sh NAME +.Nm est +.Nd Enhanced SpeedStep +.Sh SYNOPSIS +.Cd est0 at cpu0 +.Sh DESCRIPTION +The +.Nm +driver provides support for Enhanced SpeedStep introduced in +Intel's first and second generation of Pentium M processors. +The following +.Xr sysctl 8 +variables are available with +.Nm : +.Bl -tag -width machdep.est.frequency.available -offset
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Wed Feb 23 11:55:37 UTC 2011
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/sys/modules: Makefile
Added Files:
src/sys/modules/est: Makefile est.ioconf
Log Message:
Build glue for est(4).
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.64 -r1.65 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/est/Makefile \
src/sys/modules/est/est.ioconf
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/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.16 src/distrib/sets/lists/modules/md.amd64:1.17
--- src/distrib/sets/lists/modules/md.amd64:1.16 Sun Feb 20 13:48:25 2011
+++ src/distrib/sets/lists/modules/md.amd64 Wed Feb 23 11:55:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.16 2011/02/20 13:48:25 jruoho Exp $
+# $NetBSD: md.amd64,v 1.17 2011/02/23 11:55:37 jruoho Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -45,6 +45,8 @@
./@MODULEDIR@/coretemp/coretemp.kmod base-kernel-modules kmod
./@MODULEDIR@/drmbase-kernel-modules kmod
./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/estbase-kernel-modules kmod
+./@MODULEDIR@/est/est.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_elf64 base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.19 src/distrib/sets/lists/modules/md.i386:1.20
--- src/distrib/sets/lists/modules/md.i386:1.19 Sun Feb 20 13:48:25 2011
+++ src/distrib/sets/lists/modules/md.i386 Wed Feb 23 11:55:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.19 2011/02/20 13:48:25 jruoho Exp $
+# $NetBSD: md.i386,v 1.20 2011/02/23 11:55:37 jruoho Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -47,6 +47,8 @@
./@MODULEDIR@/coretemp/coretemp.kmod base-kernel-modules kmod
./@MODULEDIR@/drmbase-kernel-modules kmod
./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
+./@MODULEDIR@/estbase-kernel-modules kmod
+./@MODULEDIR@/est/est.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_aoutbase-kernel-modules kmod
./@MODULEDIR@/exec_aout/exec_aout.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.64 src/sys/modules/Makefile:1.65
--- src/sys/modules/Makefile:1.64 Sun Feb 20 13:48:26 2011
+++ src/sys/modules/Makefile Wed Feb 23 11:55:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2011/02/20 13:48:26 jruoho Exp $
+# $NetBSD: Makefile,v 1.65 2011/02/23 11:55:36 jruoho Exp $
.include bsd.own.mk
@@ -87,6 +87,7 @@
.if ${MACHINE_ARCH} == i386 || \
${MACHINE_ARCH} == x86_64
SUBDIR+= coretemp
+SUBDIR+= est
SUBDIR+= tprof_pmi
#SUBDIR+= tprof_amdpmi
.endif
Added files:
Index: src/sys/modules/est/Makefile
diff -u /dev/null src/sys/modules/est/Makefile:1.1
--- /dev/null Wed Feb 23 11:55:37 2011
+++ src/sys/modules/est/Makefile Wed Feb 23 11:55:36 2011
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2011/02/23 11:55:36 jruoho Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/arch/x86/x86
+
+KMOD= est
+IOCONF= est.ioconf
+SRCS= est.c intel_busclock.c
+
+WARNS= 3
+
+.include bsd.kmodule.mk
Index: src/sys/modules/est/est.ioconf
diff -u /dev/null src/sys/modules/est/est.ioconf:1.1
--- /dev/null Wed Feb 23 11:55:37 2011
+++ src/sys/modules/est/est.ioconf Wed Feb 23 11:55:36 2011
@@ -0,0 +1,10 @@
+# $NetBSD: est.ioconf,v 1.1 2011/02/23 11:55:36 jruoho Exp $
+
+ioconf est
+
+include conf/files
+include arch/x86/conf/files.x86
+
+pseudo-root cpufeaturebus*
+
+est0 at cpufeaturebus?
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jmcneill Date: Wed Feb 23 12:22:21 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: add Realtek RTL8188CE Wireless LAN 802.11n PCI-E NIC To generate a diff of this commit: cvs rdiff -u -r1.1061 -r1.1062 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1061 src/sys/dev/pci/pcidevs:1.1062 --- src/sys/dev/pci/pcidevs:1.1061 Tue Feb 22 23:20:15 2011 +++ src/sys/dev/pci/pcidevs Wed Feb 23 12:22:20 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1061 2011/02/22 23:20:15 jmcneill Exp $ +$NetBSD: pcidevs,v 1.1062 2011/02/23 12:22:20 jmcneill Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3909,6 +3909,7 @@ product REALTEK RT8169SC 0x8167 8169SC/8110SC 10/100/1000 Ethernet product REALTEK RT8168 0x8168 8168/8111 10/100/1000 Ethernet product REALTEK RT8169 0x8169 8169/8110 10/100/1000 Ethernet +product REALTEK RTL8188CE 0x8176 RTL8188CE Wireless LAN 802.11n PCI-E NIC product REALTEK RT8180 0x8180 8180 802.11b product REALTEK RT8185 0x8185 8185 802.11a/b/g
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Wed Feb 23 12:38:48 UTC 2011 Modified Files: src/share/man/man4: acpicpu.4 Log Message: Update compatibility notes. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 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.21 src/share/man/man4/acpicpu.4:1.22 --- src/share/man/man4/acpicpu.4:1.21 Thu Dec 30 12:06:53 2010 +++ src/share/man/man4/acpicpu.4 Wed Feb 23 12:38:47 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpicpu.4,v 1.21 2010/12/30 12:06:53 jruoho Exp $ +.\ $NetBSD: acpicpu.4,v 1.22 2011/02/23 12:38:47 jruoho Exp $ .\ .\ Copyright (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 December 30, 2010 +.Dd February 23, 2011 .Dt ACPICPU 4 .Os .Sh NAME @@ -293,13 +293,14 @@ .Sh COMPATIBILITY The .Nm -driver conflicts with the following kernel configuration +driver conflicts with +.Xr est 4 , +and with the following kernel configuration .Xr options 4 : -.Dv ENHANCED_SPEEDSTEP , -.Dv POWERNOW_K8 , +.Dv POWERNOW_K8 and .Dv INTEL_ONDEMAND_CLOCKMOD . -These options must be disabled if +These must be disabled if .Nm is used. Furthermore, in the unlikely case where both @@ -313,9 +314,8 @@ .Pp All relatively new x86 systems should prefer .Nm . -The options noted above are provided for legacy systems. The P-state support provided by -.Dv ENHANCED_SPEEDSTEP +.Xr est 4 and .Dv POWERNOW_K8 are known to be either problematic or
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Wed Feb 23 13:01:57 UTC 2011
Modified Files:
src/tests/lib/librumphijack: Makefile
Added Files:
src/tests/lib/librumphijack: t_vfs.sh
Log Message:
simple vfs tests (mount ffs, cp/pax files there, un/remount,
check with diff)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/librumphijack/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/librumphijack/t_vfs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/Makefile
diff -u src/tests/lib/librumphijack/Makefile:1.4 src/tests/lib/librumphijack/Makefile:1.5
--- src/tests/lib/librumphijack/Makefile:1.4 Sat Feb 19 13:19:52 2011
+++ src/tests/lib/librumphijack/Makefile Wed Feb 23 13:01:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/02/19 13:19:52 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/23 13:01:57 pooka Exp $
#
.include bsd.own.mk
@@ -8,6 +8,7 @@
TESTS_SH= t_asyncio
TESTS_SH+= t_cwd
TESTS_SH+= t_tcpip
+TESTS_SH+= t_vfs
TESTS_C= h_client
TESTS_C+= h_netget
TESTS_C+= h_cwd
Added files:
Index: src/tests/lib/librumphijack/t_vfs.sh
diff -u /dev/null src/tests/lib/librumphijack/t_vfs.sh:1.1
--- /dev/null Wed Feb 23 13:01:57 2011
+++ src/tests/lib/librumphijack/t_vfs.sh Wed Feb 23 13:01:57 2011
@@ -0,0 +1,107 @@
+# $NetBSD: t_vfs.sh,v 1.1 2011/02/23 13:01:57 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+img=ffs.img
+rumpsrv=\
+rump_server -lrumpvfs -lrumpfs_ffs -d key=/img,hostpath=${img},size=host
+export RUMP_SERVER=unix://csock
+
+domount()
+{
+
+ mntdir=$1
+ [ $# -eq 0 ] mntdir=/rump/mnt
+ atf_check -s exit:0 -e ignore mount_ffs /img ${mntdir}
+}
+
+unmount()
+{
+
+ atf_check -s exit:0 umount -R ${1}
+}
+
+remount()
+{
+
+ unmount /rump/mnt
+ domount /rump/mnt2
+}
+
+test_case()
+{
+ local name=${1}; shift
+
+ atf_test_case ${name} cleanup
+ eval ${name}_head() { }
+ eval ${name}_body() { \
+ atf_check -s exit:0 -o ignore newfs -F -s 2 ${img} ; \
+ atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER} ; \
+ export LD_PRELOAD=/usr/lib/librumphijack.so ; \
+ mkdir /rump/mnt /rump/mnt2 ; \
+ domount ; \
+ ${name} ${@} ; \
+ unmount /rump/mnt2 ;\
+ }
+ eval ${name}_cleanup() { \
+ rump.halt
+ }
+}
+
+test_case paxcopy
+test_case cpcopy
+
+#
+# use rumphijack to cp/pax stuff onto an image, unmount it, remount it
+# at a different location, and check that we have an identical copy
+# (we make a local copy to avoid the minor possibility that someone
+# modifies the source dir data while the test is running)
+#
+paxcopy()
+{
+ parent=$(dirname $(atf_get_srcdir))
+ thedir=$(basename $(atf_get_srcdir))
+ atf_check -s exit:0 pax -rw -s,${parent},, $(atf_get_srcdir) .
+ atf_check -s exit:0 pax -rw ${thedir} /rump/mnt
+ remount
+ atf_check -s exit:0 diff -ru ${thedir} /rump/mnt2/${thedir}
+}
+
+cpcopy()
+{
+ thedir=$(basename $(atf_get_srcdir))
+ atf_check -s exit:0 cp -Rp $(atf_get_srcdir) .
+ atf_check -s exit:0 cp -Rp ${thedir} /rump/mnt
+ remount
+ atf_check -s exit:0 diff -ru ${thedir} /rump/mnt2/${thedir}
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case paxcopy
+ atf_add_test_case cpcopy
+}
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Wed Feb 23 13:03:32 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: +tp To generate a diff of this commit: cvs rdiff -u -r1.252 -r1.253 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.252 src/distrib/sets/lists/tests/mi:1.253 --- src/distrib/sets/lists/tests/mi:1.252 Tue Feb 22 10:37:05 2011 +++ src/distrib/sets/lists/tests/mi Wed Feb 23 13:03:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.252 2011/02/22 10:37:05 pooka Exp $ +# $NetBSD: mi,v 1.253 2011/02/23 13:03:32 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1923,6 +1923,7 @@ ./usr/tests/lib/librumphijack/t_asyncio tests-lib-tests atf ./usr/tests/lib/librumphijack/t_cwd tests-lib-tests atf ./usr/tests/lib/librumphijack/t_tcpip tests-lib-tests atf +./usr/tests/lib/librumphijack/t_vfs tests-lib-tests atf ./usr/tests/lib/librumphijack/ssh_config.in tests-lib-tests atf ./usr/tests/lib/librumphijack/ssh_host_key tests-lib-tests atf ./usr/tests/lib/librumphijack/ssh_host_key.pub tests-lib-tests atf
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Wed Feb 23 15:23:16 UTC 2011
Modified Files:
src/lib/librumphijack: Makefile hijack.c
Added Files:
src/lib/librumphijack: hijackdlsym.c
Log Message:
Put the dlsym-from-this-object trampoline into a separate source
module which is compiled -fno-optimize-sibling-calls instead of
trying to fool the optimizer in various ways in the trampoline.
thanks to yamt for the tip
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/librumphijack/Makefile
cvs rdiff -u -r1.63 -r1.64 src/lib/librumphijack/hijack.c
cvs rdiff -u -r0 -r1.1 src/lib/librumphijack/hijackdlsym.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/Makefile
diff -u src/lib/librumphijack/Makefile:1.6 src/lib/librumphijack/Makefile:1.7
--- src/lib/librumphijack/Makefile:1.6 Thu Jan 27 18:12:19 2011
+++ src/lib/librumphijack/Makefile Wed Feb 23 15:23:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/01/27 18:12:19 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2011/02/23 15:23:15 pooka Exp $
#
LIB= rumphijack
@@ -8,7 +8,7 @@
rumpclient ${.CURDIR}/../librumpclient
MAN= rumphijack.3
-SRCS= hijack.c
+SRCS= hijack.c hijackdlsym.c
CPPFLAGS+= -D_DIAGNOSTIC -D_REENTRANT
@@ -16,5 +16,6 @@
#DBG=-g
#NOGCCERROR=1
+COPTS.hijackdlsym.c+= -fno-optimize-sibling-calls
.include bsd.lib.mk
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.63 src/lib/librumphijack/hijack.c:1.64
--- src/lib/librumphijack/hijack.c:1.63 Mon Feb 21 20:11:56 2011
+++ src/lib/librumphijack/hijack.c Wed Feb 23 15:23:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.63 2011/02/21 20:11:56 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.64 2011/02/23 15:23:15 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.63 2011/02/21 20:11:56 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.64 2011/02/23 15:23:15 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -59,6 +59,8 @@
#include time.h
#include unistd.h
+#include hijack.h
+
enum dualcall {
DUALCALL_WRITE, DUALCALL_WRITEV, DUALCALL_PWRITE, DUALCALL_PWRITEV,
DUALCALL_IOCTL, DUALCALL_FCNTL,
@@ -294,30 +296,6 @@
}
/*
- * This is called from librumpclient in case of LD_PRELOAD.
- * It ensures correct RTLD_NEXT.
- *
- * ... except, it's apparently extremely difficult to force
- * at least gcc to generate an actual stack frame here. So
- * sprinkle some volatile foobar and baz to throw the optimizer
- * off the scent and generate a variable assignment with the
- * return value. The posterboy for this meltdown is amd64
- * with -O2. At least with gcc 4.1.3 i386 works regardless of
- * optimization.
- */
-volatile int rumphijack_unrope; /* there, unhang yourself */
-static void *
-hijackdlsym(void *handle, const char *symbol)
-{
- void *rv;
-
- rv = dlsym(handle, symbol);
- rumphijack_unrope = *(volatile int *)rv;
-
- return (void *)rv;
-}
-
-/*
* This tracks if our process is in a subdirectory of /rump.
* It's preserved over exec.
*/
@@ -452,7 +430,7 @@
extern void *(*rumpclient_dlsym)(void *, const char *);
unsigned i, j;
- rumpclient_dlsym = hijackdlsym;
+ rumpclient_dlsym = rumphijack_dlsym;
host_fork = dlsym(RTLD_NEXT, fork);
host_daemon = dlsym(RTLD_NEXT, daemon);
host_execve = dlsym(RTLD_NEXT, execve);
Added files:
Index: src/lib/librumphijack/hijackdlsym.c
diff -u /dev/null src/lib/librumphijack/hijackdlsym.c:1.1
--- /dev/null Wed Feb 23 15:23:16 2011
+++ src/lib/librumphijack/hijackdlsym.c Wed Feb 23 15:23:15 2011
@@ -0,0 +1,47 @@
+/* $NetBSD: hijackdlsym.c,v 1.1 2011/02/23 15:23:15 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2011 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Wed Feb 23 15:29:21 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
+access(2)
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.64 src/lib/librumphijack/hijack.c:1.65
--- src/lib/librumphijack/hijack.c:1.64 Wed Feb 23 15:23:15 2011
+++ src/lib/librumphijack/hijack.c Wed Feb 23 15:29:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.64 2011/02/23 15:23:15 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.65 2011/02/23 15:29:21 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.64 2011/02/23 15:23:15 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.65 2011/02/23 15:29:21 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -92,6 +92,7 @@
DUALCALL_MOUNT, DUALCALL_UNMOUNT,
DUALCALL___GETCWD,
DUALCALL_CHFLAGS, DUALCALL_LCHFLAGS, DUALCALL_FCHFLAGS,
+ DUALCALL_ACCESS,
DUALCALL__NUM
};
@@ -216,6 +217,7 @@
{ DUALCALL_CHFLAGS, chflags, RSYS_NAME(CHFLAGS) },
{ DUALCALL_LCHFLAGS, lchflags, RSYS_NAME(LCHFLAGS) },
{ DUALCALL_FCHFLAGS, fchflags, RSYS_NAME(FCHFLAGS) },
+ { DUALCALL_ACCESS, access, RSYS_NAME(ACCESS) },
};
#undef S
@@ -1791,6 +1793,11 @@
(const char *, off_t), \
(path, length))
+PATHCALL(int, access, DUALCALL_ACCESS, \
+ (const char *path, int mode), \
+ (const char *, int), \
+ (path, mode))
+
/*
* Note: with mount the decisive parameter is the mount
* destination directory. This is because we don't really know
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Wed Feb 23 15:44:39 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Return value audit: properly set errno and return -1.
Fixes at least cross-kernel mv(1).
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.65 src/lib/librumphijack/hijack.c:1.66
--- src/lib/librumphijack/hijack.c:1.65 Wed Feb 23 15:29:21 2011
+++ src/lib/librumphijack/hijack.c Wed Feb 23 15:44:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.65 2011/02/23 15:29:21 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.66 2011/02/23 15:44:38 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.65 2011/02/23 15:29:21 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.66 2011/02/23 15:44:38 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -722,7 +722,8 @@
else
prefixgap = rumpprefixlen; /* ``/pfx+/path'' */
if (len = prefixgap) {
- return ERANGE;
+ errno = ERANGE;
+ return -1;
}
op___getcwd = GETSYSCALL(rump, __GETCWD);
@@ -754,15 +755,19 @@
int (*op_rename)(const char *, const char *);
if (path_isrump(from)) {
- if (!path_isrump(to))
- return EXDEV;
+ if (!path_isrump(to)) {
+ errno = EXDEV;
+ return -1;
+ }
from = path_host2rump(from);
to = path_host2rump(to);
op_rename = GETSYSCALL(rump, RENAME);
} else {
- if (path_isrump(to))
- return EXDEV;
+ if (path_isrump(to)) {
+ errno = EXDEV;
+ return -1;
+ }
op_rename = GETSYSCALL(host, RENAME);
}
@@ -1008,8 +1013,10 @@
DPRINTF((dup2 - %d (o) - %d (n)\n, oldd, newd));
if (fd_isrump(oldd)) {
- if (!(newd = 0 newd = 2))
- return EBADF;
+ if (!(newd = 0 newd = 2)) {
+ errno = EBADF;
+ return -1;
+ }
oldd = fd_host2rump(oldd);
if (oldd == newd) {
SETDUP2(newd);
@@ -1082,8 +1089,10 @@
if (dup2mask) {
snprintf(buf, sizeof(buf), RUMPHIJACK__DUP2MASK=%u, dup2mask);
dup2str = malloc(strlen(buf)+1);
- if (dup2str == NULL)
- return ENOMEM;
+ if (dup2str == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
strcpy(dup2str, buf);
bonus++;
} else {
@@ -1102,7 +,8 @@
newenv = malloc(sizeof(*newenv) * nelem+bonus);
if (newenv == NULL) {
free(dup2str);
- return ENOMEM;
+ errno = ENOMEM;
+ return -1;
}
memcpy(newenv, envp, nelem*sizeof(*newenv));
if (dup2str) {
@@ -1502,8 +1512,10 @@
ev = changelist[i];
if (ev-filter == EVFILT_READ || ev-filter == EVFILT_WRITE ||
ev-filter == EVFILT_VNODE) {
- if (fd_isrump((int)ev-ident))
-return ENOTSUP;
+ if (fd_isrump((int)ev-ident)) {
+errno = ENOTSUP;
+return -1;
+ }
}
}
CVS commit: src/sys/dev
Module Name:src
Committed By: dyoung
Date: Wed Feb 23 16:20:30 UTC 2011
Modified Files:
src/sys/dev: radio.c
Log Message:
Correct device_t/softc split and, while I am here, delete commented-out
code. Patrick Welche says that this patch fixes the problem that he
reported on current-users@.
BTW, sc_dev is initialized in radioattach(), but I do not see where it
is used.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/radio.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/radio.c
diff -u src/sys/dev/radio.c:1.24 src/sys/dev/radio.c:1.25
--- src/sys/dev/radio.c:1.24 Thu Jan 21 02:19:55 2010
+++ src/sys/dev/radio.c Wed Feb 23 16:20:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: radio.c,v 1.24 2010/01/21 02:19:55 dyoung Exp $ */
+/* $NetBSD: radio.c,v 1.25 2011/02/23 16:20:30 dyoung Exp $ */
/* $OpenBSD: radio.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
@@ -30,7 +30,7 @@
/* This is the /dev/radio driver from OpenBSD */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radio.c,v 1.24 2010/01/21 02:19:55 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: radio.c,v 1.25 2011/02/23 16:20:30 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -78,7 +78,7 @@
static void
radioattach(device_t parent, device_t self, void *aux)
{
- struct radio_softc *sc = (void *)self;
+ struct radio_softc *sc = device_private(self);
struct radio_attach_args *sa = aux;
const struct radio_hw_if *hwp = sa-hwif;
void *hdlp = sa-hdl;
@@ -87,7 +87,7 @@
aprint_normal(\n);
sc-hw_if = hwp;
sc-hw_hdl = hdlp;
- sc-sc_dev = parent;
+ sc-sc_dev = self;
}
static int
@@ -181,7 +181,6 @@
static int
radiodetach(device_t self, int flags)
{
- /*struct radio_softc *sc = (struct radio_softc *)self;*/
int maj, mn;
/* locate the major number */
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Wed Feb 23 16:38:08 UTC 2011
Modified Files:
src/tests/lib/librumphijack: t_vfs.sh
Log Message:
some tests for mv(1)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librumphijack/t_vfs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/t_vfs.sh
diff -u src/tests/lib/librumphijack/t_vfs.sh:1.1 src/tests/lib/librumphijack/t_vfs.sh:1.2
--- src/tests/lib/librumphijack/t_vfs.sh:1.1 Wed Feb 23 13:01:57 2011
+++ src/tests/lib/librumphijack/t_vfs.sh Wed Feb 23 16:38:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_vfs.sh,v 1.1 2011/02/23 13:01:57 pooka Exp $
+# $NetBSD: t_vfs.sh,v 1.2 2011/02/23 16:38:08 pooka Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,7 +26,7 @@
#
img=ffs.img
-rumpsrv=\
+rumpsrv_ffs=\
rump_server -lrumpvfs -lrumpfs_ffs -d key=/img,hostpath=${img},size=host
export RUMP_SERVER=unix://csock
@@ -38,19 +38,35 @@
atf_check -s exit:0 -e ignore mount_ffs /img ${mntdir}
}
-unmount()
+dounmount()
{
- atf_check -s exit:0 umount -R ${1}
+ atf_check -s exit:0 umount -R ${mntdir}
}
remount()
{
- unmount /rump/mnt
+ dounmount
domount /rump/mnt2
}
+simpletest()
+{
+ local name=${1}; shift
+
+ atf_test_case ${name} cleanup
+ eval ${name}_head() { }
+ eval ${name}_body() { \
+ atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER} ; \
+ export LD_PRELOAD=/usr/lib/librumphijack.so ; \
+ ${name} ${@} ; \
+ }
+ eval ${name}_cleanup() { \
+ rump.halt
+ }
+}
+
test_case()
{
local name=${1}; shift
@@ -59,12 +75,12 @@
eval ${name}_head() { }
eval ${name}_body() { \
atf_check -s exit:0 -o ignore newfs -F -s 2 ${img} ; \
- atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER} ; \
+ atf_check -s exit:0 ${rumpsrv_ffs} ${RUMP_SERVER} ; \
export LD_PRELOAD=/usr/lib/librumphijack.so ; \
mkdir /rump/mnt /rump/mnt2 ; \
domount ; \
${name} ${@} ; \
- unmount /rump/mnt2 ;\
+ dounmount ${mntdir}
}
eval ${name}_cleanup() { \
rump.halt
@@ -73,6 +89,7 @@
test_case paxcopy
test_case cpcopy
+test_case mv_nox
#
# use rumphijack to cp/pax stuff onto an image, unmount it, remount it
@@ -99,9 +116,44 @@
atf_check -s exit:0 diff -ru ${thedir} /rump/mnt2/${thedir}
}
+#
+# non-crosskernel mv (non-simple test since this uses rename(2)
+# which is not supported by rumpfs)
+#
+
+# stat default format sans changetime and filename
+statstr='%d %i %Sp %l %Su %Sg %r %z \%Sa\ \%Sm\ \%SB\ %k %b %#Xf'
+mv_nox()
+{
+
+ atf_check -s exit:0 touch /rump/mnt/filename
+ atf_check -s exit:0 -o save:stat.out \
+ stat -f ${statstr} /rump/mnt/filename
+ atf_check -s exit:0 mkdir /rump/mnt/dir
+ atf_check -s exit:0 mv /rump/mnt/filename /rump/mnt/dir/same
+ atf_check -s exit:0 -o file:stat.out \
+ stat -f ${statstr} /rump/mnt/dir/same
+}
+
+simpletest mv_x
+
+#
+# do a cross-kernel mv
+#
+mv_x()
+{
+ thedir=$(basename $(atf_get_srcdir))
+ atf_check -s exit:0 cp -Rp $(atf_get_srcdir) .
+ atf_check -s exit:0 cp -Rp ${thedir} ${thedir}.2
+ atf_check -s exit:0 mv ${thedir} /rump
+ atf_check -s exit:0 diff -ru ${thedir}.2 /rump/${thedir}
+}
+
atf_init_test_cases()
{
atf_add_test_case paxcopy
atf_add_test_case cpcopy
+ atf_add_test_case mv_x
+ atf_add_test_case mv_nox
}
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: dyoung
Date: Wed Feb 23 17:05:33 UTC 2011
Modified Files:
src/sys/ufs/ffs: ffs_snapshot.c
Log Message:
Initialize blkno to 0 right before the snapblkaddr() call that GCC does
not understand so that if ffs_copyonwrite() sprouts a new code path that
does not initialize blkno, the compiler has the chance to reveal it.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/ufs/ffs/ffs_snapshot.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/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.108 src/sys/ufs/ffs/ffs_snapshot.c:1.109
--- src/sys/ufs/ffs/ffs_snapshot.c:1.108 Wed Feb 23 08:53:21 2011
+++ src/sys/ufs/ffs/ffs_snapshot.c Wed Feb 23 17:05:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.108 2011/02/23 08:53:21 hannken Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.109 2011/02/23 17:05:33 dyoung Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.108 2011/02/23 08:53:21 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.109 2011/02/23 17:05:33 dyoung Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -1826,8 +1826,6 @@
uint32_t gen;
int lower, upper, mid, snapshot_locked = 0, error = 0;
- blkno = 0; /* XXX: GCC */
-
/*
* Check for valid snapshots.
*/
@@ -1898,6 +1896,7 @@
blkno = db_get(ip, lbn);
} else {
mutex_exit(si-si_lock);
+ blkno = 0; /* XXX: GCC */
if ((error = snapblkaddr(vp, lbn, blkno)) != 0) {
mutex_enter(si-si_lock);
break;
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Wed Feb 23 18:18:24 UTC 2011 Added Files: src/lib/librumphijack: hijack.h Log Message: duh, remember to cvs add hijack.h too... from pgoyette To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/lib/librumphijack/hijack.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/lib/librumphijack/hijack.h diff -u /dev/null src/lib/librumphijack/hijack.h:1.1 --- /dev/null Wed Feb 23 18:18:24 2011 +++ src/lib/librumphijack/hijack.h Wed Feb 23 18:18:24 2011 @@ -0,0 +1,28 @@ +/* $NetBSD: hijack.h,v 1.1 2011/02/23 18:18:24 pooka Exp $ */ + +/*- + * Copyright (c) 2011 Antti Kantee. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +void *rumphijack_dlsym(void *, const char *);
CVS commit: src/usr.bin/rump_allserver
Module Name:src Committed By: pooka Date: Wed Feb 23 19:59:18 UTC 2011 Modified Files: src/usr.bin/rump_allserver: rump_allserver.1 Log Message: .Xr rump_sp 7 To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.bin/rump_allserver/rump_allserver.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/rump_allserver/rump_allserver.1 diff -u src/usr.bin/rump_allserver/rump_allserver.1:1.16 src/usr.bin/rump_allserver/rump_allserver.1:1.17 --- src/usr.bin/rump_allserver/rump_allserver.1:1.16 Mon Feb 21 18:50:21 2011 +++ src/usr.bin/rump_allserver/rump_allserver.1 Wed Feb 23 19:59:18 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_allserver.1,v 1.16 2011/02/21 18:50:21 pooka Exp $ +.\ $NetBSD: rump_allserver.1,v 1.17 2011/02/23 19:59:18 pooka Exp $ .\ .\ Copyright (c) 2010 Antti Kantee. All rights reserved. .\ @@ -211,4 +211,5 @@ .Sh SEE ALSO .Xr rump.halt 1 , .Xr dlopen 3 , -.Xr rump 3 +.Xr rump 3 , +.Xr rump_sp 7
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Wed Feb 23 20:03:58 UTC 2011
Modified Files:
src/external/mit/xorg/lib: Makefile
Log Message:
move libxcb earlier than libX11, which now wants to link against it.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/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/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.23 src/external/mit/xorg/lib/Makefile:1.24
--- src/external/mit/xorg/lib/Makefile:1.23 Thu Jan 20 18:36:45 2011
+++ src/external/mit/xorg/lib/Makefile Wed Feb 23 20:03:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/01/20 18:36:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.24 2011/02/23 20:03:58 mrg Exp $
# build libraries for xorg
@@ -7,7 +7,7 @@
.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
SUBDIR+=libdrm_intel
.endif
-SUBDIR+=libdrm_radeon pixman xkeyboard-config \
+SUBDIR+=libdrm_radeon pixman xkeyboard-config libxcb \
.WAIT \
dri fontconfig libSM libX11 \
.WAIT \
@@ -31,6 +31,6 @@
libXrandr \
.WAIT \
libXft libglut \
- libxcb .WAIT xcb-util
+ xcb-util
.include bsd.subdir.mk
CVS commit: src/sys/dev/pci
Module Name:src Committed By: matt Date: Thu Feb 24 00:33:18 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add RT3090 To generate a diff of this commit: cvs rdiff -u -r1.1062 -r1.1063 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1062 src/sys/dev/pci/pcidevs:1.1063 --- src/sys/dev/pci/pcidevs:1.1062 Wed Feb 23 12:22:20 2011 +++ src/sys/dev/pci/pcidevs Thu Feb 24 00:33:17 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1062 2011/02/23 12:22:20 jmcneill Exp $ +$NetBSD: pcidevs,v 1.1063 2011/02/24 00:33:17 matt Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3891,6 +3891,7 @@ product RALINK RT2561S 0x0301 RT2561S 802.11b/g product RALINK RT2561 0x0302 RT2561 802.11b/g product RALINK RT2661 0x0401 RT2661 802.11b/g/n +product RALINK RT3090 0x3090 RT3090 802.11b/g/n w/ BlueTooth /* RATOC Systems products */ product RATOC REXPCI31 0x0853 REX PCI-31/33 SCSI
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Thu Feb 24 00:40:09 UTC 2011 Modified Files: src/sys/arch/mips/include: mcontext.h Log Message: make sure to define _UC_MACHINE32_PAD To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/include/mcontext.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/arch/mips/include/mcontext.h diff -u src/sys/arch/mips/include/mcontext.h:1.13 src/sys/arch/mips/include/mcontext.h:1.14 --- src/sys/arch/mips/include/mcontext.h:1.13 Wed Feb 23 07:47:09 2011 +++ src/sys/arch/mips/include/mcontext.h Thu Feb 24 00:40:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mcontext.h,v 1.13 2011/02/23 07:47:09 matt Exp $ */ +/* $NetBSD: mcontext.h,v 1.14 2011/02/24 00:40:09 matt Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -145,7 +145,8 @@ #endif /* !__ASSEMBLER__ */ -#define _UC_MACHINE_PAD 16 /* Padding appended to ucontext_t */ +#define _UC_MACHINE_PAD 16 /* Padding appended to ucontext_t */ +#define _UC_MACHINE32_PAD 16 /* Padding appended to ucontext_t */ #define _UC_SETSTACK 0x0001 #define _UC_CLRSTACK 0x0002
CVS commit: src/usr.bin/find
Module Name:src Committed By: jmcneill Date: Thu Feb 24 02:55:19 UTC 2011 Modified Files: src/usr.bin/find: function.c Log Message: Don't error out while searching for empty directories, from FreeBSD: http://lists.freebsd.org/pipermail/svn-src-head/2010-December/022913.html To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/usr.bin/find/function.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/find/function.c diff -u src/usr.bin/find/function.c:1.65 src/usr.bin/find/function.c:1.66 --- src/usr.bin/find/function.c:1.65 Thu Jan 6 08:18:42 2011 +++ src/usr.bin/find/function.c Thu Feb 24 02:55:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: function.c,v 1.65 2011/01/06 08:18:42 dholland Exp $ */ +/* $NetBSD: function.c,v 1.66 2011/02/24 02:55:18 jmcneill Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = from: @(#)function.c 8.10 (Berkeley) 5/4/95; #else -__RCSID($NetBSD: function.c,v 1.65 2011/01/06 08:18:42 dholland Exp $); +__RCSID($NetBSD: function.c,v 1.66 2011/02/24 02:55:18 jmcneill Exp $); #endif #endif /* not lint */ @@ -453,7 +453,7 @@ empty = 1; dir = opendir(entry-fts_accpath); if (dir == NULL) - err(1, %s, entry-fts_accpath); + return (0); for (dp = readdir(dir); dp; dp = readdir(dir)) if (dp-d_name[0] != '.' || (dp-d_name[1] != '\0'
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Thu Feb 24 03:37:02 UTC 2011
Modified Files:
src/sys/dev/pci: pci.c
Log Message:
add a hack to allow mapping the video memory portions of a mach64's aperture
with BUS_SPACE_MAP_PREFETCHABLE
This probably needs to go in its own function to avoid more clutter when adding
more hacks.
tested on macppc
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/pci/pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci.c
diff -u src/sys/dev/pci/pci.c:1.132 src/sys/dev/pci/pci.c:1.133
--- src/sys/dev/pci/pci.c:1.132 Thu Feb 10 12:37:58 2011
+++ src/sys/dev/pci/pci.c Thu Feb 24 03:37:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.132 2011/02/10 12:37:58 jmcneill Exp $ */
+/* $NetBSD: pci.c,v 1.133 2011/02/24 03:37:02 macallan Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci.c,v 1.132 2011/02/10 12:37:58 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci.c,v 1.133 2011/02/24 03:37:02 macallan Exp $);
#include opt_pci.h
@@ -315,6 +315,26 @@
if (pci_mapreg_info(pc, tag, bar, type,
r-r_offset, r-r_size, r-r_flags) != 0)
break;
+ if ((PCI_VENDOR(id) == PCI_VENDOR_ATI) (bar == 0x10)
+ (r-r_size = 0x100)) {
+struct pci_range *nr;
+/*
+ * this has to be a mach64
+ * split things up so each half-aperture can
+ * be mapped PREFETCHABLE except the last page
+ * which may contain registers
+ */
+r-r_size = 0x7ff000;
+r-r_flags = BUS_SPACE_MAP_LINEAR |
+ BUS_SPACE_MAP_PREFETCHABLE;
+nr = sc-PCI_SC_DEVICESC(device,
+function).c_range[i++];
+nr-r_offset = r-r_offset + 0x80;
+nr-r_size = 0x7ff000;
+nr-r_flags = BUS_SPACE_MAP_LINEAR |
+ BUS_SPACE_MAP_PREFETCHABLE;
+ }
+
}
}
CVS commit: src
Module Name:src Committed By: joerg Date: Thu Feb 24 04:28:49 UTC 2011 Modified Files: src/lib/libc/arch/alpha/gen: _lwp.c src/lib/libc/arch/arm/gen: _lwp.c src/lib/libc/arch/hppa/gen: _lwp.c src/lib/libc/arch/i386/gen: _lwp.c src/lib/libc/arch/m68k/gen: _lwp.c src/lib/libc/arch/mips/gen: _lwp.c src/lib/libc/arch/powerpc/gen: _lwp.c src/lib/libc/arch/sh3/gen: _lwp.c src/lib/libc/arch/sparc/gen: _lwp.c src/lib/libc/arch/sparc64/gen: _lwp.c src/lib/libc/arch/x86_64/gen: _lwp.c src/lib/libpthread: pthread_int.h src/lib/libpthread/arch/i386: pthread_md.h src/sys/arch/alpha/alpha: machdep.c sys_machdep.c src/sys/arch/alpha/include: mcontext.h types.h src/sys/arch/amd64/amd64: machdep.c netbsd32_machdep.c src/sys/arch/amd64/include: mcontext.h types.h src/sys/arch/arm/arm: sig_machdep.c src/sys/arch/arm/include: mcontext.h src/sys/arch/hppa/hppa: hppa_machdep.c trap.S vm_machdep.c src/sys/arch/hppa/include: mcontext.h types.h src/sys/arch/i386/i386: machdep.c src/sys/arch/i386/include: mcontext.h types.h src/sys/arch/m68k/include: mcontext.h src/sys/arch/m68k/m68k: sig_machdep.c src/sys/arch/mips/include: mcontext.h types.h src/sys/arch/mips/mips: cpu_subr.c netbsd32_machdep.c src/sys/arch/powerpc/include: mcontext.h types.h src/sys/arch/sh3/include: mcontext.h types.h src/sys/arch/sh3/sh3: sh3_machdep.c src/sys/arch/sparc/include: mcontext.h types.h src/sys/arch/sparc/sparc: machdep.c vm_machdep.c src/sys/arch/sparc64/sparc64: netbsd32_machdep.c vm_machdep.c Log Message: Allow storing and receiving the LWP private pointer via ucontext_t on all platforms except VAX and IA64. Add fast access via register for AMD64, i386 and SH3 ports. Use this fast access in libpthread to replace the stack based pthread_self(). Implement skeleton support for Alpha, HPPA, PowerPC, SPARC and SPARC64, but leave it disabled. Ports that support this feature provide __HAVELWP_GETPRIVATE_FAST in machine/types.h and a corresponding __lwp_getprivate_fast in machine/mcontext.h. This material is based upon work partially supported by The NetBSD Foundation under a contract with Joerg Sonnenberger. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/alpha/gen/_lwp.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/arm/gen/_lwp.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/hppa/gen/_lwp.c cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/i386/gen/_lwp.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/m68k/gen/_lwp.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/mips/gen/_lwp.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/powerpc/gen/_lwp.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/sh3/gen/_lwp.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/sparc/gen/_lwp.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/sparc64/gen/_lwp.c cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/x86_64/gen/_lwp.c cvs rdiff -u -r1.73 -r1.74 src/lib/libpthread/pthread_int.h cvs rdiff -u -r1.18 -r1.19 src/lib/libpthread/arch/i386/pthread_md.h cvs rdiff -u -r1.328 -r1.329 src/sys/arch/alpha/alpha/machdep.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/alpha/sys_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/include/mcontext.h cvs rdiff -u -r1.43 -r1.44 src/sys/arch/alpha/include/types.h cvs rdiff -u -r1.158 -r1.159 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.72 -r1.73 src/sys/arch/amd64/amd64/netbsd32_machdep.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amd64/include/mcontext.h cvs rdiff -u -r1.35 -r1.36 src/sys/arch/amd64/include/types.h cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/arm/sig_machdep.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/include/mcontext.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hppa/hppa/hppa_machdep.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/hppa/hppa/trap.S cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hppa/hppa/vm_machdep.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/include/mcontext.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hppa/include/types.h cvs rdiff -u -r1.699 -r1.700 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/include/mcontext.h cvs rdiff -u -r1.70 -r1.71 src/sys/arch/i386/include/types.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/include/mcontext.h cvs rdiff -u -r1.45 -r1.46 src/sys/arch/m68k/m68k/sig_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/include/mcontext.h cvs rdiff -u -r1.48 -r1.49 src/sys/arch/mips/include/types.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/mips/cpu_subr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/mips/netbsd32_machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/mcontext.h cvs rdiff -u -r1.36 -r1.37 src/sys/arch/powerpc/include/types.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sh3/include/mcontext.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sh3/include/types.h cvs rdiff -u -r1.90 -r1.91
CVS commit: src/sys/arch
Module Name:src
Committed By: jruoho
Date: Thu Feb 24 04:42:55 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0
src/sys/arch/i386/conf: XEN3_DOM0
src/sys/arch/xen/conf: files.xen
src/sys/arch/xen/x86: cpu.c
Log Message:
Add cpufeaturebus and est(4) for Xen.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/xen/x86/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/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.62 src/sys/arch/amd64/conf/XEN3_DOM0:1.63
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.62 Wed Feb 23 11:43:21 2011
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Feb 24 04:42:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.62 2011/02/23 11:43:21 jruoho Exp $
+# $NetBSD: XEN3_DOM0,v 1.63 2011/02/24 04:42:54 jruoho Exp $
include arch/amd64/conf/std.xen
@@ -23,6 +23,9 @@
# AMD PowerNow! and Cool`n'Quiet technology
options POWERNOW_K8
+# CPU features
+est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
+
#options MTRR # memory-type range register syscall support
#options CONSDEVNAME=\xencons\
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.43 src/sys/arch/i386/conf/XEN3_DOM0:1.44
--- src/sys/arch/i386/conf/XEN3_DOM0:1.43 Thu Feb 17 22:00:36 2011
+++ src/sys/arch/i386/conf/XEN3_DOM0 Thu Feb 24 04:42:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.43 2011/02/17 22:00:36 jym Exp $
+# $NetBSD: XEN3_DOM0,v 1.44 2011/02/24 04:42:54 jruoho Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -40,6 +40,9 @@
# AMD PowerNow! and Cool`n'Quiet technology
options POWERNOW_K8
+# CPU features
+est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
+
#options MTRR # memory-type range register syscall support
#options CONSDEVNAME=\xencons\
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.111 src/sys/arch/xen/conf/files.xen:1.112
--- src/sys/arch/xen/conf/files.xen:1.111 Wed Feb 23 11:43:23 2011
+++ src/sys/arch/xen/conf/files.xen Thu Feb 24 04:42:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.111 2011/02/23 11:43:23 jruoho Exp $
+# $NetBSD: files.xen,v 1.112 2011/02/24 04:42:54 jruoho Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@@ -161,6 +161,7 @@
# xen specific mainbus attributes
define cpubus { [apid = -1] }
+define cpufeaturebus {}
define ioapicbus { [apid = -1] }
define apmbus {}
define pnpbiosbus {}
@@ -284,9 +285,9 @@
attach ipmi at ipmibus
file arch/x86/x86/ipmi.c ipmi needs-flag
-# CPUS
-
-device cpu
+# CPUs
+#
+device cpu: cpufeaturebus
attach cpu at cpubus
device vcpu
@@ -294,6 +295,13 @@
file arch/xen/x86/cpu.c cpu | vcpu
+# CPU features
+#
+device est
+attach est at cpufeaturebus
+file arch/x86/x86/est.c est
+file arch/x86/x86/intel_busclock.c est
+
#
# Compatibility modules
#
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.52 src/sys/arch/xen/x86/cpu.c:1.53
--- src/sys/arch/xen/x86/cpu.c:1.52 Sun Nov 14 13:43:04 2010
+++ src/sys/arch/xen/x86/cpu.c Thu Feb 24 04:42:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.52 2010/11/14 13:43:04 bouyer Exp $ */
+/* $NetBSD: cpu.c,v 1.53 2011/02/24 04:42:55 jruoho Exp $ */
/* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.52 2010/11/14 13:43:04 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.53 2011/02/24 04:42:55 jruoho Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -115,11 +115,13 @@
#error cpu_info contains 32bit bitmasks
#endif
-int cpu_match(device_t, cfdata_t, void *);
-voidcpu_attach(device_t, device_t, void *);
-int vcpu_match(device_t, cfdata_t, void *);
-voidvcpu_attach(device_t, device_t, void *);
-voidcpu_attach_common(device_t, device_t, void *);
+int cpu_match(device_t, cfdata_t, void *);
+void cpu_attach(device_t, device_t, void *);
+int cpu_rescan(device_t, const char *, const int *);
+void cpu_childdetached(device_t, device_t);
+int vcpu_match(device_t, cfdata_t, void *);
+void vcpu_attach(device_t, device_t, void *);
+void cpu_attach_common(device_t, device_t, void *);
void cpu_offline_md(void);
struct cpu_softc {
@@ -133,8 +135,9 @@
const struct cpu_functions mp_cpu_funcs = { mp_cpu_start, NULL,
mp_cpu_start_cleanup };
-CFATTACH_DECL_NEW(cpu, sizeof(struct cpu_softc),
-cpu_match, cpu_attach, NULL, NULL);
+CFATTACH_DECL2_NEW(cpu, sizeof(struct cpu_softc),
+cpu_match, cpu_attach, NULL, NULL, cpu_rescan, cpu_childdetached);
+
CFATTACH_DECL_NEW(vcpu, sizeof(struct cpu_softc),
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: jruoho Date: Thu Feb 24 05:14:58 UTC 2011 Modified Files: src/sys/arch/x86/x86: est.c Log Message: Also check CPU vendor in the match-function. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/est.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/est.c diff -u src/sys/arch/x86/x86/est.c:1.20 src/sys/arch/x86/x86/est.c:1.21 --- src/sys/arch/x86/x86/est.c:1.20 Wed Feb 23 11:43:23 2011 +++ src/sys/arch/x86/x86/est.c Thu Feb 24 05:14:58 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: est.c,v 1.20 2011/02/23 11:43:23 jruoho Exp $ */ +/* $NetBSD: est.c,v 1.21 2011/02/24 05:14:58 jruoho Exp $ */ /* * Copyright (c) 2003 Michael Eriksson. * All rights reserved. @@ -76,7 +76,7 @@ * http://www.codemonkey.org.uk/projects/cpufreq/cpufreq-2.4.22-pre6-1.gz */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: est.c,v 1.20 2011/02/23 11:43:23 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: est.c,v 1.21 2011/02/24 05:14:58 jruoho Exp $); #include sys/param.h #include sys/device.h @@ -1018,6 +1018,10 @@ if (strcmp(cfaa-name, est) != 0) return 0; + if (cpu_vendor != CPUVENDOR_IDT + cpu_vendor != CPUVENDOR_INTEL) + return 0; + if ((ci-ci_feat_val[1] CPUID2_EST) == 0) return 0;
CVS commit: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: mrg Date: Thu Feb 24 05:41:10 UTC 2011 Update of /cvsroot/xsrc/external/mit/freetype/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13356 Log Message: import freetype2 2.4.4. changes include: I. IMPORTANT BUG FIXES - UVS support (TrueType/OpenType cmap format 14) support is fixed. This regression has been introduced in version 2.4.0. II. MISCELLANEOUS - Detect tricky fonts (e.g. MingLiU) by the lengths and checksums of Type42-persistent subtables (`cvt ', `fpgm', and `prep') when a TrueType font without family name is given. The previous fix, introduced in 2.4.3, was too rigorous, causing many subsetted fonts (mainly from PDF files) displayed badly because FreeType forced rendering with the TrueType bytecode engine instead of the autohinter. - Better support for 64bit platforms. - More fixes to improve handling of broken fonts. Status: Vendor Tag: xorg Release Tags: freetype-2-4-4 U xsrc/external/mit/freetype/dist/vms_make.com U xsrc/external/mit/freetype/dist/ChangeLog.20 U xsrc/external/mit/freetype/dist/version.sed U xsrc/external/mit/freetype/dist/Jamrules U xsrc/external/mit/freetype/dist/Jamfile U xsrc/external/mit/freetype/dist/configure U xsrc/external/mit/freetype/dist/ChangeLog.23 U xsrc/external/mit/freetype/dist/ChangeLog.22 U xsrc/external/mit/freetype/dist/ChangeLog.21 U xsrc/external/mit/freetype/dist/autogen.sh U xsrc/external/mit/freetype/dist/README U xsrc/external/mit/freetype/dist/README.git U xsrc/external/mit/freetype/dist/.gitignore U xsrc/external/mit/freetype/dist/modules.cfg U xsrc/external/mit/freetype/dist/Makefile U xsrc/external/mit/freetype/dist/ChangeLog U xsrc/external/mit/freetype/dist/docs/LICENSE.TXT U xsrc/external/mit/freetype/dist/docs/INSTALL.CROSS U xsrc/external/mit/freetype/dist/docs/INSTALL.MAC U xsrc/external/mit/freetype/dist/docs/FTL.TXT U xsrc/external/mit/freetype/dist/docs/MAKEPP U xsrc/external/mit/freetype/dist/docs/INSTALL U xsrc/external/mit/freetype/dist/docs/INSTALL.ANY U xsrc/external/mit/freetype/dist/docs/formats.txt U xsrc/external/mit/freetype/dist/docs/release U xsrc/external/mit/freetype/dist/docs/UPGRADE.UNIX U xsrc/external/mit/freetype/dist/docs/INSTALL.UNIX U xsrc/external/mit/freetype/dist/docs/VERSION.DLL U xsrc/external/mit/freetype/dist/docs/INSTALL.VMS U xsrc/external/mit/freetype/dist/docs/DEBUG U xsrc/external/mit/freetype/dist/docs/PROBLEMS U xsrc/external/mit/freetype/dist/docs/GPL.TXT U xsrc/external/mit/freetype/dist/docs/CUSTOMIZE U xsrc/external/mit/freetype/dist/docs/TODO U xsrc/external/mit/freetype/dist/docs/raster.txt U xsrc/external/mit/freetype/dist/docs/CHANGES U xsrc/external/mit/freetype/dist/docs/INSTALL.GNU U xsrc/external/mit/freetype/dist/docs/reference/ft2-header_file_macros.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-base_interface.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-system_interface.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-truetype_engine.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-cache_subsystem.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-type1_tables.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-computations.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-bitmap_handling.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_variants.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-gasp_table.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-quick_advance.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-truetype_tables.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-raster.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-toc.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-gzip.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_management.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-incremental.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-module_management.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-gx_validation.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-cid_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-version.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-mac_specific.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-pfr_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-sfnt_names.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-basic_types.html U xsrc/external/mit/freetype/dist/docs/reference/.gitignore U xsrc/external/mit/freetype/dist/docs/reference/README U xsrc/external/mit/freetype/dist/docs/reference/ft2-outline_processing.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-font_formats.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-bdf_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-lzw.html U
CVS commit: xsrc/external/mit/freetype/dist/builds/win32
Module Name:xsrc Committed By: mrg Date: Thu Feb 24 05:42:26 UTC 2011 Modified Files: xsrc/external/mit/freetype/dist/builds/win32/visualc: freetype.vcproj xsrc/external/mit/freetype/dist/builds/win32/visualce: freetype.dsp freetype.vcproj index.html Log Message: merge freetype 2.4.4 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp \ xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj \ xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html 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/freetype/dist/builds/win32/visualc/freetype.vcproj diff -u xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.3 xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.4 --- xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj:1.3 Mon Nov 22 08:38:52 2010 +++ xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj Thu Feb 24 05:42:25 2011 @@ -69,7 +69,7 @@ / Tool Name=VCLibrarianTool -OutputFile=..\..\..\objs\freetype243.lib +OutputFile=..\..\..\objs\freetype244.lib SuppressStartupBanner=true / Tool @@ -144,7 +144,7 @@ / Tool Name=VCLibrarianTool -OutputFile=..\..\..\objs\freetype243MT.lib +OutputFile=..\..\..\objs\freetype244MT.lib SuppressStartupBanner=true / Tool @@ -219,7 +219,7 @@ / Tool Name=VCLibrarianTool -OutputFile=..\..\..\objs\freetype243ST.lib +OutputFile=..\..\..\objs\freetype244ST.lib / Tool Name=VCALinkTool @@ -291,7 +291,7 @@ / Tool Name=VCLibrarianTool -OutputFile=..\..\..\objs\freetype243_D.lib +OutputFile=..\..\..\objs\freetype244_D.lib SuppressStartupBanner=true / Tool @@ -364,7 +364,7 @@ / Tool Name=VCLibrarianTool -OutputFile=..\..\..\objs\freetype243ST_D.lib +OutputFile=..\..\..\objs\freetype244ST_D.lib SuppressStartupBanner=true / Tool @@ -438,7 +438,7 @@ / Tool Name=VCLibrarianTool -OutputFile=..\..\..\objs\freetype243MT_D.lib +OutputFile=..\..\..\objs\freetype244MT_D.lib SuppressStartupBanner=true / Tool Index: xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp diff -u xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.3 xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.4 --- xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp:1.3 Mon Nov 22 08:38:52 2010 +++ xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp Thu Feb 24 05:42:25 2011 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:..\..\..\objs\freetype243.lib +# ADD LIB32 /nologo /out:..\..\..\objs\freetype244.lib !ELSEIF $(CFG) == freetype - Win32 Debug @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:..\..\..\objs\freetype243_D.lib +# ADD LIB32 /nologo /out:..\..\..\objs\freetype244_D.lib !ELSEIF $(CFG) == freetype - Win32 Debug Multithreaded @@ -102,8 +102,8 @@ # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:lib\freetype243_D.lib -# ADD LIB32 /nologo /out:..\..\..\objs\freetype243MT_D.lib +# ADD BASE LIB32 /nologo /out:lib\freetype244_D.lib +# ADD LIB32 /nologo /out:..\..\..\objs\freetype244MT_D.lib !ELSEIF $(CFG) == freetype - Win32 Release Multithreaded @@ -126,8 +126,8 @@ # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:lib\freetype243.lib -# ADD LIB32 /nologo /out:..\..\..\objs\freetype243MT.lib +# ADD BASE LIB32 /nologo /out:lib\freetype244.lib +# ADD LIB32 /nologo /out:..\..\..\objs\freetype244MT.lib !ELSEIF $(CFG) == freetype - Win32 Release Singlethreaded @@ -151,8 +151,8 @@ # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:..\..\..\objs\freetype243.lib -# ADD LIB32 /out:..\..\..\objs\freetype243ST.lib +# ADD BASE LIB32 /nologo /out:..\..\..\objs\freetype244.lib +# ADD LIB32 /out:..\..\..\objs\freetype244ST.lib # SUBTRACT LIB32 /nologo !ELSEIF $(CFG) == freetype - Win32 Debug Singlethreaded @@ -177,8 +177,8 @@ # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:..\..\..\objs\freetype243_D.lib -# ADD LIB32 /nologo /out:..\..\..\objs\freetype243ST_D.lib +# ADD BASE LIB32 /nologo /out:..\..\..\objs\freetype244_D.lib +# ADD LIB32 /nologo /out:..\..\..\objs\freetype244ST_D.lib !ENDIF Index: xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj diff -u
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jruoho Date: Thu Feb 24 07:51:16 UTC 2011 Modified Files: src/sys/arch/i386/conf: XEN3_DOM0 Log Message: Remove ENHANCED_SPEEDSTEP. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.44 src/sys/arch/i386/conf/XEN3_DOM0:1.45 --- src/sys/arch/i386/conf/XEN3_DOM0:1.44 Thu Feb 24 04:42:54 2011 +++ src/sys/arch/i386/conf/XEN3_DOM0 Thu Feb 24 07:51:16 2011 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.44 2011/02/24 04:42:54 jruoho Exp $ +# $NetBSD: XEN3_DOM0,v 1.45 2011/02/24 07:51:16 jruoho Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -30,10 +30,6 @@ #options VM86 # virtual 8086 emulation #options USER_LDT # user-settable LDT; used by WINE -# Enhanced SpeedStep Technology in the Pentium M -options ENHANCED_SPEEDSTEP -#options EST_FREQ_USERWRITE # any user can set frequency - # AMD PowerNow! K7 options POWERNOW_K7
CVS commit: src/sys/external/bsd/drm/dist
Module Name:src
Committed By: mrg
Date: Thu Feb 24 07:59:44 UTC 2011
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drmP.h drm_irq.c
src/sys/external/bsd/drm/dist/shared-core: i915_drv.h i915_irq.c
mach64_drv.h mach64_irq.c mga_drv.h mga_irq.c r128_drv.h r128_irq.c
radeon_drv.h radeon_irq.c via_drv.h via_irq.c
Log Message:
convert all crtc values passed in from userland to be unsigned instead
of signed. there's still some more internal to the i915 driver that
should be converted.
tested on a radeon x1550.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm/dist/bsd-core/drmP.h
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/shared-core/i915_drv.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/shared-core/i915_irq.c \
src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c \
src/sys/external/bsd/drm/dist/shared-core/via_drv.h \
src/sys/external/bsd/drm/dist/shared-core/via_irq.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/mach64_irq.c \
src/sys/external/bsd/drm/dist/shared-core/mga_irq.c \
src/sys/external/bsd/drm/dist/shared-core/r128_drv.h \
src/sys/external/bsd/drm/dist/shared-core/r128_irq.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/mga_drv.h
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/drm/dist/shared-core/radeon_drv.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/external/bsd/drm/dist/bsd-core/drmP.h
diff -u src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.20 src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.21
--- src/sys/external/bsd/drm/dist/bsd-core/drmP.h:1.20 Fri Feb 18 14:26:09 2011
+++ src/sys/external/bsd/drm/dist/bsd-core/drmP.h Thu Feb 24 07:59:44 2011
@@ -728,9 +728,9 @@
int (*irq_postinstall)(struct drm_device *dev);
void (*irq_uninstall)(struct drm_device *dev);
irqreturn_t (*irq_handler)(DRM_IRQ_ARGS);
- u32 (*get_vblank_counter)(struct drm_device *dev, int crtc);
- int (*enable_vblank)(struct drm_device *dev, int crtc);
- void (*disable_vblank)(struct drm_device *dev, int crtc);
+ u32 (*get_vblank_counter)(struct drm_device *dev, unsigned int crtc);
+ int (*enable_vblank)(struct drm_device *dev, unsigned int crtc);
+ void (*disable_vblank)(struct drm_device *dev, unsigned int crtc);
drm_pci_id_list_t *id_entry; /* PCI ID, name, and chipset private */
@@ -1075,14 +1075,14 @@
void drm_driver_irq_preinstall(struct drm_device *dev);
void drm_driver_irq_postinstall(struct drm_device *dev);
void drm_driver_irq_uninstall(struct drm_device *dev);
-void drm_handle_vblank(struct drm_device *dev, int crtc);
-u32 drm_vblank_count(struct drm_device *dev, int crtc);
-int drm_vblank_get(struct drm_device *dev, int crtc);
-void drm_vblank_put(struct drm_device *dev, int crtc);
+void drm_handle_vblank(struct drm_device *dev, unsigned int crtc);
+u32 drm_vblank_count(struct drm_device *dev, unsigned int crtc);
+int drm_vblank_get(struct drm_device *dev, unsigned int crtc);
+void drm_vblank_put(struct drm_device *dev, unsigned int crtc);
void drm_vblank_cleanup(struct drm_device *dev);
int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);
int drm_vblank_init(struct drm_device *dev, int num_crtcs);
-void drm_vbl_send_signals(struct drm_device *dev, int crtc);
+void drm_vbl_send_signals(struct drm_device *dev, unsigned int crtc);
int drm_modeset_ctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.12 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.13
--- src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c:1.12 Thu Jul 1 02:38:29 2010
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c Thu Feb 24 07:59:44 2011
@@ -79,7 +79,7 @@
static void vblank_disable_fn(void *arg)
{
struct drm_device *dev = (struct drm_device *)arg;
- int i;
+ unsigned int i;
#if defined(__NetBSD__)
mutex_enter(dev-vbl_lock);
@@ -298,12 +298,12 @@
}
}
-u32 drm_vblank_count(struct drm_device *dev, int crtc)
+u32 drm_vblank_count(struct drm_device *dev, unsigned int crtc)
{
return atomic_read(dev-vblank[crtc].count);
}
-static void drm_update_vblank_count(struct drm_device *dev, int crtc)
+static void drm_update_vblank_count(struct drm_device *dev, unsigned int crtc)
{
u32 cur_vblank, diff;
@@ -329,7 +329,7 @@
atomic_add(diff, dev-vblank[crtc].count);
}
-int drm_vblank_get(struct drm_device *dev, int crtc)
+int drm_vblank_get(struct drm_device *dev, unsigned int crtc)
{
unsigned long irqflags;
int ret = 0;
@@ -353,7 +353,7 @@
return ret;
}
-void
