Re: CVS commit: src/sys/net
On Sun, May 02, 2010 at 07:17:56PM +, Mihai Chelaru wrote: Committed By: kefren Date: Sun May 2 19:17:56 UTC 2010 Modified Files: src/sys/net: route.c rtsock.c Log Message: Permit the existence of a route with unlinked ifp and ifa, enabling this way the posibility to send a packet on an interface with source address from another interface. What is this about? Why is it necessary? Was it discussed somewhere? --chris
Re: CVS commit: src/sys/net
On 05/03/10 23:04, Christoph Badura wrote: On Sun, May 02, 2010 at 07:17:56PM +, Mihai Chelaru wrote: Committed By: kefren Date: Sun May 2 19:17:56 UTC 2010 Modified Files: src/sys/net: route.c rtsock.c Log Message: Permit the existence of a route with unlinked ifp and ifa, enabling this way the posibility to send a packet on an interface with source address from another interface. What is this about? Permits a route to be created using -ifa x.x.x.x -ifp if0 even if x.x.x.x is attached on a different interface. It's consistent with what route(5) states and doesn't ignore one of the parameters like until now. Why is it necessary? It's essential for my further work where I need to route packets to a pseudo-interface in order to encapsulate packets but without using that interface particular address. Was it discussed somewhere? Yes, but in private. I don't see it as a feature added but a bugfix so bringing it on tech-net@ was not necessary in my opinion. -- Mihai
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: jruoho Date: Mon May 3 06:11:38 UTC 2010 Modified Files: src/lib/libc/stdlib: alloca.3 Log Message: Note the problems with SSP. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/stdlib/alloca.3 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/stdlib/alloca.3 diff -u src/lib/libc/stdlib/alloca.3:1.12 src/lib/libc/stdlib/alloca.3:1.13 --- src/lib/libc/stdlib/alloca.3:1.12 Thu Aug 7 16:43:37 2003 +++ src/lib/libc/stdlib/alloca.3 Mon May 3 06:11:38 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: alloca.3,v 1.12 2003/08/07 16:43:37 agc Exp $ +.\ $NetBSD: alloca.3,v 1.13 2010/05/03 06:11:38 jruoho Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ from: @(#)alloca.3 8.1 (Berkeley) 6/4/93 .\ -.Dd August 11, 2002 +.Dd May 3, 2010 .Dt ALLOCA 3 .Os .Sh NAME @@ -63,12 +63,15 @@ .Xr getpagesize 3 , .Xr malloc 3 , .Xr realloc 3 -.Sh BUGS +.Sh CAVEATS +Few limitations can be mentioned: +.Bl -bullet +.It The .Fn alloca function is machine dependent; its use is discouraged. -.Pp +.It The .Fn alloca function is slightly unsafe because it cannot ensure that the pointer @@ -80,6 +83,15 @@ Avoid .Fn alloca with large unbounded allocations. +.It +Since +.Fn alloca +modifies the stack at runtime, +it causes problems to certain security features. +See +.Xr security 8 +for a discussion. +.El .\ .Sh HISTORY .\ The .\ .Fn alloca
CVS commit: src/sys/arch/hp700/conf
Module Name:src Committed By: skrll Date: Mon May 3 06:59:47 UTC 2010 Modified Files: src/sys/arch/hp700/conf: GENERIC Log Message: Add PCIVERBOSE To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/hp700/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/hp700/conf/GENERIC:1.96 src/sys/arch/hp700/conf/GENERIC:1.97 --- src/sys/arch/hp700/conf/GENERIC:1.96 Fri Apr 30 15:51:27 2010 +++ src/sys/arch/hp700/conf/GENERIC Mon May 3 06:59:47 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.96 2010/04/30 15:51:27 skrll Exp $ +# $NetBSD: GENERIC,v 1.97 2010/05/03 06:59:47 skrll Exp $ # # GENERIC machine description file # @@ -23,7 +23,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -#ident GENERIC-$Revision: 1.96 $ +#ident GENERIC-$Revision: 1.97 $ maxusers 32 # estimated number of users @@ -157,6 +157,7 @@ # These options enable verbose messages for several subsystems. # Warning, these may compile large string tables into the kernel! options GSCVERBOSE # verbose GSC device autoconfig messages +options PCIVERBOSE # verbose PCI device autoconfig messages options EISAVERBOSE # verbose EISA device autoconfig messages options MIIVERBOSE # verbose PHY autoconfig messages options SCSIVERBOSE # human readable SCSI error messages
CVS commit: src/etc/etc.hp700
Module Name:src Committed By: skrll Date: Mon May 3 07:11:25 UTC 2010 Modified Files: src/etc/etc.hp700: MAKEDEV.conf Log Message: Create tty0[0-3] devices. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/etc/etc.hp700/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.hp700/MAKEDEV.conf diff -u src/etc/etc.hp700/MAKEDEV.conf:1.4 src/etc/etc.hp700/MAKEDEV.conf:1.5 --- src/etc/etc.hp700/MAKEDEV.conf:1.4 Mon Jan 15 23:35:12 2007 +++ src/etc/etc.hp700/MAKEDEV.conf Mon May 3 07:11:25 2010 @@ -1,9 +1,10 @@ -# $NetBSD: MAKEDEV.conf,v 1.4 2007/01/15 23:35:12 hubertf Exp $ +# $NetBSD: MAKEDEV.conf,v 1.5 2010/05/03 07:11:25 skrll Exp $ all_md) makedev sd0 sd1 sd2 sd3 sd4 sd5 sd6 makedev cd0 cd1 st0 st1 st2 makedev scsibus0 scsibus1 scsibus2 scsibus3 makedev ses0 ses1 ses2 ses3 + makedev tty00 tty01 tty02 tty03 makedev audio ;;
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: jruoho Date: Mon May 3 08:11:57 UTC 2010 Modified Files: src/lib/libc/stdlib: jemalloc.3 malloc.3 Log Message: Move the '_malloc_options' variable from malloc(3) to jemalloc(3). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdlib/jemalloc.3 cvs rdiff -u -r1.36 -r1.37 src/lib/libc/stdlib/malloc.3 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/stdlib/jemalloc.3 diff -u src/lib/libc/stdlib/jemalloc.3:1.1 src/lib/libc/stdlib/jemalloc.3:1.2 --- src/lib/libc/stdlib/jemalloc.3:1.1 Mon May 3 05:01:53 2010 +++ src/lib/libc/stdlib/jemalloc.3 Mon May 3 08:11:57 2010 @@ -40,6 +40,10 @@ .Sh NAME .Nm jemalloc .Nd the default system allocator +.Sh LIBRARY +.Lb libc +.Sh SYNOPSIS +.Va _malloc_options ; .Sh DESCRIPTION The .Nm Index: src/lib/libc/stdlib/malloc.3 diff -u src/lib/libc/stdlib/malloc.3:1.36 src/lib/libc/stdlib/malloc.3:1.37 --- src/lib/libc/stdlib/malloc.3:1.36 Mon May 3 05:11:34 2010 +++ src/lib/libc/stdlib/malloc.3 Mon May 3 08:11:57 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: malloc.3,v 1.36 2010/05/03 05:11:34 jruoho Exp $ +.\ $NetBSD: malloc.3,v 1.37 2010/05/03 08:11:57 jruoho Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -53,7 +53,6 @@ .Ft void .Fn free void *ptr .Ft const char * -.Va _malloc_options ; .Sh DESCRIPTION The .Fn malloc
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: jruoho Date: Mon May 3 08:23:21 UTC 2010 Modified Files: src/lib/libc/stdlib: jemalloc.3 malloc.3 Log Message: Fix previous commit by also moving the type of _malloc_options. In addition, add a (commented) note that _malloc_message should be documented better. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/stdlib/jemalloc.3 cvs rdiff -u -r1.37 -r1.38 src/lib/libc/stdlib/malloc.3 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/stdlib/jemalloc.3 diff -u src/lib/libc/stdlib/jemalloc.3:1.2 src/lib/libc/stdlib/jemalloc.3:1.3 --- src/lib/libc/stdlib/jemalloc.3:1.2 Mon May 3 08:11:57 2010 +++ src/lib/libc/stdlib/jemalloc.3 Mon May 3 08:23:20 2010 @@ -43,6 +43,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS +.Ft const char * .Va _malloc_options ; .Sh DESCRIPTION The @@ -299,6 +300,10 @@ .Em A option is set, all warnings are treated as errors. .Pp +.\ +.\ XXX: The _malloc_message should be documented +.\ better in order to be worth mentioning. +.\ The .Va _malloc_message variable allows the programmer to override the function which emits Index: src/lib/libc/stdlib/malloc.3 diff -u src/lib/libc/stdlib/malloc.3:1.37 src/lib/libc/stdlib/malloc.3:1.38 --- src/lib/libc/stdlib/malloc.3:1.37 Mon May 3 08:11:57 2010 +++ src/lib/libc/stdlib/malloc.3 Mon May 3 08:23:20 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: malloc.3,v 1.37 2010/05/03 08:11:57 jruoho Exp $ +.\ $NetBSD: malloc.3,v 1.38 2010/05/03 08:23:20 jruoho Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -52,7 +52,6 @@ .Fn realloc void *ptr size_t size .Ft void .Fn free void *ptr -.Ft const char * .Sh DESCRIPTION The .Fn malloc
CVS commit: src
Module Name:src Committed By: skrll Date: Mon May 3 08:45:43 UTC 2010 Modified Files: src/etc/etc.hp700: MAKEDEV.conf src/sys/arch/hp700/conf: majors.hp700 Log Message: Allocate a major number for pci and created device nodes. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/etc/etc.hp700/MAKEDEV.conf cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hp700/conf/majors.hp700 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.hp700/MAKEDEV.conf diff -u src/etc/etc.hp700/MAKEDEV.conf:1.5 src/etc/etc.hp700/MAKEDEV.conf:1.6 --- src/etc/etc.hp700/MAKEDEV.conf:1.5 Mon May 3 07:11:25 2010 +++ src/etc/etc.hp700/MAKEDEV.conf Mon May 3 08:45:43 2010 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.5 2010/05/03 07:11:25 skrll Exp $ +# $NetBSD: MAKEDEV.conf,v 1.6 2010/05/03 08:45:43 skrll Exp $ all_md) makedev sd0 sd1 sd2 sd3 sd4 sd5 sd6 @@ -7,4 +7,5 @@ makedev ses0 ses1 ses2 ses3 makedev tty00 tty01 tty02 tty03 makedev audio + makedev pci0 pci1 pci2 pci3 ;; Index: src/sys/arch/hp700/conf/majors.hp700 diff -u src/sys/arch/hp700/conf/majors.hp700:1.24 src/sys/arch/hp700/conf/majors.hp700:1.25 --- src/sys/arch/hp700/conf/majors.hp700:1.24 Fri May 8 09:33:57 2009 +++ src/sys/arch/hp700/conf/majors.hp700 Mon May 3 08:45:43 2010 @@ -1,4 +1,4 @@ -# $NetBSD: majors.hp700,v 1.24 2009/05/08 09:33:57 skrll Exp $ +# $NetBSD: majors.hp700,v 1.25 2010/05/03 08:45:43 skrll Exp $ # # Device majors for hp700 # @@ -43,6 +43,7 @@ device-major clockctl char 39 clockctl device-major audio char 40 audio device-major ses char 41 ses +device-major pci char 42 pci device-major nsmb char 98 nsmb
CVS commit: src/external/cddl/osnet/dev/fbt
Module Name:src
Committed By: darran
Date: Mon May 3 09:28:38 UTC 2010
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
Log Message:
DTrace: print a warning no CTF section is found when processing arguments.
This should help diagnose problems such as netbsd images without CTF
sections and old boot loaders.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dev/fbt/fbt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.5 src/external/cddl/osnet/dev/fbt/fbt.c:1.6
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.5 Sat Mar 13 22:31:15 2010
+++ src/external/cddl/osnet/dev/fbt/fbt.c Mon May 3 09:28:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.5 2010/03/13 22:31:15 christos Exp $ */
+/* $NetBSD: fbt.c,v 1.6 2010/05/03 09:28:38 darran Exp $ */
/*
* CDDL HEADER START
@@ -1399,6 +1399,12 @@
/* Get a pointer to the CTF data and it's length. */
if (mod_ctf_get(ctl, mc) != 0) {
+ static int report=0;
+ if (report 1) {
+ report++;
+ printf(FBT: Error no CTF section found in module \%s\\n,
+ ctl-mod_info-mi_name);
+ }
/* No CTF data? Something wrong? *shrug* */
return;
}
CVS commit: src/sys/kern
Module Name:src
Committed By: darran
Date: Mon May 3 09:51:36 UTC 2010
Modified Files:
src/sys/kern: kern_ctf.c kern_ksyms.c
Log Message:
DTrace: Fix several bugs where the mod_ctf_get() function could return
success even though no CTF section was present in the kernel or module.
This fixes the panic that several people saw when trying out the FBT
provider without updating /boot or missing a CTF section in /netbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/kern_ctf.c
cvs rdiff -u -r1.58 -r1.59 src/sys/kern/kern_ksyms.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/kern/kern_ctf.c
diff -u src/sys/kern/kern_ctf.c:1.2 src/sys/kern/kern_ctf.c:1.3
--- src/sys/kern/kern_ctf.c:1.2 Sat Mar 13 01:41:14 2010
+++ src/sys/kern/kern_ctf.c Mon May 3 09:51:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ctf.c,v 1.2 2010/03/13 01:41:14 christos Exp $ */
+/* $NetBSD: kern_ctf.c,v 1.3 2010/05/03 09:51:36 darran Exp $ */
/*-
* Copyright (c) 2008 John Birrell j...@freebsd.org
* All rights reserved.
@@ -82,8 +82,9 @@
uint8_t *ctfaddr;
size_t ctfsize;
- if (mc == NULL)
+ if (mc == NULL) {
return EINVAL;
+ }
/* Set the defaults for no CTF present. That's not a crime! */
memset(mc, 0, sizeof(*mc));
@@ -116,8 +117,9 @@
mc-strcnt = 0; /* XXX TBD */
mc-nsym = st-sd_symsize / sizeof(Elf_Sym);
} else {
- if (kobj_find_section(mod-mod_kobj, .SUNW_ctf, (void **)ctfaddr, ctfsize))
+ if (kobj_find_section(mod-mod_kobj, .SUNW_ctf, (void **)ctfaddr, ctfsize)) {
return ENOENT;
+ }
mc-symtab = mod-mod_kobj-ko_symtab;
mc-strtab = mod-mod_kobj-ko_strtab;
@@ -126,17 +128,21 @@
}
if (ctfaddr == NULL) {
+ error = ENOENT;
goto out;
}
/* Check the CTF magic number. (XXX check for big endian!) */
if (ctfaddr[0] != 0xf1 || ctfaddr[1] != 0xcf) {
+ error = EINVAL;
goto out;
}
/* Check if version 2. */
- if (ctfaddr[2] != 2)
+ if (ctfaddr[2] != 2) {
+ error = EINVAL;
goto out;
+ }
/* Check if the data is compressed. */
if ((ctfaddr[3] 0x1) != 0) {
Index: src/sys/kern/kern_ksyms.c
diff -u src/sys/kern/kern_ksyms.c:1.58 src/sys/kern/kern_ksyms.c:1.59
--- src/sys/kern/kern_ksyms.c:1.58 Sun Mar 14 21:27:49 2010
+++ src/sys/kern/kern_ksyms.c Mon May 3 09:51:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ksyms.c,v 1.58 2010/03/14 21:27:49 darran Exp $ */
+/* $NetBSD: kern_ksyms.c,v 1.59 2010/05/03 09:51:36 darran Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_ksyms.c,v 1.58 2010/03/14 21:27:49 darran Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_ksyms.c,v 1.59 2010/05/03 09:51:36 darran Exp $);
#if defined(_KERNEL) defined(_KERNEL_OPT)
#include opt_ddb.h
@@ -473,6 +473,9 @@
char *shstr = (uint8_t*)start +
shdr[ehdr-e_shstrndx].sh_offset;
for (i = 1; i ehdr-e_shnum; i++) {
+#ifdef DEBUG
+ printf(ksyms: checking %s\n, shstr[shdr[i].sh_name]);
+#endif
if (shdr[i].sh_type != SHT_PROGBITS)
continue;
if (strncmp(.SUNW_ctf, shstr[shdr[i].sh_name] ,10) != 0)
@@ -486,6 +489,10 @@
#endif
break;
}
+#ifdef DEBUG
+ } else {
+ printf(ksyms: e_shstrndx == 0\n);
+#endif
}
#endif
CVS commit: src/sys/arch/hpcsh
Module Name:src
Committed By: tsutsui
Date: Mon May 3 12:16:04 UTC 2010
Modified Files:
src/sys/arch/hpcsh/conf: files.hpcsh
src/sys/arch/hpcsh/hpcsh: machdep.c
Log Message:
Sync kloader(4) behavior with hpcmips:
- use bootstr passed via reboot(2) with RB_STRING for the next kernel path
- prepare independent opt_kloader_kernel_path.h for KLOADER_KERNEL_PATH
- some cosmetics to reduce diffs from hpcmips
Tested on HPW-50PA (Hitachi PERSONA).
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/hpcsh/conf/files.hpcsh
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/hpcsh/hpcsh/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/hpcsh/conf/files.hpcsh
diff -u src/sys/arch/hpcsh/conf/files.hpcsh:1.51 src/sys/arch/hpcsh/conf/files.hpcsh:1.52
--- src/sys/arch/hpcsh/conf/files.hpcsh:1.51 Wed Feb 20 21:43:34 2008
+++ src/sys/arch/hpcsh/conf/files.hpcsh Mon May 3 12:16:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcsh,v 1.51 2008/02/20 21:43:34 drochner Exp $
+# $NetBSD: files.hpcsh,v 1.52 2010/05/03 12:16:04 tsutsui Exp $
#
maxpartitions 8
@@ -16,11 +16,11 @@
#file arch/hpcsh/hpcsh/bus_dma.c
file arch/hpcsh/hpcsh/clock_machdep.c
-defflag opt_kloader.hKLOADER
-defparam opt_kloader.hKLOADER_KERNEL_PATH
-defflag debug_kloader.hKLOADER_DEBUG
file dev/kloader.ckloader
file arch/hpcsh/hpcsh/kloader_machdep.c kloader
+defflag opt_kloader.hKLOADER
+defflag debug_kloader.hKLOADER_DEBUG
+defparam opt_kloader_kernel_path.h KLOADER_KERNEL_PATH
# power management
include dev/hpc/files.hpcapm
Index: src/sys/arch/hpcsh/hpcsh/machdep.c
diff -u src/sys/arch/hpcsh/hpcsh/machdep.c:1.72 src/sys/arch/hpcsh/hpcsh/machdep.c:1.73
--- src/sys/arch/hpcsh/hpcsh/machdep.c:1.72 Tue Mar 2 21:17:31 2010
+++ src/sys/arch/hpcsh/hpcsh/machdep.c Mon May 3 12:16:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.72 2010/03/02 21:17:31 pooka Exp $ */
+/* $NetBSD: machdep.c,v 1.73 2010/05/03 12:16:04 tsutsui Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.72 2010/03/02 21:17:31 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.73 2010/05/03 12:16:04 tsutsui Exp $);
#include opt_md.h
#include opt_ddb.h
@@ -38,11 +38,7 @@
#include hd64465if.h
#include opt_kloader.h
-#ifdef KLOADER
-#if !defined(KLOADER_KERNEL_PATH)
-#define KLOADER_KERNEL_PATH /netbsd
-#endif
-#endif
+#include opt_kloader_kernel_path.h
#include sys/param.h
#include sys/systm.h
@@ -169,6 +165,12 @@
void machine_startup(int, char *[], struct bootinfo *)
__attribute__((__noreturn__));
+#ifdef KLOADER
+#if !defined(KLOADER_KERNEL_PATH)
+#define KLOADER_KERNEL_PATH /netbsd
+#endif /* !KLOADER_KERNEL_PATH */
+static const char kernel_path[] = KLOADER_KERNEL_PATH;
+#endif /* KLOADER */
void
machine_startup(int argc, char *argv[], struct bootinfo *bi)
@@ -377,8 +379,12 @@
}
#ifdef KLOADER
- if ((howto RB_HALT) == 0)
- kloader_reboot_setup(KLOADER_KERNEL_PATH);
+ if ((howto RB_HALT) == 0) {
+ if ((howto RB_STRING) != 0)
+ kloader_reboot_setup(bootstr);
+ else
+ kloader_reboot_setup(kernel_path);
+ }
#endif
boothowto = howto;
@@ -411,14 +417,14 @@
pmf_system_shutdown(boothowto);
/* Finally, halt/reboot the system. */
+ if ((howto RB_HALT) != 0) {
+ printf(halted.\n);
+ } else {
#ifdef KLOADER
- if ((howto RB_HALT) == 0) {
kloader_reboot();
/* NOTREACHED */
- }
#endif
-
- printf(halted.\n);
+ }
#if NHD64465IF 0
hd64465_shutdown();
CVS commit: src/lib/libpam/modules
Module Name:src
Committed By: christos
Date: Mon May 3 12:58:09 UTC 2010
Modified Files:
src/lib/libpam/modules: mod.mk
Log Message:
make the dependency to libpam, explicit. Fixes afpd in pkgsrc. From Mark Davies
XXX: Should be pulled up to 4.x and 5.x.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libpam/modules/mod.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.7 src/lib/libpam/modules/mod.mk:1.8
--- src/lib/libpam/modules/mod.mk:1.7 Sun Dec 13 03:25:20 2009
+++ src/lib/libpam/modules/mod.mk Mon May 3 08:58:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.7 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: mod.mk,v 1.8 2010/05/03 12:58:09 christos Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -15,6 +15,8 @@
.endif
WARNS=3
+LIBDPLIBS+= pam ${.CURDIR}/../../libpam
+
.if ${MKPIC} != no
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
CVS commit: src/distrib
Module Name:src
Committed By: tsutsui
Date: Mon May 3 14:14:36 UTC 2010
Modified Files:
src/distrib/hpcsh/miniroot: Makefile.inc dot.profile list
src/distrib/utils/sysinst: Makefile
Added Files:
src/distrib/utils/sysinst/arch/hpcsh: Makefile md.c md.h menus.md.en
msg.md.en
Log Message:
Add sysinst(8) for hpcsh.
Mostly taken from hpcsmips, but no non-English translations.
Tested on HPW-50PA.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/hpcsh/miniroot/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/distrib/hpcsh/miniroot/dot.profile
cvs rdiff -u -r1.8 -r1.9 src/distrib/hpcsh/miniroot/list
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/utils/sysinst/arch/hpcsh/Makefile \
src/distrib/utils/sysinst/arch/hpcsh/md.c \
src/distrib/utils/sysinst/arch/hpcsh/md.h \
src/distrib/utils/sysinst/arch/hpcsh/menus.md.en \
src/distrib/utils/sysinst/arch/hpcsh/msg.md.en
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/hpcsh/miniroot/Makefile.inc
diff -u src/distrib/hpcsh/miniroot/Makefile.inc:1.5 src/distrib/hpcsh/miniroot/Makefile.inc:1.6
--- src/distrib/hpcsh/miniroot/Makefile.inc:1.5 Thu Feb 11 09:06:48 2010
+++ src/distrib/hpcsh/miniroot/Makefile.inc Mon May 3 14:14:35 2010
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.5 2010/02/11 09:06:48 roy Exp $
+# $NetBSD: Makefile.inc,v 1.6 2010/05/03 14:14:35 tsutsui Exp $
-DBG= -O
+WARNS= 1
+DBG= -Os
IMAGESIZE= 4m
MAKEFS_FLAGS= -o density=2k
IMAGEENDIAN= le
MAKEDEVTARGETS= all
-#LISTS+= ${DISTRIBDIR}/common/list.sysinst
+LISTS+= ${DISTRIBDIR}/common/list.sysinst.en
MTREECONF+= ${.CURDIR}/mtree.usr.install
-IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \
- ${DESTDIR}/.profile ${DESTDIR}/etc/spwd.db
+IMAGEDEPENDS+= ${ARCHDIR}/dot.profile
Index: src/distrib/hpcsh/miniroot/dot.profile
diff -u src/distrib/hpcsh/miniroot/dot.profile:1.3 src/distrib/hpcsh/miniroot/dot.profile:1.4
--- src/distrib/hpcsh/miniroot/dot.profile:1.3 Sat May 1 12:59:26 2010
+++ src/distrib/hpcsh/miniroot/dot.profile Mon May 3 14:14:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.3 2010/05/01 12:59:26 tsutsui Exp $
+# $NetBSD: dot.profile,v 1.4 2010/05/03 14:14:35 tsutsui Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -66,5 +66,5 @@
grep() sed -n /$1/p
# run the installation or upgrade script.
- # sysinst XXX
+ sysinst
fi
Index: src/distrib/hpcsh/miniroot/list
diff -u src/distrib/hpcsh/miniroot/list:1.8 src/distrib/hpcsh/miniroot/list:1.9
--- src/distrib/hpcsh/miniroot/list:1.8 Sat May 1 12:18:44 2010
+++ src/distrib/hpcsh/miniroot/list Mon May 3 14:14:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.8 2010/05/01 12:18:44 tsutsui Exp $
+# $NetBSD: list,v 1.9 2010/05/03 14:14:35 tsutsui Exp $
# extras in bin
#PROG bin/csh
@@ -26,12 +26,5 @@
# Minimize use of MFS
SYMLINK /tmp var/tmp
-# various files that we need in /etc for the install
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
-LINK etc/spwd.db etc/pwd.db
-
-# and the installation tools
+# files that we need the installation tools
COPY ${ARCHDIR}/dot.profile .profile
-
-# and a spare .profile
-COPY ${DESTDIR}/.profile tmp/.hdprofile
Index: src/distrib/utils/sysinst/Makefile
diff -u src/distrib/utils/sysinst/Makefile:1.14 src/distrib/utils/sysinst/Makefile:1.15
--- src/distrib/utils/sysinst/Makefile:1.14 Sat Dec 5 16:29:11 2009
+++ src/distrib/utils/sysinst/Makefile Mon May 3 14:14:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/12/05 16:29:11 pooka Exp $
+# $NetBSD: Makefile,v 1.15 2010/05/03 14:14:35 tsutsui Exp $
#
# sysinst is usually built when the crunched install binary is built,
# but can be built here as a normal program for testing.
@@ -25,6 +25,7 @@
SUBDIR += arch/hp700
SUBDIR += arch/hpcarm
SUBDIR += arch/hpcmips
+SUBDIR += arch/hpcsh
SUBDIR += arch/i386
SUBDIR += arch/landisk
SUBDIR += arch/mac68k
Added files:
Index: src/distrib/utils/sysinst/arch/hpcsh/Makefile
diff -u /dev/null src/distrib/utils/sysinst/arch/hpcsh/Makefile:1.1
--- /dev/null Mon May 3 14:14:36 2010
+++ src/distrib/utils/sysinst/arch/hpcsh/Makefile Mon May 3 14:14:35 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/05/03 14:14:35 tsutsui Exp $
+#
+# Makefile for hpcsh
+#
+
+MENUS_MD= menus.md.${SYSINSTLANG} menus.mbr
+MSG_MD= msg.md.${SYSINSTLANG} msg.mbr.${SYSINSTLANG}
+
+LANGUAGES= # no translations ready yet
+
+.include ../../Makefile.inc
Index: src/distrib/utils/sysinst/arch/hpcsh/md.c
diff -u /dev/null src/distrib/utils/sysinst/arch/hpcsh/md.c:1.1
--- /dev/null Mon May 3 14:14:36 2010
+++ src/distrib/utils/sysinst/arch/hpcsh/md.c Mon May 3 14:14:35 2010
@@ -0,0 +1,177 @@
+/* $NetBSD: md.c,v 1.1 2010/05/03 14:14:35 tsutsui Exp $ */
+
+/*
+ * Copyright 1997 Piermont Information Systems Inc.
+ * All rights reserved.
+ *
+ *
CVS commit: src/distrib/notes/hpcsh
Module Name:src Committed By: tsutsui Date: Mon May 3 14:39:04 UTC 2010 Modified Files: src/distrib/notes/hpcsh: install Log Message: Briefly note about hpcboot and pull notes/common/sysinst. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/notes/hpcsh/install Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/hpcsh/install diff -u src/distrib/notes/hpcsh/install:1.1 src/distrib/notes/hpcsh/install:1.2 --- src/distrib/notes/hpcsh/install:1.1 Sat Jun 15 21:31:38 2002 +++ src/distrib/notes/hpcsh/install Mon May 3 14:39:03 2010 @@ -1,3 +1,37 @@ -.\ $NetBSD: install,v 1.1 2002/06/15 21:31:38 itojun Exp $ +.\ $NetBSD: install,v 1.2 2010/05/03 14:39:03 tsutsui Exp $ . -Installation mechanism is yet to be provided. +To start installation, you have to put +.Dq Pa netbsd +kernel prepared in +.Pa installation +directory into some folder on +.Tn Windows CE +and boot it using bootloader +.Pq Pa hpcboot-sh3.exe No or Pa hpcboot-sh4.exe . +On +.Pa hpcboot +window, you have to specify a folder name your kernel is stored, +your kernel name, and your machine type. +You can also specify some options for debug. +.Pp +Once the installation kernel is loaded by +.Pa hpcboot +properly, +.Ic sysinst +will automatically start. +.Pp +The +.Nx*M +kernel and system install consume about 7 MB of memory. +Please configure the +.Tn Windows CE +memory setting to allow this amount of +memory to be used. +If bootloader failed with a +.Dq cannot allocate heap +error, configure more RAM for memory and less for disk with the dialog at +[Setting]-\*[Gt][ControlPanel]-\*[Gt][System]-\*[Gt][Memory] under +.Tn Windows CE . +.Pp +. +.so ../common/sysinst
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: tsutsui
Date: Mon May 3 15:08:52 UTC 2010
Modified Files:
src/distrib/notes/common: xfer
Log Message:
Remove MS-DOS floppy from Getting the NetBSD System on to Useful Media
section. The media is actually being dead especially for large binary sets.
XXX: too much more floppy words in INSTALL docs
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/distrib/notes/common/xfer
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/xfer
diff -u src/distrib/notes/common/xfer:1.66 src/distrib/notes/common/xfer:1.67
--- src/distrib/notes/common/xfer:1.66 Sat Apr 25 21:21:48 2009
+++ src/distrib/notes/common/xfer Mon May 3 15:08:52 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: xfer,v 1.66 2009/04/25 21:21:48 snj Exp $
+.\ $NetBSD: xfer,v 1.67 2010/05/03 15:08:52 tsutsui Exp $
.\
.\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -474,9 +474,6 @@
CD-ROM / DVD
.
.It
-.Tn MS-DOS No floppy
-.
-.It
FTP
.
.if \n[x68k] \{\
@@ -518,7 +515,7 @@
.Note)
.\}
.
-.(tag MS-DOS\ floppy
+.(tag CD-ROM\ /\ DVD
.
.if \n[amiga] \{\
.It Em AmigaDOS partition
@@ -565,73 +562,6 @@
.Pp
Proceed to the instructions on installation.
.
-.It Em MS-DOS floppy
-.Nx
-does not include split distribution sets for installation by floppy.
-However, they can be created on a separate machine using the
-.Xr split 1
-command, running e.g.
-.Ic split -b 235k base.tgz base.
-to split the
-.Pa base.tgz
-file from
-.Pa \*M/binary/sets
-into files named
-.Pa base.aa ,
-.Pa base.ab ,
-and so on.
-Repeat this for all
-.Pa set_name.tgz
-files, splitting them into
-.Pa set_name. Ns Ar xx
-files.
-Count the number of
-.Pa set_name. Ns Ar xx
-files that make up the
-distribution sets you want to install or upgrade.
-.ie \n[i386] \{\
-You will need one fifth that number of 1.2 MB floppies, or one sixth that
-number of 1.44 MB floppies.
-You should only use one size of floppy for the install or upgrade
-procedure; you can't use some 1.2 MB floppies and some 1.44 MB floppies.
-.\} \ \n[i386]
-.el \{\
-You will need one sixth that number of 1.44 MB floppies.
-.\} \ ! \n[i386]
-.Pp
-Format all of the floppies with
-.Tn MS-DOS .
-Do
-.Em not
-make any of them bootable
-.Tn MS-DOS
-floppies, i.e. don't use
-.Li format /s
-to format them.
-(If the floppies are bootable, then the
-.Tn MS-DOS
-system files that make them bootable will take up some space, and you
-won't be able to fit the distribution set parts on the disks.)
-If you're using floppies that are formatted for
-.Tn MS-DOS
-by their manufacturers, they probably aren't bootable, and you can use
-them out of the box.
-.Pp
-Place all of the
-.Pa set_name. Ns Ar xx
-files on the
-.Tn MS-DOS
-disks.
-.Pp
-Once you have the files on
-.Tn MS-DOS
-disks, you can proceed to the next step in the installation or upgrade process.
-If you're installing
-.Nx
-from scratch, go to the section on preparing your hard disk, below.
-If you're upgrading an existing installation, go directly to the
-section on upgrading.
-.
.It Em FTP
The preparations for this installation/upgrade method are
easy; all you need to do is make sure that there's an FTP
CVS commit: src/distrib/notes/common
Module Name:src Committed By: tsutsui Date: Mon May 3 15:14:24 UTC 2010 Modified Files: src/distrib/notes/common: xfer Log Message: Update IP addresses (both IPv4 and IPv6) of current ftp.NetBSD.org. XXX: is it still worth to note those numbers in INSTALL docs nowadays? To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/distrib/notes/common/xfer Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/xfer diff -u src/distrib/notes/common/xfer:1.67 src/distrib/notes/common/xfer:1.68 --- src/distrib/notes/common/xfer:1.67 Mon May 3 15:08:52 2010 +++ src/distrib/notes/common/xfer Mon May 3 15:14:24 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: xfer,v 1.67 2010/05/03 15:08:52 tsutsui Exp $ +.\ $NetBSD: xfer,v 1.68 2010/05/03 15:14:24 tsutsui Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -585,10 +585,10 @@ installation, the IPv4 address of .Sy ftp.NetBSD.org is -.Li 204.152.190.13 +.Li 204.152.190.15 and the IPv6 address is -.Li 2001:4f8:3:7:230:48ff:fe31:43f2 -(as of April, 2009). +.Li 2001:4f8:3:7:230:48ff:fec6:9aaa:21 +(as of May, 2010). .Pp Once you have this information, you can proceed to the next step in the installation or upgrade process.
CVS commit: src/distrib/notes/common
Module Name:src
Committed By: tsutsui
Date: Mon May 3 16:15:06 UTC 2010
Modified Files:
src/distrib/notes/common: main
Log Message:
- remove resigned developers
- remove other contributors in the time of 386BSD
XXX: probably we should simply refer htdocs/people/developers.html
XXX: rather than maintaining two independent lists
To generate a diff of this commit:
cvs rdiff -u -r1.462 -r1.463 src/distrib/notes/common/main
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.462 src/distrib/notes/common/main:1.463
--- src/distrib/notes/common/main:1.462 Fri Apr 2 21:52:55 2010
+++ src/distrib/notes/common/main Mon May 3 16:15:05 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.462 2010/04/02 21:52:55 spz Exp $
+.\ $NetBSD: main,v 1.463 2010/05/03 16:15:05 tsutsui Exp $
.\
.\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -1096,23 +1096,18 @@
.It Ta Robert V. Baron Ta Mt r...@netbsd.org
.It Ta Alan Barrett Ta Mt a...@netbsd.org
.It Ta Grant Beattie Ta Mt gr...@netbsd.org
-.It Ta Jason Beegan Ta Mt j...@netbsd.org
.It Ta Erik Berls Ta Mt cy...@netbsd.org
.It Ta Hiroyuki Bessho Ta Mt b...@netbsd.org
.It Ta John Birrell Ta Mt j...@netbsd.org
-.It Ta Mason Loring Bliss Ta Mt ma...@netbsd.org
-.It Ta Charles Blundell Ta Mt c...@netbsd.org
.It Ta Rafal Boni Ta Mt ra...@netbsd.org
.It Ta Stephen Borrill Ta Mt sborr...@netbsd.org
.It Ta Sean Boudreau Ta Mt se...@netbsd.org
.It Ta Manuel Bouyer Ta Mt bou...@netbsd.org
-.It Ta John Brezak Ta Mt bre...@netbsd.org
.It Ta Allen Briggs Ta Mt bri...@netbsd.org
.It Ta Mark Brinicombe Ta Mt m...@netbsd.org
.It Ta Aaron Brown Ta Mt abr...@netbsd.org
.It Ta Andrew Brown Ta Mt ata...@netbsd.org
.It Ta David Brownlee Ta Mt a...@netbsd.org
-.It Ta Frederick Bruckman Ta Mt fr...@netbsd.org
.It Ta Jon Buller Ta Mt j...@netbsd.org
.It Ta Simon Burge Ta Mt sim...@netbsd.org
.It Ta Robert Byrnes Ta Mt byr...@netbsd.org
@@ -1124,13 +1119,10 @@
.It Ta Mihai Chelaru Ta Mt kef...@netbsd.org
.It Ta Bill Coldwell Ta Mt bi...@netbsd.org
.It Ta Julian Coleman Ta Mt j...@netbsd.org
-.It Ta Ben Collver Ta Mt b...@netbsd.org
.It Ta Marcus Comstedt Ta Mt mar...@netbsd.org
.It Ta Jeremy Cooper Ta Mt jer...@netbsd.org
.It Ta Chuck Cranor Ta Mt ch...@netbsd.org
.It Ta Alistair Crooks Ta Mt a...@netbsd.org
-.It Ta Aidan Cully Ta Mt ai...@netbsd.org
-.It Ta Garrett D'Amore Ta Mt gdam...@netbsd.org
.It Ta Johan Danielsson Ta Mt j...@netbsd.org
.It Ta John Darrow Ta Mt jdar...@netbsd.org
.It Ta Jed Davis Ta Mt j...@netbsd.org
@@ -1174,7 +1166,6 @@
.It Ta Oliver V. Gould Ta Mt v...@netbsd.org
.It Ta Paul Goyette Ta Mt pgoye...@netbsd.org
.It Ta Michael Graff Ta Mt explo...@netbsd.org
-.It Ta Brian C. Grayson Ta Mt bgray...@netbsd.org
.It Ta Matthew Green Ta Mt m...@netbsd.org
.It Ta Andreas Gustafsson Ta Mt g...@netbsd.org
.It Ta Ulrich Habel Ta Mt rh...@netbsd.org
@@ -1185,11 +1176,9 @@
.It Ta Charles M. Hannum Ta Mt mycr...@netbsd.org
.It Ta Yorick Hardy Ta Mt yha...@netbsd.org
.It Ta Ben Harris Ta Mt bj...@netbsd.org
-.It Ta Ross Harvey Ta Mt r...@netbsd.org
.It Ta Eric Haszlakiewicz Ta Mt e...@netbsd.org
.It Ta John Hawkinson Ta Mt jh...@netbsd.org
.It Ta Emile Heitor Ta Mt i...@netbsd.org
-.It Ta HAYAKAWA Koichi Ta Mt h...@netbsd.org
.It Ta John Heasley Ta Mt h...@netbsd.org
.It Ta Geert Hendrickx Ta Mt g...@netbsd.org
.It Ta Ren\('e Hexel Ta Mt r...@netbsd.org
@@ -1220,29 +1209,20 @@
.It Ta Lonhyn T. Jasinskyj Ta Mt lon...@netbsd.org
.It Ta Darrin Jewell Ta Mt d...@netbsd.org
.It Ta Nicolas Joly Ta Mt nj...@netbsd.org
-.It Ta Chris Jones Ta Mt cjo...@netbsd.org
.It Ta S\(/oren J\(/orvang Ta Mt so...@netbsd.org
.It Ta Takahiro Kambe Ta Mt t...@netbsd.org
-.It Ta Masanori Kanaoka Ta Mt kana...@netbsd.org
.It Ta Antti Kantee Ta Mt po...@netbsd.org
.It Ta Frank Kardel Ta Mt kar...@netbsd.org
-.It Ta Mattias Karlsson Ta Mt kei...@netbsd.org
.It Ta KAWAMOTO Yosihisa Ta Mt kawam...@netbsd.org
-.It Ta Mario Kemper Ta Mt mag...@netbsd.org
.It Ta Min Sik Kim Ta Mt mins...@netbsd.org
.It Ta Thomas Klausner Ta Mt w...@netbsd.org
.It Ta Klaus Klein Ta Mt kle...@netbsd.org
.It Ta John Klos Ta Mt jk...@netbsd.org
.It Ta Wayne Knowles Ta Mt w...@netbsd.org
.It Ta Takayoshi Kochi Ta Mt ko...@netbsd.org
-.It Ta John Kohl Ta Mt j...@netbsd.org
-.It Ta Daniel de Kok Ta Mt dan...@netbsd.org
.It Ta Jonathan A. Kollasch Ta Mt jakll...@netbsd.org
-.It Ta Paul Kranenburg Ta Mt p...@netbsd.org
-.It Ta Lubomir Kundrak Ta Mt lkund...@netbsd.org
.It Ta Jochen Kunz Ta Mt jk...@netbsd.org
.It Ta Martti Kuparinen Ta Mt mar...@netbsd.org
-.It Ta Kentaro A. Kurahone Ta Mt kurah...@netbsd.org
.It Ta Arnaud Lacombe Ta Mt a...@netbsd.org
.It Ta Kevin Lahey Ta Mt k...@netbsd.org
.It Ta David Laight Ta Mt d...@netbsd.org
@@ -1261,7 +1241,6 @@
.It Ta Tomasz
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Mon May 3 16:20:24 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Fix indent for www changes page. To generate a diff of this commit: cvs rdiff -u -r1.1385 -r1.1386 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.1385 src/doc/CHANGES:1.1386 --- src/doc/CHANGES:1.1385 Thu Apr 29 20:13:46 2010 +++ src/doc/CHANGES Mon May 3 16:20:24 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1385 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1386 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -581,7 +581,7 @@ agp(4): Add support for the Intel 82855GM AGP port. [jakllsch 20100404] sdmmc(4): Add support for SD 4bit bus width. [nonaka 20100406] evbsh3: Add support for Alpha Project MS104-SH4, TAC T-SH7706LAN Rev.3 - and TAC T-SH7706LSR Rev.1. [nonaka 20100407] + and TAC T-SH7706LSR Rev.1. [nonaka 20100407] acpi(4): Updated ACPICA to 20100121. [jruoho 20100408] fss(4): Add snapshot support for MSDOS file systems. [hannken 20100409] fsck_msdos(8): add -x option which allows to run fsck_msdos -n on
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Mon May 3 16:21:03 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note about sysinst(8) for hpcsh. To generate a diff of this commit: cvs rdiff -u -r1.1386 -r1.1387 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.1386 src/doc/CHANGES:1.1387 --- src/doc/CHANGES:1.1386 Mon May 3 16:20:24 2010 +++ src/doc/CHANGES Mon May 3 16:21:03 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1386 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1387 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -602,3 +602,4 @@ tftpd(8): Add -c so files can be uploaded without requiring them to be created before the upload. See the section on security considerations before enabling. [hubertf 20100429] + hpcsh: Add sysinst(8) support. [tsutsui 20100503]
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Mon May 3 16:32:32 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Add man page suffix to some entries. To generate a diff of this commit: cvs rdiff -u -r1.1387 -r1.1388 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.1387 src/doc/CHANGES:1.1388 --- src/doc/CHANGES:1.1387 Mon May 3 16:21:03 2010 +++ src/doc/CHANGES Mon May 3 16:32:32 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1387 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1388 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -86,7 +86,7 @@ x68k: pow(4) switches to use MI powerd(8) [isaki 20081220] viaide(4): Add VT8237S Integrated SATA Controller support. [nonaka 20081221] - lvm: Add LVM functionality to NetBSD; this is done by dm(4) driver + lvm(8): Add LVM functionality to NetBSD; this is done by dm(4) driver in kernel and lvm2 tools made by RedHat. We use the same well known interface as Linux does for managing LVM. [haad 20081222] gcscaudio(4): Add AMD Geode CS5536 audio driver, from SHIMIZU Ryo. @@ -155,7 +155,7 @@ consoles using VESA BIOS extensions. These changes allow the x86 ports to work with the genfb(4) driver, and obsoletes the i386-only vesafb(4) driver. [jmcneill 20090216] - lvm: Import new lvm2tools 2.02.44 version and libdevmapper 1.02.30. + lvm(8): Import new lvm2tools 2.02.44 version and libdevmapper 1.02.30. [haad 20090218] compat_linux(8), compat_linux32: Add IPC_64 support for all shmctl(2) commands, not only for STAT/SET. [njoly 20090218] @@ -497,7 +497,7 @@ udl(4): Add a driver for DisplayLink DL-1x0/1x5 based USB LCDs and USB-VGA adaptors. Ported from OpenBSD by FUKAUMI Naoki with many modification. [tsutsui 20091130] - lvm: Import new lvm2tools 2.02.56 version and libdevmapper 1.02.40. + lvm(8): Import new lvm2tools 2.02.56 version and libdevmapper 1.02.40. [haad 20091202] resolvconf(8): Import openreslv-3.3.4. [roy 20091204] playstation2: Port deleted. [pooka 20091205] @@ -508,7 +508,7 @@ ICMP replies to the broadcast address. [christos 20091207] ntp: Import ntp-4-2-4p8. [kardel 20091208] zaurus: Add support Xorg. [nonaka 20091213] - sysinst: Make SHA1 the default option for cyphers. [ahoka 20091216] + sysinst(8): Make SHA1 the default option for cyphers. [ahoka 20091216] atf(7): Import 0.7. [jmmv 20091222] dhcpcd(8): Import dhcpcd-5.1.4. [roy 20091223] bind: Update to 9.7.0-rc1. [christos 20091226]
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Mon May 3 16:36:26 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Use tcx(4) and zx(4) (which is in share/man/man4/man4.sparc) rather than suntcx(4) and sunleo(4). To generate a diff of this commit: cvs rdiff -u -r1.1388 -r1.1389 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.1388 src/doc/CHANGES:1.1389 --- src/doc/CHANGES:1.1388 Mon May 3 16:32:32 2010 +++ src/doc/CHANGES Mon May 3 16:36:26 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1388 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1389 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -396,14 +396,14 @@ [jmcneill 20090818] amd64, i386: Suspend and resume is now supported when using the genfb(4) display driver. [jmcneill 20090823] - suntcx(4): imported the xf86-video-suntcx driver and added hardware + tcx(4): imported the xf86-video-suntcx driver and added hardware acceleration [macallan 20090827] postfix(1): Import version 2.6.5 [tron 20090831] unzip(1): A libarchive-based unzip frontend, emulating most of infozip's command line. [joerg 20090903] rumpcrypto: Add rump component for kernel crypto routines. [pooka 20090903] - sunleo(4): imported the xf86-video-sunleo 1.2.0 driver from Xorg + zx(4): imported the xf86-video-sunleo 1.2.0 driver from Xorg [macallan 20090905] hdaudio(4): New standards-compliant Intel High Definition Audio driver written to replace azalia(4). [sborrill 20090906]
CVS commit: src/etc
Module Name:src
Committed By: hubertf
Date: Mon May 3 17:15:58 UTC 2010
Modified Files:
src/etc: shrc
Log Message:
Add RCS ID, per PR 43243
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/etc/shrc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/shrc
diff -u src/etc/shrc:1.5 src/etc/shrc:1.6
--- src/etc/shrc:1.5 Sat Feb 14 09:53:07 2009
+++ src/etc/shrc Mon May 3 17:15:58 2010
@@ -1,3 +1,7 @@
+# $NetBSD: shrc,v 1.6 2010/05/03 17:15:58 hubertf Exp $
+#
+# System-wide .shrc file for sh(1).
+
ll(){ ls -l ${1+$@}; }
case $- in *i*)
CVS commit: src/sys/dev/dec
Module Name:src Committed By: mhitch Date: Mon May 3 18:04:56 UTC 2010 Modified Files: src/sys/dev/dec: mcclock.c Log Message: Fix error introduced with timecounters - RTC clock register only uses the last 2 digits of the year. Fixes setting the clock and keeps the DECstation PROM happy and stops it from setting the date to Jan 1, 1972. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dec/mcclock.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/dec/mcclock.c diff -u src/sys/dev/dec/mcclock.c:1.24 src/sys/dev/dec/mcclock.c:1.25 --- src/sys/dev/dec/mcclock.c:1.24 Sat Dec 12 14:44:10 2009 +++ src/sys/dev/dec/mcclock.c Mon May 3 18:04:56 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock.c,v 1.24 2009/12/12 14:44:10 tsutsui Exp $ */ +/* $NetBSD: mcclock.c,v 1.25 2010/05/03 18:04:56 mhitch Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mcclock.c,v 1.24 2009/12/12 14:44:10 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: mcclock.c,v 1.25 2010/05/03 18:04:56 mhitch Exp $); #include sys/param.h #include sys/kernel.h @@ -232,7 +232,7 @@ regs[MC_DOW] = dt.dt_wday; regs[MC_DOM] = dt.dt_day; regs[MC_MONTH] = dt.dt_mon; - regs[MC_YEAR] = dt.dt_year; + regs[MC_YEAR] = dt.dt_year - 1900; /* rt clock wants 2 digits */ s = splclock(); MC146818_PUTTOD(sc, regs);
CVS commit: src/sys/arch/sandpoint/stand/netboot
Module Name:src
Committed By: phx
Date: Mon May 3 18:55:09 UTC 2010
Modified Files:
src/sys/arch/sandpoint/stand/netboot: skg.c
Log Message:
Fixed descriptor size (noticed by nisimura).
Using two TX descriptors. Might be better, although libsa seems to work with
one.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sandpoint/stand/netboot/skg.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/sandpoint/stand/netboot/skg.c
diff -u src/sys/arch/sandpoint/stand/netboot/skg.c:1.1 src/sys/arch/sandpoint/stand/netboot/skg.c:1.2
--- src/sys/arch/sandpoint/stand/netboot/skg.c:1.1 Sun May 2 13:31:14 2010
+++ src/sys/arch/sandpoint/stand/netboot/skg.c Mon May 3 18:55:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: skg.c,v 1.1 2010/05/02 13:31:14 phx Exp $ */
+/* $NetBSD: skg.c,v 1.2 2010/05/03 18:55:09 phx Exp $ */
/*-
* Copyright (c) 2010 Frank Wille.
@@ -58,7 +58,7 @@
struct desc {
uint32_t xd0, xd1, xd2, xd3, xd4;
- uint32_t rsrvd[5];
+ uint32_t rsrvd[3];
};
#define CTL_LS 0x2000
#define CTL_FS 0x4000
@@ -174,10 +174,10 @@
#define FRAMESIZE 1536
struct local {
- struct desc txd;
+ struct desc txd[2];
struct desc rxd[2];
uint8_t rxstore[2][FRAMESIZE];
- unsigned csr, rx, phy;
+ unsigned csr, rx, tx, phy;
uint16_t pssr, anlpar;
};
@@ -208,7 +208,7 @@
unsigned i;
uint16_t reg;
- l = ALLOC(struct local, 64); /* desc alignment */
+ l = ALLOC(struct local, 32); /* desc alignment */
memset(l, 0, sizeof(struct local));
l-csr = DEVTOV(pcicfgread(tag, 0x10)); /* use mem space */
@@ -288,14 +288,15 @@
/* setup descriptors and BMU */
CSR_WRITE_1(l, SK_TXAR1_COUNTERCTL, TXARCTL_ON|TXARCTL_FSYNC_ON);
- txd = l-txd;
- txd-xd1 = htole32(VTOPHYS(txd));
+ txd = l-txd[0];
+ txd[0].xd1 = htole32(VTOPHYS(txd[1]));
+ txd[1].xd1 = htole32(VTOPHYS(txd[0]));
rxd = l-rxd[0];
rxd[0].xd0 = htole32(FRAMESIZE|CTL_DEFOPC|CTL_LS|CTL_FS|CTL_OWN);
- rxd[0].xd1 = htole32(rxd[1]);
+ rxd[0].xd1 = htole32(VTOPHYS(rxd[1]));
rxd[0].xd2 = htole32(VTOPHYS(l-rxstore[0]));
rxd[1].xd0 = htole32(FRAMESIZE|CTL_DEFOPC|CTL_LS|CTL_FS|CTL_OWN);
- rxd[1].xd1 = htole32(rxd[0]);
+ rxd[1].xd1 = htole32(VTOPHYS(rxd[0]));
rxd[1].xd2 = htole32(VTOPHYS(l-rxstore[1]));
wbinv(l, sizeof(struct local));
@@ -332,7 +333,7 @@
unsigned loop;
wbinv(buf, len);
- txd = l-txd;
+ txd = l-txd[l-tx];
txd-xd2 = htole32(VTOPHYS(buf));
txd-xd0 = htole32((len FRAMEMASK)|CTL_DEFOPC|CTL_FS|CTL_LS|CTL_OWN);
wbinv(txd, sizeof(struct desc));
@@ -347,6 +348,7 @@
printf(xmit failed\n);
return -1;
done:
+ l-tx ^= 1;
return len;
}
CVS commit: src/lib/libpam
Module Name:src
Committed By: christos
Date: Mon May 3 22:12:33 UTC 2010
Modified Files:
src/lib/libpam: Makefile
src/lib/libpam/modules: mod.mk
Added Files:
src/lib/libpam/staticmodules: Makefile
Log Message:
Build the modules in two phases:
1. build the static modules first, before libpam so that the static
libpam can link against the module .a files.
2. build the modules after the dynamic libpam is build, so that the
dynamic modules can link against the dynamic libpam.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libpam/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libpam/modules/mod.mk
cvs rdiff -u -r0 -r1.1 src/lib/libpam/staticmodules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/Makefile
diff -u src/lib/libpam/Makefile:1.2 src/lib/libpam/Makefile:1.3
--- src/lib/libpam/Makefile:1.2 Sun Dec 12 03:18:42 2004
+++ src/lib/libpam/Makefile Mon May 3 18:12:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/12 08:18:42 christos Exp $
+# $NetBSD: Makefile,v 1.3 2010/05/03 22:12:32 christos Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -27,6 +27,6 @@
# The modules must be built first, because they are built into the
# static version of libpam.
-SUBDIR= modules .WAIT libpam
+SUBDIR= staticmodules .WAIT libpam .WAIT modules
.include bsd.subdir.mk
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.8 src/lib/libpam/modules/mod.mk:1.9
--- src/lib/libpam/modules/mod.mk:1.8 Mon May 3 08:58:09 2010
+++ src/lib/libpam/modules/mod.mk Mon May 3 18:12:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.8 2010/05/03 12:58:09 christos Exp $
+# $NetBSD: mod.mk,v 1.9 2010/05/03 22:12:32 christos Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -15,9 +15,8 @@
.endif
WARNS=3
-LIBDPLIBS+= pam ${.CURDIR}/../../libpam
-
.if ${MKPIC} != no
+LIBDPLIBS+= pam ${.CURDIR}/../../libpam
.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
Added files:
Index: src/lib/libpam/staticmodules/Makefile
diff -u /dev/null src/lib/libpam/staticmodules/Makefile:1.1
--- /dev/null Mon May 3 18:12:33 2010
+++ src/lib/libpam/staticmodules/Makefile Mon May 3 18:12:32 2010
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2010/05/03 22:12:32 christos Exp $
+
+MAKEDIRTARGETENV=MKPIC=no
+.include bsd.own.mk
+
+SUBDIR=${.CURDIR}/../modules
+
+.include bsd.subdir.mk
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: martin
Date: Mon May 3 23:04:12 UTC 2010
Modified Files:
src/distrib/utils/sysinst: label.c
Log Message:
Prevent a -ve int - uint32 underflow, noticed by joerg.
If a partition ends up 0-sized, set it to FS_UNUSED to avoid later warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/utils/sysinst/label.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/label.c
diff -u src/distrib/utils/sysinst/label.c:1.54 src/distrib/utils/sysinst/label.c:1.55
--- src/distrib/utils/sysinst/label.c:1.54 Sat Jan 2 21:16:46 2010
+++ src/distrib/utils/sysinst/label.c Mon May 3 23:04:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.54 2010/01/02 21:16:46 dsl Exp $ */
+/* $NetBSD: label.c,v 1.55 2010/05/03 23:04:12 martin Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: label.c,v 1.54 2010/01/02 21:16:46 dsl Exp $);
+__RCSID($NetBSD: label.c,v 1.55 2010/05/03 23:04:12 martin Exp $);
#endif
#include sys/types.h
@@ -195,6 +195,10 @@
if (size == ~0u)
size = dlsize - p-pi_offset;
p-pi_size = size;
+ if (size == 0) {
+ p-pi_offset = 0;
+ p-pi_fstype = FS_UNUSED;
+ }
return 0;
}
@@ -880,6 +884,8 @@
NULL, isize, 1,
(partend - partstart) / sizemult, multname);
}
+ if (partend partstart)
+ return 0;
return (partend - partstart);
}
/* NOTREACHED */
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: agc
Date: Tue May 4 00:02:46 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: verify.c
Log Message:
Make this compile with gcc 4.5 - patch from Juan RP in PR pkg/43244
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c:1.9 Wed Apr 14 06:31:23 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c Tue May 4 00:02:46 2010
@@ -55,7 +55,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: verify.c,v 1.9 2010/04/14 06:31:23 agc Exp $);
+__RCSID($NetBSD: verify.c,v 1.10 2010/05/04 00:02:46 agc Exp $);
#endif
#include sys/types.h
@@ -569,6 +569,7 @@
* \see RFC4880 9.1
*/
typedef enum {
+ OPS_PKA_NONE = 0, /* null value */
OPS_PKA_RSA = 1, /* RSA (Encrypt or Sign) */
OPS_PKA_RSA_ENCRYPT_ONLY = 2, /* RSA Encrypt-Only (deprecated -
* \see RFC4880 13.5) */
@@ -5550,7 +5551,7 @@
free_BN(p-key.elgamal.y);
break;
- case 0:
+ case OPS_PKA_NONE:
/* nothing to free */
break;
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: macallan
Date: Tue May 4 04:53:59 UTC 2010
Modified Files:
src/sys/dev/wsfont: wsfont.c wsfont.h
Log Message:
add translation tables for ISO fonts in order to map unicode box drawing
characters to something else than whitespaces
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/wsfont/wsfont.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/wsfont/wsfont.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.46 src/sys/dev/wsfont/wsfont.c:1.47
--- src/sys/dev/wsfont/wsfont.c:1.46 Sat Apr 17 13:36:22 2010
+++ src/sys/dev/wsfont/wsfont.c Tue May 4 04:53:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.46 2010/04/17 13:36:22 nonaka Exp $ */
+/* $NetBSD: wsfont.c,v 1.47 2010/05/04 04:53:59 macallan Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wsfont.c,v 1.46 2010/04/17 13:36:22 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: wsfont.c,v 1.47 2010/05/04 04:53:59 macallan Exp $);
#include opt_wsfont.h
@@ -187,6 +187,9 @@
#ifdef FONT_OMRON12x20
{ { NULL, NULL }, omron12x20, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
+#ifdef FONT_TERMINUS8x16
+ { { NULL, NULL }, terminus8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
{ { NULL, NULL }, NULL, 0, 0, 0 },
};
@@ -835,6 +838,39 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 181
};
+/*
+ * map all variants of the box drawing characters to the same basic shapes for
+ * now, encoded like this:
+ *
+ *1
+ *1
+ * 888 222
+ *4
+ *4
+ *
+ * so an upright line would be 0x05
+ */
+#define FL |WSFONT_FLAG_OPT
+static const u_int32_t netbsd_boxes[] = {
+/*00*/ 0x0a FL, 0x0a FL, 0x05 FL, 0x05 FL, 0x0a FL, 0x0a FL, 0x05 FL, 0x05 FL,
+/*08*/ 0x0a FL, 0x0a FL, 0x05 FL, 0x05 FL, 0x06 FL, 0x06 FL, 0x06 FL, 0x06 FL,
+/*10*/ 0x0c FL, 0x0c FL, 0x0c FL, 0x0c FL, 0x03 FL, 0x03 FL, 0x03 FL, 0x03 FL,
+/*18*/ 0x09 FL, 0x09 FL, 0x09 FL, 0x09 FL, 0x07 FL, 0x07 FL, 0x07 FL, 0x07 FL,
+/*20*/ 0x07 FL, 0x07 FL, 0x07 FL, 0x07 FL, 0x0d FL, 0x0d FL, 0x0d FL, 0x0d FL,
+/*28*/ 0x0d FL, 0x0d FL, 0x0d FL, 0x0d FL, 0x0e FL, 0x0e FL, 0x0e FL, 0x0e FL,
+/*30*/ 0x0e FL, 0x0e FL, 0x0e FL, 0x0e FL, 0x0b FL, 0x0b FL, 0x0b FL, 0x0b FL,
+/*38*/ 0x0b FL, 0x0b FL, 0x0b FL, 0x0b FL, 0x0f FL, 0x0f FL, 0x0f FL, 0x0f FL,
+/*40*/ 0x0f FL, 0x0f FL, 0x0f FL, 0x0f FL, 0x0f FL, 0x0f FL, 0x0f FL, 0x0f FL,
+/*48*/ 0x0f FL, 0x0f FL, 0x0f FL, 0x0f FL, 0x0a FL, 0x0a FL, 0x05 FL, 0x05 FL,
+/*50*/ 0x0a FL, 0x05 FL, 0x06 FL, 0x06 FL, 0x06 FL, 0x0c FL, 0x0c FL, 0x0c FL,
+/*58*/ 0x03 FL, 0x03 FL, 0x03 FL, 0x09 FL, 0x09 FL, 0x09 FL, 0x07 FL, 0x07 FL,
+/*60*/ 0x07 FL, 0x0d FL, 0x0d FL, 0x0d FL, 0x0e FL, 0x0e FL, 0x0e FL, 0x0b FL,
+/*68*/ 0x0b FL, 0x0b FL, 0x0f FL, 0x0f FL, 0x0f FL, 0x06 FL, 0x0c FL, 0x09 FL,
+/*70*/ 0x03 FL,0 FL,0 FL,0 FL, 0x08 FL, 0x01 FL, 0x02 FL, 0x04 FL,
+/*78*/ 0x08 FL, 0x01 FL, 0x02 FL, 0x04 FL, 0x0a FL, 0x05 FL, 0x0a FL, 0x05 FL
+};
+#undef FL
+
static const u_int8_t iso7_chars_32[] = {
175, 0, 0, 0, 0, 162, 0, 161
};
@@ -848,6 +884,9 @@
static const struct wsfont_level2_glyphmap iso7_level2_32 =
{ 20, 8, iso7_chars_32, 1 };
+static const struct wsfont_level2_glyphmap netbsd_box_drawing =
+{ 0, 128, netbsd_boxes, 4 };
+
static const struct wsfont_level2_glyphmap *iso7_level1[] = {
iso7_level2_0, NULL, NULL, iso7_level2_3,
NULL, NULL, NULL, NULL,
@@ -857,14 +896,28 @@
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
- iso7_level2_32
+ iso7_level2_32, NULL, NULL, NULL,
+ NULL, netbsd_box_drawing
+};
+
+static const struct wsfont_level2_glyphmap *iso_level1[] = {
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ NULL, netbsd_box_drawing
};
static const struct wsfont_level1_glyphmap encodings[] = {
- { NULL, 0, 0 }, /* WSDISPLAY_FONTENC_ISO */
+ { iso_level1, 0, 0x26 }, /* WSDISPLAY_FONTENC_ISO */
{ ibm437_level1, 0, 38 }, /* WSDISPLAY_FONTENC_IBM */
{ NULL, 0, 0 }, /* WSDISPLAY_FONTENC_PCVT */
- { iso7_level1, 0, 33 }, /* WSDISPLAY_FONTENC_ISO7 */
+ { iso7_level1, 0, 0x26 }, /* WSDISPLAY_FONTENC_ISO7 */
};
#define MAX_ENCODING (sizeof(encodings) / sizeof(encodings[0]))
@@ -879,9 +932,6 @@
const struct wsfont_level2_glyphmap *map2;
int hi, lo;
- if (font-encoding == WSDISPLAY_FONTENC_ISO)
- return (c);
-
if (font-encoding 0 || font-encoding = MAX_ENCODING)
return (-1);
@@ -894,6 +944,10 @@
map2 = map1-level2[hi - map1-base];
+ /* so we don't need an identical level 2 table for hi == 0 */
+ if (hi == 0 font-encoding == WSDISPLAY_FONTENC_ISO)
+
CVS commit: src/sys/dev/rasops
Module Name:src
Committed By: macallan
Date: Tue May 4 04:57:35 UTC 2010
Modified Files:
src/sys/dev/rasops: rasops.c rasops.h rasops1.c rasops15.c rasops2.c
rasops24.c rasops32.c rasops4.c rasops8.c
Log Message:
autogenerate box drawing characters for fonts that don't have them, put them
into an alternate font pointed at by the recently added mappings in wsfont,
adapt all putchar() methods except the rotated ones to use them
XXX no attempt has been made to make this work with rotation
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/rasops/rasops.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/rasops/rasops.h
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/rasops/rasops1.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/rasops/rasops15.c \
src/sys/dev/rasops/rasops32.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/rasops/rasops2.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/rasops/rasops24.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/rasops/rasops4.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/rasops/rasops8.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/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.62 src/sys/dev/rasops/rasops.c:1.63
--- src/sys/dev/rasops/rasops.c:1.62 Sat Apr 17 13:36:22 2010
+++ src/sys/dev/rasops/rasops.c Tue May 4 04:57:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.62 2010/04/17 13:36:22 nonaka Exp $ */
+/* $NetBSD: rasops.c,v 1.63 2010/05/04 04:57:34 macallan Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rasops.c,v 1.62 2010/04/17 13:36:22 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rasops.c,v 1.63 2010/05/04 04:57:34 macallan Exp $);
#include opt_rasops.h
#include rasops_glue.h
@@ -39,6 +39,7 @@
#include sys/param.h
#include sys/systm.h
#include sys/time.h
+#include sys/kmem.h
#include sys/bswap.h
#include machine/endian.h
@@ -158,6 +159,10 @@
};
#endif /* NRASOPS_ROTATION 0 */
+void rasops_make_box_chars_8(struct rasops_info *);
+void rasops_make_box_chars_16(struct rasops_info *);
+void rasops_make_box_chars_32(struct rasops_info *);
+
/*
* Initialize a 'rasops_info' descriptor.
*/
@@ -165,6 +170,7 @@
rasops_init(struct rasops_info *ri, int wantrows, int wantcols)
{
+ memset (ri-ri_optfont, 0, sizeof(ri-ri_optfont));
#ifdef _KERNEL
/* Select a font if the caller doesn't care */
if (ri-ri_font == NULL) {
@@ -232,10 +238,40 @@
int
rasops_reconfig(struct rasops_info *ri, int wantrows, int wantcols)
{
- int bpp, s;
+ int bpp, s, len;
s = splhigh();
+ /* throw away old line drawing character bitmaps, if we have any */
+ if (ri-ri_optfont.data != NULL) {
+ kmem_free(ri-ri_optfont.data, ri-ri_optfont.stride *
+ ri-ri_optfont.fontheight * ri-ri_optfont.numchars);
+ ri-ri_optfont.data = NULL;
+ }
+
+ /* autogenerate box drawing characters */
+ ri-ri_optfont.fontwidth = ri-ri_font-fontwidth;
+ ri-ri_optfont.fontheight = ri-ri_font-fontheight;
+ ri-ri_optfont.stride = ri-ri_font-stride;
+ ri-ri_optfont.firstchar = WSFONT_FLAG_OPT;
+ ri-ri_optfont.numchars = 16;
+
+ len = ri-ri_optfont.fontheight * ri-ri_optfont.stride *
+ ri-ri_optfont.numchars;
+ if ((ri-ri_optfont.data = kmem_zalloc(len, KM_SLEEP)) != NULL) {
+ switch (ri-ri_optfont.stride) {
+ case 1:
+ rasops_make_box_chars_8(ri);
+ break;
+ case 2:
+ rasops_make_box_chars_16(ri);
+ break;
+ case 4:
+ rasops_make_box_chars_32(ri);
+ break;
+ }
+ }
+
if (ri-ri_font-fontwidth 32 || ri-ri_font-fontwidth 4)
panic(rasops_init: fontwidth assumptions botched!);
@@ -421,12 +457,9 @@
panic(rasops_mapchar: no font selected);
#endif
- if (ri-ri_font-encoding != WSDISPLAY_FONTENC_ISO) {
- if ( (c = wsfont_map_unichar(ri-ri_font, c)) 0) {
- *cp = ' ';
- return (0);
-
- }
+ if ( (c = wsfont_map_unichar(ri-ri_font, c)) 0) {
+ *cp = ' ';
+ return (0);
}
if (c ri-ri_font-firstchar) {
@@ -434,11 +467,12 @@
return (0);
}
+#if 0
if (c - ri-ri_font-firstchar = ri-ri_font-numchars) {
*cp = ' ';
return (0);
}
-
+#endif
*cp = c;
return (5);
}
@@ -904,7 +938,7 @@
rasops_do_cursor(struct rasops_info *ri)
{
int full1, height, cnt, slop1, slop2, row, col;
- u_char *dp, *rp, *hrp, *hp;
+ u_char *dp, *rp, *hrp, *hp, tmp = 0;
hrp = hp = NULL;
@@ -943,6 +977,7 @@
full1 = (ri-ri_xscale - slop1 - slop2) 2;
if ((slop1 | slop2) == 0) {
+ uint32_t tmp32;
/* A common case */
while (height--) {
dp = rp;
@@ -953,17 +988,18 @@
}
for (cnt = full1; cnt; cnt--) {
-*(int32_t *)dp ^= ~0;
+tmp32 = *(int32_t *)dp ^ ~0;
+*(int32_t *)dp = tmp32;
dp += 4;
if (ri-ri_hwbits) {
- dp -= 4;
- *(int32_t *)hp = *(int32_t *)dp;
+ *(int32_t *)hp = tmp32;
hp += 4;
- dp += 4;
}
}
}
} else {
+ uint16_t tmp16;
+ uint32_t tmp32;
/* XXX this is
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue May 4 05:00:33 UTC 2010
Modified Files:
src/sys/dev/pci: chipsfb.c pm2fb.c radeonfb.c voodoofb.c voyagerfb.c
Log Message:
use alternate font if available ( for autogenerated box drawing characters )
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/chipsfb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/pm2fb.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/voodoofb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/voyagerfb.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/chipsfb.c
diff -u src/sys/dev/pci/chipsfb.c:1.20 src/sys/dev/pci/chipsfb.c:1.21
--- src/sys/dev/pci/chipsfb.c:1.20 Thu Aug 20 02:40:57 2009
+++ src/sys/dev/pci/chipsfb.c Tue May 4 05:00:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: chipsfb.c,v 1.20 2009/08/20 02:40:57 macallan Exp $ */
+/* $NetBSD: chipsfb.c,v 1.21 2010/05/04 05:00:33 macallan Exp $ */
/*
* Copyright (c) 2006 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: chipsfb.c,v 1.20 2009/08/20 02:40:57 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: chipsfb.c,v 1.21 2010/05/04 05:00:33 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -682,6 +682,7 @@
chipsfb_putchar(void *cookie, int row, int col, u_int c, long attr)
{
struct rasops_info *ri = cookie;
+ struct wsdisplay_font *font = PICK_FONT(ri, c);
struct vcons_screen *scr = ri-ri_hw;
struct chipsfb_softc *sc = scr-scr_cookie;
@@ -694,10 +695,10 @@
int fg, bg, uc;
int x, y, wi, he;
- wi = ri-ri_font-fontwidth;
- he = ri-ri_font-fontheight;
+ wi = font-fontwidth;
+ he = font-fontheight;
- if (!CHAR_IN_FONT(c, ri-ri_font))
+ if (!CHAR_IN_FONT(c, font))
return;
bg = (u_char)ri-ri_devcmap[(attr 16) 0xf];
fg = (u_char)ri-ri_devcmap[(attr 24) 0xf];
@@ -706,11 +707,11 @@
if (c == 0x20) {
chipsfb_rectfill(sc, x, y, wi, he, bg);
} else {
- uc = c-ri-ri_font-firstchar;
- data = (uint8_t *)ri-ri_font-data + uc *
+ uc = c - font-firstchar;
+ data = (uint8_t *)font-data + uc *
ri-ri_fontscale;
chipsfb_setup_mono(sc, x, y, wi, he, fg, bg);
- chipsfb_feed(sc, ri-ri_font-stride * he, data);
+ chipsfb_feed(sc, font-stride * he, data);
}
}
}
Index: src/sys/dev/pci/pm2fb.c
diff -u src/sys/dev/pci/pm2fb.c:1.3 src/sys/dev/pci/pm2fb.c:1.4
--- src/sys/dev/pci/pm2fb.c:1.3 Tue Mar 16 21:27:02 2010
+++ src/sys/dev/pci/pm2fb.c Tue May 4 05:00:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2fb.c,v 1.3 2010/03/16 21:27:02 macallan Exp $ */
+/* $NetBSD: pm2fb.c,v 1.4 2010/05/04 05:00:33 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.3 2010/03/16 21:27:02 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.4 2010/05/04 05:00:33 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -676,6 +676,7 @@
pm2fb_putchar(void *cookie, int row, int col, u_int c, long attr)
{
struct rasops_info *ri = cookie;
+ struct wsdisplay_font *font = PICK_FONT(ri, c);
struct vcons_screen *scr = ri-ri_hw;
struct pm2fb_softc *sc = scr-scr_cookie;
uint32_t mode;
@@ -686,10 +687,10 @@
int uc, i;
int x, y, wi, he;
- wi = ri-ri_font-fontwidth;
- he = ri-ri_font-fontheight;
+ wi = font-fontwidth;
+ he = font-fontheight;
- if (!CHAR_IN_FONT(c, ri-ri_font))
+ if (!CHAR_IN_FONT(c, font))
return;
bg = ri-ri_devcmap[(attr 16) 0xf];
fg = ri-ri_devcmap[(attr 24) 0xf];
@@ -698,9 +699,8 @@
if (c == 0x20) {
pm2fb_rectfill(sc, x, y, wi, he, bg);
} else {
- uc = c - ri-ri_font-firstchar;
- data = (uint8_t *)ri-ri_font-data + uc *
- ri-ri_fontscale;
+ uc = c - font-firstchar;
+ data = (uint8_t *)font-data + uc * ri-ri_fontscale;
mode = PM2RM_MASK_MIRROR;
switch (ri-ri_font-stride) {
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.34 src/sys/dev/pci/radeonfb.c:1.35
--- src/sys/dev/pci/radeonfb.c:1.34 Thu Jul 23 07:21:45 2009
+++ src/sys/dev/pci/radeonfb.c Tue May 4 05:00:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.34 2009/07/23 07:21:45 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.35 2010/05/04 05:00:33 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.34 2009/07/23 07:21:45 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.35 2010/05/04 05:00:33 macallan Exp $);
#define RADEONFB_DEFAULT_DEPTH 32
@@ -220,7 +220,7 @@
0, 0, /* ncols, nrows */
NULL, /* textops */
8, 16, /* fontwidth, fontheight */
- WSSCREEN_WSCOLORS, /* capabilities */
+ WSSCREEN_WSCOLORS | WSSCREEN_REVERSE, /* capabilities */
0, /* modecookie */
};
@@ -2169,7 +2169,7 @@
* XXX: font selection should be based on
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue May 4 05:07:14 UTC 2010
Modified Files:
src/sys/dev/pci: machfb.c
Log Message:
this has been sitting in my tree too long:
- device_t-ify
- sanitize debugging #ifdefs
- deal with firmwares setting up modes using other clocks than #0
- get rid of sparc and macppc-specific code, use device properties instead
- while there, use alternate box drawing font if needed
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/machfb.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/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.58 src/sys/dev/pci/machfb.c:1.59
--- src/sys/dev/pci/machfb.c:1.58 Thu Mar 11 04:00:36 2010
+++ src/sys/dev/pci/machfb.c Tue May 4 05:07:14 2010
@@ -1,7 +1,8 @@
-/* $NetBSD: machfb.c,v 1.58 2010/03/11 04:00:36 mrg Exp $ */
+/* $NetBSD: machfb.c,v 1.59 2010/05/04 05:07:14 macallan Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
+ * Copyright (c) 2005, 2006, 2007 Michael Lorenz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,7 +34,7 @@
#include sys/cdefs.h
__KERNEL_RCSID(0,
- $NetBSD: machfb.c,v 1.58 2010/03/11 04:00:36 mrg Exp $);
+ $NetBSD: machfb.c,v 1.59 2010/05/04 05:07:14 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -41,18 +42,11 @@
#include sys/device.h
#include sys/malloc.h
#include sys/callout.h
+#include sys/lwp.h
#include sys/kauth.h
-#ifdef __sparc__
-#include machine/promlib.h
-#endif
-
-#ifdef __powerpc__
-#include dev/ofw/openfirm.h
-#include dev/ofw/ofw_pci.h
-#endif
-
#include dev/videomode/videomode.h
+#include dev/videomode/edidvar.h
#include dev/pci/pcivar.h
#include dev/pci/pcireg.h
@@ -74,6 +68,9 @@
#include dev/wscons/wsdisplay_vconsvar.h
+#include opt_wsemul.h
+#include opt_machfb.h
+
#define MACH64_REG_SIZE 1024
#define MACH64_REG_OFF 0x7ffc00
@@ -88,7 +85,7 @@
};
struct mach64_softc {
- struct device sc_dev;
+ device_t sc_dev;
#ifdef __sparc__
struct fbdevice sc_fb;
#endif
@@ -111,6 +108,7 @@
bus_space_tag_t sc_regt;
bus_space_tag_t sc_memt;
+ bus_space_tag_t sc_iot;
bus_space_handle_t sc_regh;
bus_space_handle_t sc_memh;
void *sc_aperture; /* mapped aperture vaddr */
@@ -142,8 +140,12 @@
int vclk_fb_div;
int mclk_post_div;
int mclk_fb_div;
+ int sc_clock; /* which clock to use */
struct videomode *sc_my_mode;
+ int sc_edid_size;
+ uint8_t sc_edid_data[1024];
+
u_char sc_cmap_red[256];
u_char sc_cmap_green[256];
u_char sc_cmap_blue[256];
@@ -174,6 +176,7 @@
{ PCI_PRODUCT_ATI_RAGE_PRO_PCI_P, 23 },
{ PCI_PRODUCT_ATI_RAGE_PRO_PCI_L, 23 },
{ PCI_PRODUCT_ATI_RAGE_XL_PCI, 23 },
+ { PCI_PRODUCT_ATI_RAGE_XL_PCI66, 23 },
{ PCI_PRODUCT_ATI_RAGE_II, 135000 },
{ PCI_PRODUCT_ATI_RAGE_IIP, 20 },
{ PCI_PRODUCT_ATI_RAGE_IIC_PCI, 23 },
@@ -183,11 +186,12 @@
{ PCI_PRODUCT_ATI_RAGE_LT_PRO_AGP, 23 },
{ PCI_PRODUCT_ATI_RAGE_MOB_M3_PCI, 23 },
{ PCI_PRODUCT_ATI_RAGE_MOB_M3_AGP, 23 },
- { PCI_PRODUCT_ATI_RAGE_LT, 23 },
- { PCI_PRODUCT_ATI_RAGE_LT_PRO_PCI, 23 },
{ PCI_PRODUCT_ATI_RAGE_MOBILITY, 23 },
{ PCI_PRODUCT_ATI_RAGE_LT_PRO, 23 },
#endif
+ { PCI_PRODUCT_ATI_RAGE_LT_PRO, 23 },
+ { PCI_PRODUCT_ATI_RAGE_LT, 23 },
+ { PCI_PRODUCT_ATI_RAGE_LT_PRO_PCI, 23 },
{ PCI_PRODUCT_ATI_MACH64_VT, 17 },
{ PCI_PRODUCT_ATI_MACH64_VTB, 20 },
{ PCI_PRODUCT_ATI_MACH64_VT4, 23 }
@@ -224,7 +228,7 @@
static int mach64_match(device_t, cfdata_t, void *);
static void mach64_attach(device_t, device_t, void *);
-CFATTACH_DECL(machfb, sizeof(struct mach64_softc), mach64_match, mach64_attach,
+CFATTACH_DECL_NEW(machfb, sizeof(struct mach64_softc), mach64_match, mach64_attach,
NULL, NULL);
static void mach64_init(struct mach64_softc *);
@@ -254,7 +258,7 @@
static void mach64_init_screen(void *, struct vcons_screen *, int, long *);
static int mach64_set_screentype(struct mach64_softc *,
const struct wsscreen_descr *);
-static int mach64_is_console(struct pci_attach_args *);
+static int mach64_is_console(struct mach64_softc *);
static void mach64_cursor(void *, int, int, int);
#if 0
@@ -265,7 +269,6 @@
static void mach64_erasecols(void *, int, int, int, long);
static void mach64_copyrows(void *, int, int, int);
static void mach64_eraserows(void *, int, int, long);
-static int mach64_allocattr(void *, int, int, int, long *);
static void mach64_clearscreen(struct mach64_softc *);
static int mach64_putcmap(struct mach64_softc *, struct wsdisplay_cmap *);
@@ -284,19 +287,7 @@
static void set_address(struct rasops_info *, void *);
static void machfb_blank(struct mach64_softc *, int);
-
-#if 0
-static const struct wsdisplay_emulops mach64_emulops = {
- mach64_cursor,
- mach64_mapchar,
- mach64_putchar,
- mach64_copycols,
-
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Tue May 4 05:08:01 UTC 2010 Modified Files: src/sys/dev/pci: machfbreg.h Log Message: add some PLL-specific register definitions To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/machfbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/machfbreg.h diff -u src/sys/dev/pci/machfbreg.h:1.3 src/sys/dev/pci/machfbreg.h:1.4 --- src/sys/dev/pci/machfbreg.h:1.3 Sun Dec 11 12:22:50 2005 +++ src/sys/dev/pci/machfbreg.h Tue May 4 05:08:01 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machfbreg.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */ +/* $NetBSD: machfbreg.h,v 1.4 2010/05/04 05:08:01 macallan Exp $ */ /* * Copyright 1992,1993,1994,1995,1996,1997 by Kevin E. Martin, Chapel Hill, North Carolina. @@ -277,13 +277,17 @@ #define CTD_FIFO5 0x0100 /* CLOCK_CNTL register constants */ -#define CLOCK_SEL 0x0f -#define CLOCK_DIV 0x30 -#define CLOCK_DIV1 0x00 -#define CLOCK_DIV2 0x10 -#define CLOCK_DIV4 0x20 -#define CLOCK_STROBE 0x40 -#define PLL_WR_EN 0x02 +#define CLOCK_SEL 0x000f +#define CLOCK_DIV 0x0030 +#define CLOCK_DIV1 0x +#define CLOCK_DIV2 0x0010 +#define CLOCK_DIV4 0x0020 +#define CLOCK_STROBE 0x0040 +#define PLL_WR_EN 0x0200 +#define PLL_ADDR 0xfc00 +#define PLL_ADDR_SHIFT 10 +#define PLL_DATA 0x00ff +#define PLL_DATA_SHIFT 16 /* PLL registers */ #define PLL_MACRO_CNTL 0x01 @@ -291,6 +295,7 @@ #define PLL_GEN_CNTL 0x03 #define MCLK_FB_DIV 0x04 #define PLL_VCLK_CNTL 0x05 + #define PLL_VCLK_RESET 0x04 #define VCLK_POST_DIV 0x06 #define VCLK0_FB_DIV 0x07 #define VCLK1_FB_DIV 0x08
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Tue May 4 05:10:25 UTC 2010
Modified Files:
src/sys/dev/sbus: p9100.c tcx.c zx.c
Log Message:
use box drawing font if needed
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/sbus/p9100.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/sbus/tcx.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sbus/zx.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/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.54 src/sys/dev/sbus/p9100.c:1.55
--- src/sys/dev/sbus/p9100.c:1.54 Mon Mar 1 05:42:08 2010
+++ src/sys/dev/sbus/p9100.c Tue May 4 05:10:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.54 2010/03/01 05:42:08 macallan Exp $ */
+/* $NetBSD: p9100.c,v 1.55 2010/05/04 05:10:25 macallan Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: p9100.c,v 1.54 2010/03/01 05:42:08 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: p9100.c,v 1.55 2010/05/04 05:10:25 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1085,6 +1085,7 @@
p9100_putchar(void *cookie, int row, int col, u_int c, long attr)
{
struct rasops_info *ri = cookie;
+ struct wsdisplay_font *font = PICK_FONT(ri, c);
struct vcons_screen *scr = ri-ri_hw;
struct p9100_softc *sc = scr-scr_cookie;
@@ -1092,10 +1093,10 @@
uint8_t *data;
int x, y, wi, he;
- wi = ri-ri_font-fontwidth;
- he = ri-ri_font-fontheight;
+ wi = font-fontwidth;
+ he = font-fontheight;
- if (!CHAR_IN_FONT(c, ri-ri_font))
+ if (!CHAR_IN_FONT(c, font))
return;
bg = (u_char)ri-ri_devcmap[(attr 16) 0xff];
@@ -1106,15 +1107,15 @@
if (c == 0x20) {
p9100_rectfill(sc, x, y, wi, he, bg);
} else {
- uc = c-ri-ri_font-firstchar;
- data = (uint8_t *)ri-ri_font-data + uc *
+ uc = c - font-firstchar;
+ data = (uint8_t *)font-data + uc *
ri-ri_fontscale;
p9100_setup_mono(sc, x, y, wi, 1, fg, bg);
for (i = 0; i he; i++) {
- p9100_feed_line(sc, ri-ri_font-stride,
+ p9100_feed_line(sc, font-stride,
data);
- data += ri-ri_font-stride;
+ data += font-stride;
}
}
}
Index: src/sys/dev/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.42 src/sys/dev/sbus/tcx.c:1.43
--- src/sys/dev/sbus/tcx.c:1.42 Thu Sep 17 16:39:48 2009
+++ src/sys/dev/sbus/tcx.c Tue May 4 05:10:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.42 2009/09/17 16:39:48 tsutsui Exp $ */
+/* $NetBSD: tcx.c,v 1.43 2010/05/04 05:10:25 macallan Exp $ */
/*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcx.c,v 1.42 2009/09/17 16:39:48 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcx.c,v 1.43 2010/05/04 05:10:25 macallan Exp $);
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -931,6 +931,7 @@
tcx_putchar(void *cookie, int row, int col, u_int c, long attr)
{
struct rasops_info *ri = cookie;
+ struct wsdisplay_font *font = PICK_FONT(ri, c);
struct vcons_screen *scr = ri-ri_hw;
struct tcx_softc *sc = scr-scr_cookie;
uint64_t bg, fg, temp, mask;
@@ -939,18 +940,17 @@
uint8_t *cdata;
uint16_t *wdata;
- addr = ri-ri_xorigin +
- col * ri-ri_font-fontwidth +
- (ri-ri_yorigin + row * ri-ri_font-fontheight) * ri-ri_width;
+ addr = ri-ri_xorigin + col * font-fontwidth +
+ (ri-ri_yorigin + row * font-fontheight) * ri-ri_width;
/* check if the character is crossing a 32 pixel boundary */
if ((addr 0xe0) ==
- ((addr + ri-ri_font-fontwidth - 1) 0xe0)) {
+ ((addr + font-fontwidth - 1) 0xe0)) {
/* phew, not split */
shift = addr 0x1f;
addr = 0xe0;
- fmask = 0x (32 - ri-ri_font-fontwidth);
- fmask = fmask (32 - ri-ri_font-fontwidth - shift);
+ fmask = 0x (32 - font-fontwidth);
+ fmask = fmask (32 - font-fontwidth - shift);
mask = fmask;
bg = 0x3000LL |
((uint64_t)ri-ri_devcmap[(attr 16) 0xff]
@@ -959,12 +959,12 @@
temp = 0x3000LL |
((uint64_t)ri-ri_devcmap[(attr 24) 0xff] 0xff)
32;
- uc = c - ri-ri_font-firstchar;
- cdata = (uint8_t *)ri-ri_font-data + uc * ri-ri_fontscale;
+ uc = c - font-firstchar;
+ cdata = (uint8_t *)font-data + uc * ri-ri_fontscale;
- if (ri-ri_font-fontwidth 9) {
+ if (font-fontwidth 9) {
/* byte by byte */
- for (i = 0; i ri-ri_font-fontheight; i++) {
+ for (i = 0; i font-fontheight; i++) {
sc-sc_rstip[addr] = bg;
if (*cdata != 0) {
if (shift 24) {
@@ -979,10 +979,10 @@
cdata++;
addr += ri-ri_width;
}
- } else if (ri-ri_font-fontwidth 17) {
+ } else if (font-fontwidth 17) {
/* short by short */
wdata = (uint16_t *)cdata;
- for (i = 0; i ri-ri_font-fontheight; i++) {
+ for (i = 0; i font-fontheight; i++) {
sc-sc_rstip[addr] = bg;
if
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: macallan
Date: Tue May 4 05:11:06 UTC 2010
Modified Files:
src/sys/dev/sun: cgsix.c
Log Message:
use box drawing font if needed
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/sun/cgsix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.46 src/sys/dev/sun/cgsix.c:1.47
--- src/sys/dev/sun/cgsix.c:1.46 Sat Sep 19 07:07:43 2009
+++ src/sys/dev/sun/cgsix.c Tue May 4 05:11:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.46 2009/09/19 07:07:43 tsutsui Exp $ */
+/* $NetBSD: cgsix.c,v 1.47 2010/05/04 05:11:06 macallan Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.46 2009/09/19 07:07:43 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.47 2010/05/04 05:11:06 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1345,6 +1345,7 @@
cgsix_putchar(void *cookie, int row, int col, u_int c, long attr)
{
struct rasops_info *ri = cookie;
+ struct wsdisplay_font *font = PICK_FONT(ri, c);
struct vcons_screen *scr = ri-ri_hw;
struct cgsix_softc *sc = scr-scr_cookie;
int inv;
@@ -1359,10 +1360,10 @@
int x, y, wi, he;
volatile struct cg6_fbc *fbc = sc-sc_fbc;
- wi = ri-ri_font-fontwidth;
- he = ri-ri_font-fontheight;
+ wi = font-fontwidth;
+ he = font-fontheight;
- if (!CHAR_IN_FONT(c, ri-ri_font))
+ if (!CHAR_IN_FONT(c, font))
return;
inv = ((attr 8) WSATTR_REVERSE);
if (inv) {
@@ -1383,15 +1384,15 @@
if (c == 0x20) {
cgsix_rectfill(sc, x, y, wi, he, bg);
} else {
-uc = c-ri-ri_font-firstchar;
-data = (uint8_t *)ri-ri_font-data + uc *
+uc = c - font-firstchar;
+data = (uint8_t *)font-data + uc *
ri-ri_fontscale;
cgsix_setup_mono(sc, x, y, wi, 1, fg, bg);
for (i = 0; i he; i++) {
- cgsix_feed_line(sc, ri-ri_font-stride,
+ cgsix_feed_line(sc, font-stride,
data);
- data += ri-ri_font-stride;
+ data += font-stride;
}
/* put the chip back to normal */
fbc-fbc_incy = 0;
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Tue May 4 05:49:12 UTC 2010 Modified Files: src/share/man/man9: byteorder.9 Log Message: Reference bswap(3). Improvements in the HISTORY section. Remove the AUTHORS (of the man page) section, which does not appear in the original (FreeBSD) manual page. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/byteorder.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/byteorder.9 diff -u src/share/man/man9/byteorder.9:1.4 src/share/man/man9/byteorder.9:1.5 --- src/share/man/man9/byteorder.9:1.4 Fri Oct 2 09:38:29 2009 +++ src/share/man/man9/byteorder.9 Tue May 4 05:49:12 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: byteorder.9,v 1.4 2009/10/02 09:38:29 cegger Exp $ +.\ $NetBSD: byteorder.9,v 1.5 2010/05/04 05:49:12 jruoho Exp $ .\ .\ Copyright (c) 2002 Mike Barcroft m...@freebsd.org .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ $FreeBSD: src/share/man/man9/byteorder.9,v 1.6 2003/05/21 17:32:55 ru Exp $ .\ -.Dd April 10, 2009 +.Dd May 4, 2010 .Dt BYTEORDER 9 .Os .Sh NAME @@ -177,6 +177,7 @@ functions encode and decode integers to/from octet stream on any alignment in big/little endian format. .Sh SEE ALSO +.Xr bswap 3 , .Xr byteorder 3 .Sh HISTORY The @@ -185,17 +186,18 @@ .Fn *toh functions first appeared in .Nx 1.5 . -These functions were introduced to handle PCI bus master devices which assumed -host's memory used to pass integer parameters via DMA transfer was -always little endian even on big endian systems. +These were later ported to +.Fx 5.0 . +The functions were originally introduced to handle +.Tn PCI +bus master devices, which assumed little endian byte order in +.Tn DMA +transfers, even on big endian systems. .Pp The encode/decode functions first appeared in -.Fx 5.1 , -and ported to +.Fx 5.1 . +These were later ported to .Nx 3.0 -as a part of +as a part of the .Xr uuidgen 2 support. -.Sh AUTHORS -This manual page was written by -.An Mike Barcroft Aq m...@freebsd.org .
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: jruoho Date: Mon May 3 06:11:38 UTC 2010 Modified Files: src/lib/libc/stdlib: alloca.3 Log Message: Note the problems with SSP. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/stdlib/alloca.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp700/conf
Module Name:src Committed By: skrll Date: Mon May 3 06:59:47 UTC 2010 Modified Files: src/sys/arch/hp700/conf: GENERIC Log Message: Add PCIVERBOSE To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/hp700/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.hp700
Module Name:src Committed By: skrll Date: Mon May 3 07:11:25 UTC 2010 Modified Files: src/etc/etc.hp700: MAKEDEV.conf Log Message: Create tty0[0-3] devices. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/etc/etc.hp700/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: jruoho Date: Mon May 3 08:11:57 UTC 2010 Modified Files: src/lib/libc/stdlib: jemalloc.3 malloc.3 Log Message: Move the '_malloc_options' variable from malloc(3) to jemalloc(3). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdlib/jemalloc.3 cvs rdiff -u -r1.36 -r1.37 src/lib/libc/stdlib/malloc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: jruoho Date: Mon May 3 08:23:21 UTC 2010 Modified Files: src/lib/libc/stdlib: jemalloc.3 malloc.3 Log Message: Fix previous commit by also moving the type of _malloc_options. In addition, add a (commented) note that _malloc_message should be documented better. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/stdlib/jemalloc.3 cvs rdiff -u -r1.37 -r1.38 src/lib/libc/stdlib/malloc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dev/fbt
Module Name:src Committed By: darran Date: Mon May 3 09:28:38 UTC 2010 Modified Files: src/external/cddl/osnet/dev/fbt: fbt.c Log Message: DTrace: print a warning no CTF section is found when processing arguments. This should help diagnose problems such as netbsd images without CTF sections and old boot loaders. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dev/fbt/fbt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: darran Date: Mon May 3 09:51:36 UTC 2010 Modified Files: src/sys/kern: kern_ctf.c kern_ksyms.c Log Message: DTrace: Fix several bugs where the mod_ctf_get() function could return success even though no CTF section was present in the kernel or module. This fixes the panic that several people saw when trying out the FBT provider without updating /boot or missing a CTF section in /netbsd. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/kern/kern_ctf.c cvs rdiff -u -r1.58 -r1.59 src/sys/kern/kern_ksyms.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpcsh
Module Name:src Committed By: tsutsui Date: Mon May 3 12:16:04 UTC 2010 Modified Files: src/sys/arch/hpcsh/conf: files.hpcsh src/sys/arch/hpcsh/hpcsh: machdep.c Log Message: Sync kloader(4) behavior with hpcmips: - use bootstr passed via reboot(2) with RB_STRING for the next kernel path - prepare independent opt_kloader_kernel_path.h for KLOADER_KERNEL_PATH - some cosmetics to reduce diffs from hpcmips Tested on HPW-50PA (Hitachi PERSONA). To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/hpcsh/conf/files.hpcsh cvs rdiff -u -r1.72 -r1.73 src/sys/arch/hpcsh/hpcsh/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/modules
Module Name:src Committed By: christos Date: Mon May 3 12:58:09 UTC 2010 Modified Files: src/lib/libpam/modules: mod.mk Log Message: make the dependency to libpam, explicit. Fixes afpd in pkgsrc. From Mark Davies XXX: Should be pulled up to 4.x and 5.x. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libpam/modules/mod.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib
Module Name:src Committed By: tsutsui Date: Mon May 3 14:14:36 UTC 2010 Modified Files: src/distrib/hpcsh/miniroot: Makefile.inc dot.profile list src/distrib/utils/sysinst: Makefile Added Files: src/distrib/utils/sysinst/arch/hpcsh: Makefile md.c md.h menus.md.en msg.md.en Log Message: Add sysinst(8) for hpcsh. Mostly taken from hpcsmips, but no non-English translations. Tested on HPW-50PA. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/hpcsh/miniroot/Makefile.inc cvs rdiff -u -r1.3 -r1.4 src/distrib/hpcsh/miniroot/dot.profile cvs rdiff -u -r1.8 -r1.9 src/distrib/hpcsh/miniroot/list cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/sysinst/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/utils/sysinst/arch/hpcsh/Makefile \ src/distrib/utils/sysinst/arch/hpcsh/md.c \ src/distrib/utils/sysinst/arch/hpcsh/md.h \ src/distrib/utils/sysinst/arch/hpcsh/menus.md.en \ src/distrib/utils/sysinst/arch/hpcsh/msg.md.en Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: tsutsui Date: Mon May 3 15:14:24 UTC 2010 Modified Files: src/distrib/notes/common: xfer Log Message: Update IP addresses (both IPv4 and IPv6) of current ftp.NetBSD.org. XXX: is it still worth to note those numbers in INSTALL docs nowadays? To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/distrib/notes/common/xfer Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: tsutsui Date: Mon May 3 16:15:06 UTC 2010 Modified Files: src/distrib/notes/common: main Log Message: - remove resigned developers - remove other contributors in the time of 386BSD XXX: probably we should simply refer htdocs/people/developers.html XXX: rather than maintaining two independent lists To generate a diff of this commit: cvs rdiff -u -r1.462 -r1.463 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Mon May 3 16:20:24 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Fix indent for www changes page. To generate a diff of this commit: cvs rdiff -u -r1.1385 -r1.1386 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Mon May 3 16:21:03 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note about sysinst(8) for hpcsh. To generate a diff of this commit: cvs rdiff -u -r1.1386 -r1.1387 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Mon May 3 16:32:32 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Add man page suffix to some entries. To generate a diff of this commit: cvs rdiff -u -r1.1387 -r1.1388 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: hubertf Date: Mon May 3 17:15:58 UTC 2010 Modified Files: src/etc: shrc Log Message: Add RCS ID, per PR 43243 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/etc/shrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/dec
Module Name:src Committed By: mhitch Date: Mon May 3 18:04:56 UTC 2010 Modified Files: src/sys/dev/dec: mcclock.c Log Message: Fix error introduced with timecounters - RTC clock register only uses the last 2 digits of the year. Fixes setting the clock and keeps the DECstation PROM happy and stops it from setting the date to Jan 1, 1972. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/dec/mcclock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sandpoint/stand/netboot
Module Name:src Committed By: phx Date: Mon May 3 18:55:09 UTC 2010 Modified Files: src/sys/arch/sandpoint/stand/netboot: skg.c Log Message: Fixed descriptor size (noticed by nisimura). Using two TX descriptors. Might be better, although libsa seems to work with one. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sandpoint/stand/netboot/skg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam
Module Name:src Committed By: christos Date: Mon May 3 22:12:33 UTC 2010 Modified Files: src/lib/libpam: Makefile src/lib/libpam/modules: mod.mk Added Files: src/lib/libpam/staticmodules: Makefile Log Message: Build the modules in two phases: 1. build the static modules first, before libpam so that the static libpam can link against the module .a files. 2. build the modules after the dynamic libpam is build, so that the dynamic modules can link against the dynamic libpam. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libpam/Makefile cvs rdiff -u -r1.8 -r1.9 src/lib/libpam/modules/mod.mk cvs rdiff -u -r0 -r1.1 src/lib/libpam/staticmodules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: martin Date: Mon May 3 23:04:12 UTC 2010 Modified Files: src/distrib/utils/sysinst: label.c Log Message: Prevent a -ve int - uint32 underflow, noticed by joerg. If a partition ends up 0-sized, set it to FS_UNUSED to avoid later warnings. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/utils/sysinst/label.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src Committed By: agc Date: Tue May 4 00:02:46 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpverify: verify.c Log Message: Make this compile with gcc 4.5 - patch from Juan RP in PR pkg/43244 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: macallan Date: Tue May 4 04:53:59 UTC 2010 Modified Files: src/sys/dev/wsfont: wsfont.c wsfont.h Log Message: add translation tables for ISO fonts in order to map unicode box drawing characters to something else than whitespaces To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/dev/wsfont/wsfont.c cvs rdiff -u -r1.20 -r1.21 src/sys/dev/wsfont/wsfont.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/rasops
Module Name:src Committed By: macallan Date: Tue May 4 04:57:35 UTC 2010 Modified Files: src/sys/dev/rasops: rasops.c rasops.h rasops1.c rasops15.c rasops2.c rasops24.c rasops32.c rasops4.c rasops8.c Log Message: autogenerate box drawing characters for fonts that don't have them, put them into an alternate font pointed at by the recently added mappings in wsfont, adapt all putchar() methods except the rotated ones to use them XXX no attempt has been made to make this work with rotation To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/dev/rasops/rasops.c cvs rdiff -u -r1.24 -r1.25 src/sys/dev/rasops/rasops.h cvs rdiff -u -r1.22 -r1.23 src/sys/dev/rasops/rasops1.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/rasops/rasops15.c \ src/sys/dev/rasops/rasops32.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/rasops/rasops2.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/rasops/rasops24.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/rasops/rasops4.c cvs rdiff -u -r1.26 -r1.27 src/sys/dev/rasops/rasops8.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: macallan Date: Tue May 4 05:00:33 UTC 2010 Modified Files: src/sys/dev/pci: chipsfb.c pm2fb.c radeonfb.c voodoofb.c voyagerfb.c Log Message: use alternate font if available ( for autogenerated box drawing characters ) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/chipsfb.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/pm2fb.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/radeonfb.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/voodoofb.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/voyagerfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Tue May 4 05:49:12 UTC 2010 Modified Files: src/share/man/man9: byteorder.9 Log Message: Reference bswap(3). Improvements in the HISTORY section. Remove the AUTHORS (of the man page) section, which does not appear in the original (FreeBSD) manual page. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/byteorder.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
