CVS commit: src/usr.sbin/fwctl
Module Name:src
Committed By: cegger
Date: Sat Jul 31 07:05:32 UTC 2010
Modified Files:
src/usr.sbin/fwctl: eui64.c
Log Message:
remove useless brackets. From kiyohara@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/fwctl/eui64.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.sbin/fwctl/eui64.c
diff -u src/usr.sbin/fwctl/eui64.c:1.2 src/usr.sbin/fwctl/eui64.c:1.3
--- src/usr.sbin/fwctl/eui64.c:1.2 Wed Apr 15 06:02:37 2009
+++ src/usr.sbin/fwctl/eui64.c Sat Jul 31 07:05:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: eui64.c,v 1.2 2009/04/15 06:02:37 lukem Exp $ */
+/* $NetBSD: eui64.c,v 1.3 2010/07/31 07:05:32 cegger Exp $ */
/*
* Copyright 2004 The Aerospace Corporation. All rights reserved.
*
@@ -108,7 +108,7 @@
linehead = strdup(l);
if (linehead == NULL)
- return (-1);
+ return -1;
line = linehead;
/* Find and parse the EUI64 */
@@ -139,11 +139,11 @@
goto bad;
}
- return (0);
+ return 0;
bad:
free(linehead);
- return (-1);
+ return -1;
}
/*
@@ -187,7 +187,7 @@
goto good;
}
- return (-1);
+ return -1;
good:
e-octet[0]=o0;
@@ -199,7 +199,7 @@
e-octet[6]=o6;
e-octet[7]=o7;
-return (0);
+return 0;
}
/*
@@ -214,8 +214,8 @@
id-octet[0], id-octet[1], id-octet[2], id-octet[3],
id-octet[4], id-octet[5], id-octet[6], id-octet[7]);
if (i 23 || i = (int)len)
-return (-1);
-return (0);
+return -1;
+return 0;
}
/*
@@ -235,7 +235,7 @@
char *yp_domain;
#endif
if ((fp = fopen(_PATH_EUI64, r)) == NULL)
- return (1);
+ return 1;
while (fgets(buf,BUFSIZ,fp)) {
if (buf[0] == '#')
@@ -261,12 +261,12 @@
/* We have a match */
strcpy(hostname, local_host);
fclose(fp);
-return(0);
+return 0;
}
}
}
fclose(fp);
- return (1);
+ return 1;
}
/*
@@ -285,7 +285,7 @@
char *yp_domain;
#endif
if ((fp = fopen(_PATH_EUI64, r)) == NULL)
- return (1);
+ return 1;
while (fgets(buf,BUFSIZ,fp)) {
if (buf[0] == '#')
@@ -309,10 +309,10 @@
/* We have a match */
bcopy(local_eui64, id, sizeof(struct eui64));
fclose(fp);
-return(0);
+return 0;
}
}
}
fclose(fp);
- return (1);
+ return 1;
}
CVS commit: src/lib/libc/stdio
Module Name:src
Committed By: christos
Date: Sat Jul 31 07:58:22 UTC 2010
Modified Files:
src/lib/libc/stdio: vfwprintf.c
Log Message:
undo unrelated diff.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/stdio/vfwprintf.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/libc/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.19 src/lib/libc/stdio/vfwprintf.c:1.20
--- src/lib/libc/stdio/vfwprintf.c:1.19 Sat Jul 31 03:24:52 2010
+++ src/lib/libc/stdio/vfwprintf.c Sat Jul 31 03:58:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.19 2010/07/31 07:24:52 tnozaki Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.20 2010/07/31 07:58:22 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = @(#)vfprintf.c 8.1 (Berkeley) 6/4/93;
__FBSDID($FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $);
#else
-__RCSID($NetBSD: vfwprintf.c,v 1.19 2010/07/31 07:24:52 tnozaki Exp $);
+__RCSID($NetBSD: vfwprintf.c,v 1.20 2010/07/31 07:58:22 christos Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -815,9 +815,8 @@
/* optimise fprintf(stderr) (and other unbuffered Unix files) */
if ((fp-_flags (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR)
- __sfileno(fp) != -1) {
+ __sfileno(fp) != -1)
return (__sbprintf(fp, fmt0, ap));
- }
fmt = (CHAR_T *)__UNCONST(fmt0);
argtable = NULL;
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: tnozaki Date: Sat Jul 31 08:47:34 UTC 2010 Modified Files: src/lib/libc/stdio: vfwprintf.c Log Message: initialize fake FILE, not fp. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/stdio/vfwprintf.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/libc/stdio/vfwprintf.c diff -u src/lib/libc/stdio/vfwprintf.c:1.20 src/lib/libc/stdio/vfwprintf.c:1.21 --- src/lib/libc/stdio/vfwprintf.c:1.20 Sat Jul 31 07:58:22 2010 +++ src/lib/libc/stdio/vfwprintf.c Sat Jul 31 08:47:34 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vfwprintf.c,v 1.20 2010/07/31 07:58:22 christos Exp $ */ +/* $NetBSD: vfwprintf.c,v 1.21 2010/07/31 08:47:34 tnozaki Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -38,7 +38,7 @@ static char sccsid[] = @(#)vfprintf.c 8.1 (Berkeley) 6/4/93; __FBSDID($FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $); #else -__RCSID($NetBSD: vfwprintf.c,v 1.20 2010/07/31 07:58:22 christos Exp $); +__RCSID($NetBSD: vfwprintf.c,v 1.21 2010/07/31 08:47:34 tnozaki Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -163,7 +163,7 @@ _DIAGASSERT(fmt != NULL); _FILEEXT_SETUP(fake, fakeext); - memset(WCIO_GET(fp), 0, sizeof(struct wchar_io_data)); + memset(WCIO_GET(fake), 0, sizeof(struct wchar_io_data)); /* copy the important variables */ fake._flags = fp-_flags ~__SNBF;
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jmmv Date: Sat Jul 31 10:42:22 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add obsolete entries for usr/tests/lib/csu/h_initfini. Hi jo...@. To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 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.124 src/distrib/sets/lists/tests/mi:1.125 --- src/distrib/sets/lists/tests/mi:1.124 Thu Jul 29 16:30:26 2010 +++ src/distrib/sets/lists/tests/mi Sat Jul 31 10:42:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.124 2010/07/29 16:30:26 njoly Exp $ +# $NetBSD: mi,v 1.125 2010/07/31 10:42:22 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -266,6 +266,7 @@ ./usr/libdata/debug/usr/tests/kernel/tty/t_pr.debug tests-kernel-tests debug,atf ./usr/libdata/debug/usr/tests/lib tests-lib-debug ./usr/libdata/debug/usr/tests/lib/csu tests-lib-debug +./usr/libdata/debug/usr/tests/lib/csu/h_initfini.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/csu/h_initfini1.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/csu/h_initfini2.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/csu/h_initfini3.debug tests-lib-debug debug,atf @@ -1378,6 +1379,7 @@ ./usr/tests/lib/Atffiletests-lib-tests atf ./usr/tests/lib/csutests-lib-tests ./usr/tests/lib/csu/Atffile tests-lib-tests atf +./usr/tests/lib/csu/h_initfini tests-obsolete obsolete ./usr/tests/lib/csu/h_initfini1 tests-lib-tests atf ./usr/tests/lib/csu/h_initfini2 tests-lib-tests atf ./usr/tests/lib/csu/h_initfini3 tests-lib-tests atf
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Sat Jul 31 12:24:50 UTC 2010 Modified Files: src/sys/arch/macppc/conf: GENERIC.MP Log Message: send interrupts to only cpu0, otherwise we can run into trouble under very high interrupt load - there is a chance that the same handler serves subsequent interrupts on different CPUs at the same time To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/macppc/conf/GENERIC.MP 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/macppc/conf/GENERIC.MP diff -u src/sys/arch/macppc/conf/GENERIC.MP:1.3 src/sys/arch/macppc/conf/GENERIC.MP:1.4 --- src/sys/arch/macppc/conf/GENERIC.MP:1.3 Tue Aug 26 16:55:48 2008 +++ src/sys/arch/macppc/conf/GENERIC.MP Sat Jul 31 12:24:50 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.MP,v 1.3 2008/08/26 16:55:48 macallan Exp $ +# $NetBSD: GENERIC.MP,v 1.4 2010/07/31 12:24:50 macallan Exp $ # # GENERIC kernel, plus multiprocessor support. @@ -7,4 +7,5 @@ options MULTIPROCESSOR options IPI_HAMMERHEAD options IPI_OPENPIC -options OPENPIC_DISTRIBUTE # let all CPUs serve interrupts +# this option may cause trouble under very high interrupt load +#options OPENPIC_DISTRIBUTE # let all CPUs serve interrupts
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Sat Jul 31 12:54:36 UTC 2010
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch hpcarm, hpcmips, and hpcsh to using X11FLAVOUR=Xorg.
To generate a diff of this commit:
cvs rdiff -u -r1.635 -r1.636 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.635 src/share/mk/bsd.own.mk:1.636
--- src/share/mk/bsd.own.mk:1.635 Sat Jul 17 22:53:29 2010
+++ src/share/mk/bsd.own.mk Sat Jul 31 12:54:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.635 2010/07/17 22:53:29 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.636 2010/07/31 12:54:35 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -739,8 +739,7 @@
#
.if ${MACHINE} == alpha || ${MACHINE} == acorn32 || \
${MACHINE} == amiga || ${MACHINE} == dreamcast || \
- ${MACHINE} == ews4800mips || ${MACHINE} == hpcarm || \
- ${MACHINE} == hpcmips || ${MACHINE} == hpcsh || \
+ ${MACHINE} == ews4800mips || \
${MACHINE} == mac68k || ${MACHINE} == newsmips || \
${MACHINE} == ofppc || ${MACHINE} == pmax || \
${MACHINE} == sun3 || ${MACHINE} == x68k
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Sat Jul 31 13:18:55 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note about X11FLAVOUR=Xorg on hpcarm, hpcmips, and hpcsh. To generate a diff of this commit: cvs rdiff -u -r1.1422 -r1.1423 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1422 src/doc/CHANGES:1.1423 --- src/doc/CHANGES:1.1422 Mon Jul 26 22:40:11 2010 +++ src/doc/CHANGES Sat Jul 31 13:18:54 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1422 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1423 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -695,3 +695,5 @@ amd64, i386: Intel Firmware Hub Random Number Generator support moved from pchb(4) to fwhrng(4) at ichlpcib(4). [jakllsch 20100723] i386: Add PAE support. [jym 20100727] + hpcarm, hpcmips, hpcsh: Switch to using Xorg servers and binaries. + [tsutsui 20100731]
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Sat Jul 31 13:20:08 UTC 2010 Modified Files: src/share/man/man9: module.9 Log Message: Improve markup, add documentation for the module's modcmd() interface To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.3 src/share/man/man9/module.9:1.4 --- src/share/man/man9/module.9:1.3 Sat Jul 31 03:44:33 2010 +++ src/share/man/man9/module.9 Sat Jul 31 13:20:08 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: module.9,v 1.3 2010/07/31 03:44:33 pgoyette Exp $ +.\ $NetBSD: module.9,v 1.4 2010/07/31 13:20:08 pgoyette Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -43,7 +43,8 @@ .In sys/module.h .Fn MODULE class name required .Ft int -.Fn module_load const char *name int flags prop_dictionary_t props modclass_t class +.Fn module_load const char *name int flags prop_dictionary_t props \ +modclass_t class .Ft int .Fn module_autoload const char *name modclass_t class .Ft int @@ -59,7 +60,7 @@ loaded into or unloaded from a running kernel. This provides a mechanism to update the module without having to relink the kernel and reboot. -Modules can be loaded from with the kernel image, provided by the boot +Modules can be loaded from within the kernel image, provided by the boot loader, or loaded from the file system. .Pp The @@ -68,7 +69,7 @@ .Pp The .Vt modinfo_t -type contains module header info. +type resides within the module itself, and contains module header info. .Sh FUNCTIONS .Bl -tag -width abcd .It Fn MODULE class name required @@ -77,18 +78,72 @@ macro creates and initializes a .Vt modinfo_t structure. +In addition to the explicit arguments, the +.Fn MODULE +macro creates a reference to the module's +.Fn modcmd +function. +This function is defined as +.Bl -tag -width abcd +.It Ft int +.Fn modcmd modcmd_t cmd void *data +.El +.Pp +The +.Fa cmd +argument requests one of the following operations: +.Bl -tag -width abcd +.It MODULE_CMD_INIT perform module-specific initialization when the \ +module is loaded +.It MODULE_CMD_FINI perform module-specific clean-up before the module \ +is unloaded +.It MODULE_CMD_AUTOUNLOAD notify the module that it is about to be \ +unloaded +.It MODULE_CMD_STAT request the module to provide status information \ +(not currently implemented) +.El +.Pp +All modules' +.Fn modcmd +functions must implement the +.Dv MODULE_CMD_INIT +and +.Dv MODULE_CMD_FINI +commands; the other commands are optional, and should return zero (success) +if not implemented. +The +.Fn modcmd +function's return value is ignored for +.Dv MODULE_CMD_FINI . +.Pp +For the +.Dv MODULE_CMD_INIT +command, the +.Fa data +argument is used to pass the module's props dictionary; for the +.Dv MODULE_CMD_STAT +command, the +.Fa data +argument points to a buffer where the status information should be placed. +.Pp The __link_set mechanism is used to enable the .Nm subsystem to locate the structure. .It Fn module_load name flags props class .Pp -Loads a module, links it into the running kernel, and calls the module's +Load a module, link it into the running kernel, and call the module's .Fn modcmd -routine with an argument of MODULE_CMD_INIT. +routine with a +.Fa cmd +argument of +.Dv MODULE_CMD_INIT . If the specified module requires other modules, they are loaded first; if any required module cannot be loaded or if any of their .Fn modcmd -control routines returns a non-zero status, loading of this module will fail. +control routines returns a non-zero status, loading of this module and all +required modules will fail. +Thus, the loading of a module and its required modules is an atomic +operation. .Pp The loader will look first for a built-in module with the specified .Fa name @@ -118,19 +173,28 @@ .Pp The .Fa class -argument can be any of MODULE_CLASS_ANY, MODULE_CLASS_MISC, MODULE_CLASS_VFS, -MODULE_CLASS_DRIVER, MODULE_CLASS_EXEC, or MODULE_CLASS_SECMODEL. -If the class is not MODULE_CLASS_ANY, the class of the module being loaded +argument can be any of +.Dv MODULE_CLASS_ANY , +.Dv MODULE_CLASS_MISC , +.Dv MODULE_CLASS_VFS , +.Dv MODULE_CLASS_DRIVER , +.Dv MODULE_CLASS_EXEC , +or +.Dv MODULE_CLASS_SECMODEL . +If the class is not +.Dv MODULE_CLASS_ANY , +the class of the module being loaded must match the requested class. .Pp The .Fn module_load -routine is primarily intended as the implementation of the MODCTL_LOAD +routine is primarily intended as the implementation of the +.Dv MODCTL_LOAD option of the .Xr modctl 2 system call. .It Fn module_autoload name class -Auto-loads a module, making it available for automatic unloading. +Auto-load a module, making it available for automatic unloading. The .Fa name and @@ -139,12 +203,15 @@ .Fn
CVS commit: src/share/man/man9
Module Name:src Committed By: pgoyette Date: Sat Jul 31 13:27:29 UTC 2010 Modified Files: src/share/man/man9: module.9 Log Message: Unimplemented modcmd() routines should return ENOTTY, not zero. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/module.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/module.9 diff -u src/share/man/man9/module.9:1.4 src/share/man/man9/module.9:1.5 --- src/share/man/man9/module.9:1.4 Sat Jul 31 13:20:08 2010 +++ src/share/man/man9/module.9 Sat Jul 31 13:27:29 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: module.9,v 1.4 2010/07/31 13:20:08 pgoyette Exp $ +.\ $NetBSD: module.9,v 1.5 2010/07/31 13:27:29 pgoyette Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -109,8 +109,8 @@ .Dv MODULE_CMD_INIT and .Dv MODULE_CMD_FINI -commands; the other commands are optional, and should return zero (success) -if not implemented. +commands; the other commands are optional, and should return ENOTTY if +not implemented. The .Fn modcmd function's return value is ignored for
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: tsutsui
Date: Sat Jul 31 13:32:23 UTC 2010
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
Log Message:
Remove obsolete (commented out) XSERVER_XHPC.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/Makefile.common
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/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.13 src/external/mit/xorg/server/xorg-server/Makefile.common:1.14
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.13 Mon Jul 12 07:54:12 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Sat Jul 31 13:32:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2010/07/12 07:54:12 kiyohara Exp $
+# $NetBSD: Makefile.common,v 1.14 2010/07/31 13:32:23 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -54,10 +54,6 @@
XSERVER_XFREE86= yes
.endif
-#.if ${MACHINE} == hpcarm || ${MACHINE} == hpcmips || ${MACHINE} == hpcsh
-#XSERVER_XHPC= yes
-#.endif
-
.if ${MACHINE} == mac68k
XSERVER_XMAC68K= yes
XSERVER_HAS_CFB= yes
@@ -112,8 +108,6 @@
XSERVER_XFREE68?= no
# Does this platform build XFree86 X server?
XSERVER_XFREE86?= no
-# Does this platform build Xhpc X servers?
-XSERVER_XHPC?= no
# Does this platform build the Xmac68k X server?
XSERVER_XMAC68K?= no
# Does this platform build Xmacppc X server?
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: tsutsui
Date: Sat Jul 31 14:40:05 UTC 2010
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
Log Message:
Cleanup per ${MACHINE} if-clause lines for XFree86 servers.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/Makefile.common
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/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.14 src/external/mit/xorg/server/xorg-server/Makefile.common:1.15
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.14 Sat Jul 31 13:32:23 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Sat Jul 31 14:40:05 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2010/07/31 13:32:23 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.15 2010/07/31 14:40:05 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -40,16 +40,23 @@
.endif
# XFree86 servers all need XFONT as well.
-.if ${MACHINE} == i386 || ${MACHINE} == amd64 || \
-${MACHINE} == dreamcast || \
-${MACHINE} == hpcarm || \
-${MACHINE} == hpcmips || \
-${MACHINE} == hpcsh ||\
-${MACHINE} == macppc || ${MACHINE} == cats || \
-${MACHINE} == sgimips || ${MACHINE} == shark || \
-${MACHINE} == netwinder || ${MACHINE} == sparc64 || \
-${MACHINE} == sparc || ${MACHINE} == alpha || \
-${MACHINE} == zaurus || ${MACHINE} == prep
+.if \
+${MACHINE} == alpha || \
+${MACHINE} == amd64 || \
+${MACHINE} == cats || \
+${MACHINE} == dreamcast || \
+${MACHINE} == hpcarm || \
+${MACHINE} == hpcmips || \
+${MACHINE} == hpcsh || \
+${MACHINE} == i386 || \
+${MACHINE} == macppc || \
+${MACHINE} == netwinder || \
+${MACHINE} == prep || \
+${MACHINE} == sgimips || \
+${MACHINE} == shark || \
+${MACHINE} == sparc || \
+${MACHINE} == sparc64 || \
+${MACHINE} == zaurus
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
.endif
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: tsutsui
Date: Sat Jul 31 14:45:20 UTC 2010
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
Log Message:
Remove commented out XSERVER_XDREAMCAST lines.
It won't happen but will be supported by Xorg wsfb server.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/Makefile.common
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/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.15 src/external/mit/xorg/server/xorg-server/Makefile.common:1.16
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.15 Sat Jul 31 14:40:05 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Sat Jul 31 14:45:19 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2010/07/31 14:40:05 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.16 2010/07/31 14:45:19 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -31,10 +31,6 @@
#XSERVER_XFREE68= yes
.endif
-#.if ${MACHINE} == dreamcast
-#XSERVER_XDREAMCAST?= yes
-#.endif
-
.if ${MACHINE} == newsmips
XSERVER_XNEWSMIPS?= yes
.endif
@@ -107,8 +103,6 @@
XSERVER_XARM32VIDC?= no
# Does this platform build the XdecNetBSD server?
XSERVER_XDECNETBSD?= no
-# Does this platform build the Xdreamcast server?
-XSERVER_XDREAMCAST?= no
# Does this platform build the Xnewsmips server?
XSERVER_XNEWSMIPS?= no
# Does this platform build the Xfree68 servers?
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: tsutsui
Date: Sat Jul 31 15:01:12 UTC 2010
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
Log Message:
Move and sort definitions for legacy MD Xservers per ${MACHINE}.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/Makefile.common
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/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.16 src/external/mit/xorg/server/xorg-server/Makefile.common:1.17
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.16 Sat Jul 31 14:45:19 2010
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Sat Jul 31 15:01:12 2010
@@ -1,40 +1,10 @@
-# $NetBSD: Makefile.common,v 1.16 2010/07/31 14:45:19 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.17 2010/07/31 15:01:12 tsutsui Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
# below for descriptions of each variable.
-.if ${MACHINE} == x68k
-XSERVER_X68K= yes
-.endif
-
-.if ${MACHINE} == alpha
-XSERVER_XALPHANETBSD= yes
-.endif
-
-.if ${MACHINE} == amiga
-XSERVER_XAMIGA= yes
-XSERVER_HAS_AFB= yes
-.endif
-
-.if ${MACHINE} == acorn32
-XSERVER_XARM32VIDC= yes
-.endif
-
-.if ${MACHINE} == alpha || ${MACHINE} == pmax
-XSERVER_XDECNETBSD= yes
-.endif
-
-.if ${MACHINE} == atari
-XSERVER_HAS_IPLAN?= yes
-#XSERVER_XFREE68= yes
-.endif
-
-.if ${MACHINE} == newsmips
-XSERVER_XNEWSMIPS?= yes
-.endif
-
# XFree86 servers all need XFONT as well.
.if \
${MACHINE} == alpha || \
@@ -57,6 +27,26 @@
XSERVER_XFREE86= yes
.endif
+
+.if ${MACHINE} == acorn32
+XSERVER_XARM32VIDC= yes
+.endif
+
+.if ${MACHINE} == alpha
+XSERVER_XALPHANETBSD= yes
+XSERVER_XDECNETBSD= yes
+.endif
+
+.if ${MACHINE} == amiga
+XSERVER_XAMIGA= yes
+XSERVER_HAS_AFB= yes
+.endif
+
+.if ${MACHINE} == atari
+XSERVER_HAS_IPLAN?= yes
+#XSERVER_XFREE68= yes
+.endif
+
.if ${MACHINE} == mac68k
XSERVER_XMAC68K= yes
XSERVER_HAS_CFB= yes
@@ -66,17 +56,28 @@
XSERVER_XMACPPC= yes
.endif
+.if ${MACHINE} == newsmips
+XSERVER_XNEWSMIPS?= yes
+.endif
+
.if ${MACHINE} == pmax
+XSERVER_XDECNETBSD= yes
XSERVER_XPMAX= no # XXX should be yes but may be obsoleted
.endif
-.if ${MACHINE} == sparc || ${MACHINE} == sparc64 || ${MACHINE} == sun3
+.if ${MACHINE} == sparc || ${MACHINE} == sparc64
XSERVER_XSUN= yes
XSERVER_XSUNMONO= yes
+XSERVER_XSUN24= yes
.endif
-.if ${MACHINE} == sparc || ${MACHINE} == sparc64
-XSERVER_XSUN24= yes
+.if ${MACHINE} == sun3
+XSERVER_XSUN= yes
+XSERVER_XSUNMONO= yes
+.endif
+
+.if ${MACHINE} == x68k
+XSERVER_X68K= yes
.endif
@@ -93,31 +94,32 @@
# Does this server use iplan2p? libraries?
XSERVER_HAS_IPLAN?= no
-# Does this platform build X68k X servers?
-XSERVER_X68K?= no
+# Does this platform build XFree86 X server?
+XSERVER_XFREE86?= no
+
# Does this platform build the XalphaNetBSD server?
XSERVER_XALPHANETBSD?= no
-# Does this platform build Xvfb X server?
+# Does this platform build the Xamiga server?
XSERVER_XAMIGA?= no
# Does this platform build the Xarm32VIDC server?
XSERVER_XARM32VIDC?= no
# Does this platform build the XdecNetBSD server?
XSERVER_XDECNETBSD?= no
-# Does this platform build the Xnewsmips server?
-XSERVER_XNEWSMIPS?= no
# Does this platform build the Xfree68 servers?
XSERVER_XFREE68?= no
-# Does this platform build XFree86 X server?
-XSERVER_XFREE86?= no
# Does this platform build the Xmac68k X server?
XSERVER_XMAC68K?= no
# Does this platform build Xmacppc X server?
XSERVER_XMACPPC?= no
+# Does this platform build the Xnewsmips server?
+XSERVER_XNEWSMIPS?= no
# Does this platform build Xpmax X servers?
XSERVER_XPMAX?= no
# Does this platform build Xsun* X servers?
XSERVER_XSUN?= no
XSERVER_XSUNMONO?= no
XSERVER_XSUN24?= no
+# Does this platform build X68k X servers?
+XSERVER_X68K?= no
# Does this platform build Xvfb X server?
XSERVER_XVFB?= yes
CVS commit: src/sys/arch/hpcarm/conf
Module Name:src Committed By: tsutsui Date: Sat Jul 31 16:02:11 UTC 2010 Modified Files: src/sys/arch/hpcarm/conf: WZERO3 Log Message: Add atapibus and atapi devices. My USB DVD multi drive requires them. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcarm/conf/WZERO3 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/hpcarm/conf/WZERO3 diff -u src/sys/arch/hpcarm/conf/WZERO3:1.12 src/sys/arch/hpcarm/conf/WZERO3:1.13 --- src/sys/arch/hpcarm/conf/WZERO3:1.12 Sat Jul 31 15:57:30 2010 +++ src/sys/arch/hpcarm/conf/WZERO3 Sat Jul 31 16:02:11 2010 @@ -1,4 +1,4 @@ -# $NetBSD: WZERO3,v 1.12 2010/07/31 15:57:30 tsutsui Exp $ +# $NetBSD: WZERO3,v 1.13 2010/07/31 16:02:11 tsutsui Exp $ # # WZERO3 -- Sharp Windows Mobile 5 based PDA # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.12 $ +#ident GENERIC-$Revision: 1.13 $ # estimated number of users maxusers 32 @@ -252,6 +252,16 @@ upgt* at uhub? port ? # Intersil PrismGT zyd* at uhub? port ? # Zydas ZD1211 +# ATAPI bus support +atapibus* at atapi? + +# ATAPI devices +# flags have the same meaning as for IDE drives. +cd* at atapibus? drive ? flags 0x # ATAPI CD-ROM drives +sd* at atapibus? drive ? flags 0x # ATAPI disk drives +#st* at atapibus? drive ? flags 0x # ATAPI tape drives +uk* at atapibus? drive ? flags 0x # ATAPI unknown + # SCSI bus support scsibus* at scsi?
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Sat Jul 31 16:23:15 UTC 2010
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Cleanup and sort if-clause lines for X11FLAVOUR per ${MACHINE}.
To generate a diff of this commit:
cvs rdiff -u -r1.636 -r1.637 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.636 src/share/mk/bsd.own.mk:1.637
--- src/share/mk/bsd.own.mk:1.636 Sat Jul 31 12:54:35 2010
+++ src/share/mk/bsd.own.mk Sat Jul 31 16:23:15 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.636 2010/07/31 12:54:35 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.637 2010/07/31 16:23:15 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -737,12 +737,18 @@
#
# Do we default to XFree86 or Xorg for this platform?
#
-.if ${MACHINE} == alpha || ${MACHINE} == acorn32 || \
- ${MACHINE} == amiga || ${MACHINE} == dreamcast || \
- ${MACHINE} == ews4800mips || \
- ${MACHINE} == mac68k || ${MACHINE} == newsmips || \
- ${MACHINE} == ofppc || ${MACHINE} == pmax || \
- ${MACHINE} == sun3 || ${MACHINE} == x68k
+.if \
+${MACHINE} == acorn32 || \
+${MACHINE} == alpha || \
+${MACHINE} == amiga || \
+${MACHINE} == dreamcast || \
+${MACHINE} == ews4800mips || \
+${MACHINE} == mac68k || \
+${MACHINE} == newsmips || \
+${MACHINE} == ofppc || \
+${MACHINE} == pmax || \
+${MACHINE} == sun3 || \
+${MACHINE} == x68k
X11FLAVOUR?= XFree86
.else
X11FLAVOUR?= Xorg
CVS commit: src/tests/fs/puffs
Module Name:src
Committed By: pooka
Date: Sat Jul 31 17:11:45 UTC 2010
Modified Files:
src/tests/fs/puffs: Makefile
Added Files:
src/tests/fs/puffs: t_fuzz.c
Log Message:
Fuzztest puffs mount. There are n different levels of testing:
each one pours more and more sane garbage into the args to that
the mount progresses further and further. Level 8 (at least when
writing this comment) should be the one where mounting actually
succeeds.
Our metric of success is crash / no crash.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/fs/puffs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/puffs/t_fuzz.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/puffs/Makefile
diff -u src/tests/fs/puffs/Makefile:1.10 src/tests/fs/puffs/Makefile:1.11
--- src/tests/fs/puffs/Makefile:1.10 Fri Jul 30 16:15:06 2010
+++ src/tests/fs/puffs/Makefile Sat Jul 31 17:11:45 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/07/30 16:15:06 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2010/07/31 17:11:45 pooka Exp $
#
.include bsd.own.mk
@@ -8,6 +8,7 @@
TESTSDIR= ${TESTSBASE}/fs/puffs
TESTS_C= t_basic
+TESTS_C+= t_fuzz
VFSTESTDIR != cd ${.CURDIR}/../common ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
Added files:
Index: src/tests/fs/puffs/t_fuzz.c
diff -u /dev/null src/tests/fs/puffs/t_fuzz.c:1.1
--- /dev/null Sat Jul 31 17:11:45 2010
+++ src/tests/fs/puffs/t_fuzz.c Sat Jul 31 17:11:45 2010
@@ -0,0 +1,279 @@
+/* $NetBSD: t_fuzz.c,v 1.1 2010/07/31 17:11:45 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2010 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.
+ */
+
+/*
+ * Fuzztest puffs mount. There are n different levels of testing:
+ * each one pours more and more sane garbage into the args to that
+ * the mount progresses further and further. Level 8 (at least when
+ * writing this comment) should be the one where mounting actually
+ * succeeds.
+ *
+ * Our metric of success is crash / no crash.
+ */
+
+#include sys/types.h
+#include sys/mount.h
+
+#include assert.h
+#include atf-c.h
+#include err.h
+#include errno.h
+#include fcntl.h
+#include pthread.h
+#include stdio.h
+#include unistd.h
+#include string.h
+#include stdlib.h
+
+#include fs/puffs/puffs_msgif.h
+
+#include rump/rump.h
+#include rump/rump_syscalls.h
+
+#include ../../h_macros.h
+
+#define ITERATIONS 100
+
+static void
+makegarbage(void *space, size_t len)
+{
+ long *sb = space;
+ long randval;
+
+ while (len = sizeof(long)) {
+ *sb++ = random();
+ len -= sizeof(long);
+ }
+ randval = random();
+ memcpy(sb, randval, len);
+}
+
+static void
+fixversion(struct puffs_kargs *kargs)
+{
+
+ kargs-pa_vers = PUFFSVERSION;
+}
+
+static void
+fixkflag(struct puffs_kargs *kargs)
+{
+
+ kargs-pa_flags = PUFFS_KFLAG_MASK;
+}
+
+static void
+fixfhflag(struct puffs_kargs *kargs)
+{
+
+ kargs-pa_fhflags = PUFFS_FHFLAG_MASK;
+}
+
+static void
+fixspare(struct puffs_kargs *kargs)
+{
+
+ memset(kargs-pa_spare, 0, sizeof(kargs-pa_spare));
+}
+
+static void
+fixhandsize(struct puffs_kargs *kargs)
+{
+
+ kargs-pa_fhsize %= PUFFS_FHSIZE_MAX+4;
+}
+
+static void
+fixhandsize2(struct puffs_kargs *kargs)
+{
+
+ /* XXX: values */
+ if (kargs-pa_fhflags PUFFS_FHFLAG_NFSV3)
+ kargs-pa_fhsize %= 60;
+ if (kargs-pa_fhflags PUFFS_FHFLAG_NFSV2)
+ kargs-pa_fhsize %= 28;
+}
+
+static void
+fixputter(struct puffs_kargs *kargs)
+{
+
+ kargs-pa_fd = rump_sys_open(/dev/putter, O_RDWR);
+ if (kargs-pa_fd == -1)
+ atf_tc_fail_errno(open putter);
+}
+
+static void
+fixroot(struct puffs_kargs *kargs)
+{
+
+ kargs-pa_root_vtype %= VBAD;
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Sat Jul 31 17:12:54 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: +tp To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 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.125 src/distrib/sets/lists/tests/mi:1.126 --- src/distrib/sets/lists/tests/mi:1.125 Sat Jul 31 10:42:22 2010 +++ src/distrib/sets/lists/tests/mi Sat Jul 31 17:12:53 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.125 2010/07/31 10:42:22 jmmv Exp $ +# $NetBSD: mi,v 1.126 2010/07/31 17:12:53 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -210,6 +210,7 @@ ./usr/libdata/debug/usr/tests/fs/puffs tests-fs-debug ./usr/libdata/debug/usr/tests/fs/puffs/h_have_puffs.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/fs/puffs/t_basic.debug tests-fs-debug debug,atf +./usr/libdata/debug/usr/tests/fs/puffs/t_fuzz.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/puffs/h_dtfstests-fs-debug ./usr/libdata/debug/usr/tests/fs/puffs/h_dtfs/h_dtfs.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/fs/tmpfs tests-fs-debug @@ -965,6 +966,7 @@ ./usr/tests/fs/puffstests-fs-tests ./usr/tests/fs/puffs/Atffile tests-fs-tests atf ./usr/tests/fs/puffs/t_basic tests-fs-tests atf +./usr/tests/fs/puffs/t_fuzz tests-fs-tests atf ./usr/tests/fs/puffs/h_dtfs tests-fs-tests ./usr/tests/fs/puffs/h_dtfs/h_dtfs tests-fs-tests atf ./usr/tests/fs/puffs/h_have_puffs tests-obsolete obsolete
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: joerg Date: Sat Jul 31 18:38:33 UTC 2010 Modified Files: src/sys/arch/amd64/amd64: machdep.c Log Message: Add machdep.fpu_present, machdep.sse and machdep.sse2 sysctls for compatibility with i386 and compat32. To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/sys/arch/amd64/amd64/machdep.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/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.146 src/sys/arch/amd64/amd64/machdep.c:1.147 --- src/sys/arch/amd64/amd64/machdep.c:1.146 Wed Jul 7 01:14:52 2010 +++ src/sys/arch/amd64/amd64/machdep.c Sat Jul 31 18:38:32 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.146 2010/07/07 01:14:52 chs Exp $ */ +/* $NetBSD: machdep.c,v 1.147 2010/07/31 18:38:32 joerg Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008 @@ -107,7 +107,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.146 2010/07/07 01:14:52 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.147 2010/07/31 18:38:32 joerg Exp $); /* #define XENDEBUG_LOW */ @@ -500,6 +500,21 @@ sysctl_machdep_diskinfo, 0, NULL, 0, CTL_MACHDEP, CPU_DISKINFO, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT | CTLFLAG_IMMEDIATE, + CTLTYPE_INT, fpu_present, NULL, + NULL, 1, NULL, 0, + CTL_MACHDEP, CPU_FPU_PRESENT, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT | CTLFLAG_IMMEDIATE, + CTLTYPE_INT, sse, NULL, + NULL, 1, NULL, 0, + CTL_MACHDEP, CPU_SSE, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT | CTLFLAG_IMMEDIATE, + CTLTYPE_INT, sse2, NULL, + NULL, 1, NULL, 0, + CTL_MACHDEP, CPU_SSE2, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, CTLTYPE_QUAD, tsc_freq, NULL, NULL, 0, tsc_freq, 0,
CVS commit: src/dist/pppd/pppd
Module Name:src Committed By: dholland Date: Sat Jul 31 21:21:17 UTC 2010 Modified Files: src/dist/pppd/pppd: ccp.h Log Message: Don't attempt to store bitmasks in a variable of type 'bool'. From Shuichiro URATA in PR 42390. Should be pulled up to -5. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/dist/pppd/pppd/ccp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/pppd/pppd/ccp.h diff -u src/dist/pppd/pppd/ccp.h:1.1.1.1 src/dist/pppd/pppd/ccp.h:1.2 --- src/dist/pppd/pppd/ccp.h:1.1.1.1 Sun Feb 20 10:28:37 2005 +++ src/dist/pppd/pppd/ccp.h Sat Jul 31 21:21:17 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ccp.h,v 1.1.1.1 2005/02/20 10:28:37 cube Exp $ */ +/* $NetBSD: ccp.h,v 1.2 2010/07/31 21:21:17 dholland Exp $ */ /* * ccp.h - Definitions for PPP Compression Control Protocol. @@ -39,7 +39,7 @@ bool predictor_2; /* do Predictor-2? */ bool deflate_correct; /* use correct code for deflate? */ bool deflate_draft; /* use draft RFC code for deflate? */ -bool mppe; /* do MPPE? */ +u_short mppe; /* do MPPE? */ u_short bsd_bits; /* # bits/code for BSD Compress */ u_short deflate_size; /* lg(window size) for Deflate */ short method; /* code for chosen compression method */
CVS commit: src/sys/dev/hpc
Module Name:src Committed By: tsutsui Date: Sun Aug 1 02:43:12 UTC 2010 Modified Files: src/sys/dev/hpc: hpcfb.c Log Message: Remove deprecated powerhook_establish(9) since apmdev(4) which required the old API was gone. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/dev/hpc/hpcfb.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/hpc/hpcfb.c diff -u src/sys/dev/hpc/hpcfb.c:1.56 src/sys/dev/hpc/hpcfb.c:1.57 --- src/sys/dev/hpc/hpcfb.c:1.56 Fri Jun 18 09:11:44 2010 +++ src/sys/dev/hpc/hpcfb.c Sun Aug 1 02:43:12 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: hpcfb.c,v 1.56 2010/06/18 09:11:44 tsutsui Exp $ */ +/* $NetBSD: hpcfb.c,v 1.57 2010/08/01 02:43:12 tsutsui Exp $ */ /*- * Copyright (c) 1999 @@ -43,7 +43,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: hpcfb.c,v 1.56 2010/06/18 09:11:44 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: hpcfb.c,v 1.57 2010/08/01 02:43:12 tsutsui Exp $); #ifdef _KERNEL_OPT #include opt_hpcfb.h @@ -156,7 +156,6 @@ struct hpcfb_devconfig *sc_dc; /* device configuration */ const struct hpcfb_accessops *sc_accessops; void *sc_accessctx; - void *sc_powerhook; /* power management hook */ device_t sc_wsdisplay; int sc_screen_resumed; int sc_polling; @@ -344,17 +343,6 @@ } #endif /* HPCFB_JUMP */ - /* - * apmdev(4) uses dopowerhooks(9), apm(4) uses pmf(9), and the - * two apm drivers are mutually exclusive. Register power - * hooks with both. - */ - sc-sc_powerhook = powerhook_establish(device_xname(sc-sc_dev), - hpcfb_power, sc); - if (sc-sc_powerhook == NULL) - aprint_error_dev(self, - WARNING: unable to establish power hook\n); - if (!pmf_device_register(self, hpcfb_suspend, hpcfb_resume)) aprint_error_dev(self, unable to establish power handler\n); }
CVS commit: src/sys/dev/hpc
Module Name:src
Committed By: tsutsui
Date: Sun Aug 1 02:47:43 UTC 2010
Modified Files:
src/sys/dev/hpc: bivideo.c
Log Message:
Replace powerhook_establish(9) with pmf(9).
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/hpc/bivideo.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/hpc/bivideo.c
diff -u src/sys/dev/hpc/bivideo.c:1.30 src/sys/dev/hpc/bivideo.c:1.31
--- src/sys/dev/hpc/bivideo.c:1.30 Tue May 12 14:22:39 2009
+++ src/sys/dev/hpc/bivideo.c Sun Aug 1 02:47:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bivideo.c,v 1.30 2009/05/12 14:22:39 cegger Exp $ */
+/* $NetBSD: bivideo.c,v 1.31 2010/08/01 02:47:43 tsutsui Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bivideo.c,v 1.30 2009/05/12 14:22:39 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: bivideo.c,v 1.31 2010/08/01 02:47:43 tsutsui Exp $);
#ifdef _KERNEL_OPT
#include opt_hpcfb.h
@@ -88,7 +88,6 @@
struct device sc_dev;
struct hpcfb_fbconf sc_fbconf;
struct hpcfb_dspconf sc_dspconf;
- void *sc_powerhook; /* power management hook */
int sc_powerstate;
#define PWRSTAT_SUSPEND (10)
#define PWRSTAT_VIDEOOFF (11)
@@ -110,6 +109,8 @@
static int bivideo_init(struct hpcfb_fbconf *);
static void bivideo_power(int, void *);
static void bivideo_update_powerstate(struct bivideo_softc *, int);
+static bool bivideo_suspend(device_t, const pmf_qual_t *);
+static bool bivideo_resume(device_t, const pmf_qual_t *);
void bivideo_init_backlight(struct bivideo_softc *, int);
void bivideo_init_brightness(struct bivideo_softc *, int);
void bivideo_init_contrast(struct bivideo_softc *, int);
@@ -178,10 +179,8 @@
/* Add a suspend hook to power saving */
sc-sc_powerstate = 0;
- sc-sc_powerhook = powerhook_establish(device_xname(sc-sc_dev),
- bivideo_power, sc);
- if (sc-sc_powerhook == NULL)
- aprint_error_dev(sc-sc_dev, WARNING: unable to establish power hook\n);
+ if (!pmf_device_register(self, bivideo_suspend, bivideo_resume))
+ aprint_error_dev(self, unable to establish power handler\n);
/* initialize backlight brightness and lcd contrast */
sc-sc_lcd_inited = 0;
@@ -372,6 +371,24 @@
(sc-sc_powerstate PWRSTAT_BACKLIGHT)));
}
+static bool
+bivideo_suspend(device_t self, const pmf_qual_t *qual)
+{
+ struct bivideo_softc *sc = device_private(self);
+
+ bivideo_power(PWR_SUSPEND, sc);
+ return true;
+}
+
+static bool
+bivideo_resume(device_t self, const pmf_qual_t *qual)
+{
+ struct bivideo_softc *sc = device_private(self);
+
+ bivideo_power(PWR_RESUME, sc);
+ return true;
+}
+
int
bivideo_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l)
{
CVS commit: src/etc/etc.hpcarm
Module Name:src Committed By: tsutsui Date: Sun Aug 1 03:59:03 UTC 2010 Modified Files: src/etc/etc.hpcarm: MAKEDEV.conf Log Message: Create audio device node for uaudio(4). To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/etc/etc.hpcarm/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.hpcarm/MAKEDEV.conf diff -u src/etc/etc.hpcarm/MAKEDEV.conf:1.9 src/etc/etc.hpcarm/MAKEDEV.conf:1.10 --- src/etc/etc.hpcarm/MAKEDEV.conf:1.9 Sat Apr 17 13:36:21 2010 +++ src/etc/etc.hpcarm/MAKEDEV.conf Sun Aug 1 03:59:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.9 2010/04/17 13:36:21 nonaka Exp $ +# $NetBSD: MAKEDEV.conf,v 1.10 2010/08/01 03:59:03 tsutsui Exp $ all_md) makedev wscons std_hpcarm fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 @@ -7,6 +7,7 @@ makedev ttyv0 ttyS0 makedev lpa0 lpt0 tun0 makedev usbs isdns + makedev audio makedev openfirm makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 makedev scsibus0 scsibus1 scsibus2 scsibus3
CVS commit: src/etc/etc.hpcarm
Module Name:src Committed By: tsutsui Date: Sun Aug 1 04:08:28 UTC 2010 Modified Files: src/etc/etc.hpcarm: MAKEDEV.conf Log Message: Remove unneccesary ttyv0 (pccons), isdns, and openfirm. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/etc/etc.hpcarm/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.hpcarm/MAKEDEV.conf diff -u src/etc/etc.hpcarm/MAKEDEV.conf:1.10 src/etc/etc.hpcarm/MAKEDEV.conf:1.11 --- src/etc/etc.hpcarm/MAKEDEV.conf:1.10 Sun Aug 1 03:59:03 2010 +++ src/etc/etc.hpcarm/MAKEDEV.conf Sun Aug 1 04:08:27 2010 @@ -1,14 +1,13 @@ -# $NetBSD: MAKEDEV.conf,v 1.10 2010/08/01 03:59:03 tsutsui Exp $ +# $NetBSD: MAKEDEV.conf,v 1.11 2010/08/01 04:08:27 tsutsui Exp $ all_md) makedev wscons std_hpcarm fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 makedev tty0 tty1 st0 st1 ch0 cd0 cd1 makedev uk0 uk1 ss0 - makedev ttyv0 ttyS0 + makedev ttyS0 makedev lpa0 lpt0 tun0 - makedev usbs isdns + makedev usbs makedev audio - makedev openfirm makedev music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 makedev scsibus0 scsibus1 scsibus2 scsibus3 makedev ses0 ses1 ses2 ses3 @@ -27,7 +26,7 @@ ramdisk|floppy) makedev std std_hpcarm fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 - makedev tty0 tty1 opty ttyv0 + makedev tty0 tty1 opty makedev st0 st1 cd0 cd1 makedev ld0 ;;
