CVS commit: src/sys/arch
Module Name:src Committed By: joerg Date: Sun Jan 12 20:31:50 UTC 2014 Modified Files: src/sys/arch/amd64/amd64: spl.S src/sys/arch/i386/i386: lock_stubs.S Log Message: Try to reserve space in a way that results in the same allocation for both LLVM and GNU as. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amd64/amd64/spl.S cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/lock_stubs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/spl.S diff -u src/sys/arch/amd64/amd64/spl.S:1.27 src/sys/arch/amd64/amd64/spl.S:1.28 --- src/sys/arch/amd64/amd64/spl.S:1.27 Sat Jun 22 06:57:30 2013 +++ src/sys/arch/amd64/amd64/spl.S Sun Jan 12 20:31:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: spl.S,v 1.27 2013/06/22 06:57:30 uebayasi Exp $ */ +/* $NetBSD: spl.S,v 1.28 2014/01/12 20:31:50 joerg Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -212,16 +212,11 @@ ENTRY(spllower) 2: popf jmp _C_LABEL(Xspllower) - nop - nop - .align 16 -#ifdef GPROF - nop +3: + .space 16 .align 16 -#endif END(spllower) LABEL(spllower_end) - #endif /* !XEN */ /* Index: src/sys/arch/i386/i386/lock_stubs.S diff -u src/sys/arch/i386/i386/lock_stubs.S:1.25 src/sys/arch/i386/i386/lock_stubs.S:1.26 --- src/sys/arch/i386/i386/lock_stubs.S:1.25 Wed Jan 12 23:12:12 2011 +++ src/sys/arch/i386/i386/lock_stubs.S Sun Jan 12 20:31:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.25 2011/01/12 23:12:12 joerg Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.26 2014/01/12 20:31:50 joerg Exp $ */ /*- * Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.25 2011/01/12 23:12:12 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.26 2014/01/12 20:31:50 joerg Exp $"); #include "opt_lockdebug.h" @@ -264,7 +264,7 @@ ENTRY(mutex_spin_exit) movl %ecx, CPUVAR(ILEVEL) sti 1: ret - nop /* XXX round up */ + .space 32 .align 32 LABEL(mutex_spin_exit_end) END(mutex_spin_exit) @@ -295,6 +295,7 @@ ENTRY(i686_mutex_spin_exit) movl %ecx,4(%esp) LABEL(i686_mutex_spin_exit_patch) jmp _C_LABEL(Xspllower) + .space 16 .align 32 LABEL(i686_mutex_spin_exit_end) END(i686_mutex_spin_exit)
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: joerg
Date: Sun Jan 12 19:37:43 UTC 2014
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
Improve assembler syntax.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/arm/arm/cpufunc.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/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.133 src/sys/arch/arm/arm/cpufunc.c:1.134
--- src/sys/arch/arm/arm/cpufunc.c:1.133 Sat Jan 4 02:58:38 2014
+++ src/sys/arch/arm/arm/cpufunc.c Sun Jan 12 19:37:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.133 2014/01/04 02:58:38 joerg Exp $ */
+/* $NetBSD: cpufunc.c,v 1.134 2014/01/12 19:37:43 joerg Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.133 2014/01/04 02:58:38 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.134 2014/01/12 19:37:43 joerg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -3249,7 +3249,7 @@ sa110_setup(char *args)
* enable clockswitching, note that this doesn't read or write to r0,
* r0 is just to make it valid asm
*/
- __asm volatile ("mcr 15, 0, r0, c15, c1, 2");
+ __asm volatile ("mcr p15, 0, r0, c15, c1, 2");
}
#endif /* CPU_SA110 */
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Sun Jan 12 19:36:08 UTC 2014 Modified Files: src/libexec/ld.elf_so: sysident.h Log Message: Don't align random sections. Simplify by using .pushsection/.popsection. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/libexec/ld.elf_so/sysident.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/sysident.h diff -u src/libexec/ld.elf_so/sysident.h:1.16 src/libexec/ld.elf_so/sysident.h:1.17 --- src/libexec/ld.elf_so/sysident.h:1.16 Tue Sep 10 16:35:10 2013 +++ src/libexec/ld.elf_so/sysident.h Sun Jan 12 19:36:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sysident.h,v 1.16 2013/09/10 16:35:10 matt Exp $ */ +/* $NetBSD: sysident.h,v 1.17 2014/01/12 19:36:08 joerg Exp $ */ /* * Copyright (c) 1997 Christopher G. Demetriou @@ -63,7 +63,7 @@ #define __S(x) __STRING(x) __asm( - ".section\t\".note.netbsd.ident\", \"a\"\n" + ".pushsection\t\".note.netbsd.ident\", \"a\"\n" "\t.p2align\t2\n\n" "\t.long\t" __S(ELF_NOTE_NETBSD_NAMESZ) "\n" @@ -72,12 +72,11 @@ __asm( "\t.ascii\t" __S(ELF_NOTE_NETBSD_NAME) "\n" "\t.long\t" __S(__NetBSD_Version__) "\n\n" - "\t.previous\n" - "\t.p2align\t2\n" + "\t.popsection\n" ); __asm( - ".section\t\".note.netbsd.pax\", \"a\"\n" + ".pushsection\t\".note.netbsd.pax\", \"a\"\n" "\t.p2align\t2\n\n" "\t.long\t" __S(ELF_NOTE_PAX_NAMESZ) "\n" @@ -86,13 +85,12 @@ __asm( "\t.ascii\t" __S(ELF_NOTE_PAX_NAME) "\n" "\t.long\t" __S(0) "\n\n" - "\t.previous\n" - "\t.p2align\t2\n" + "\t.popsection\n" ); #ifdef ELF_NOTE_MARCH_DESC __asm( - ".section\t\".note.netbsd.march\", \"a\"\n" + ".pushsection\t\".note.netbsd.march\", \"a\"\n" "\t.p2align\t2\n\n" "\t.long\t" __S(ELF_NOTE_MARCH_NAMESZ) "\n" @@ -102,7 +100,6 @@ __asm( "1:\t.asciz\t" __S(ELF_NOTE_MARCH_DESC) "\n" "2:\n" - "\t.previous\n" - "\t.p2align\t2\n" + "\t.popsection\n" ); #endif
CVS commit: src/external/cddl/osnet
Module Name:src
Committed By: riz
Date: Sun Jan 12 17:49:30 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/systrace: systrace.c
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_consume.c
dt_dis.c dt_handle.c dt_link.c dt_options.c dt_parser.c dt_subr.c
Log Message:
Replace llx with PRIx64 and some llu with PRIu64 in format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/systrace/systrace.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.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/systrace/systrace.c
diff -u src/external/cddl/osnet/dev/systrace/systrace.c:1.3 src/external/cddl/osnet/dev/systrace/systrace.c:1.4
--- src/external/cddl/osnet/dev/systrace/systrace.c:1.3 Sun Jul 17 20:54:33 2011
+++ src/external/cddl/osnet/dev/systrace/systrace.c Sun Jan 12 17:49:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace.c,v 1.3 2011/07/17 20:54:33 joerg Exp $ */
+/* $NetBSD: systrace.c,v 1.4 2014/01/12 17:49:30 riz Exp $ */
/*
* CDDL HEADER START
@@ -38,7 +38,9 @@
#include
#include
#include
+#ifdef __FreeBSD__
#include
+#endif
#include
#include
#include
@@ -51,9 +53,12 @@
#include
#include
#include
+#ifdef __FreeBSD__
#include
#include
#include
+#endif
+#include
#include
#include
@@ -78,7 +83,7 @@ extern struct sysent linux_sysent[];
*/
#include
#include
-extern const char *syscallnames[];
+extern const char * const syscallnames[];
#define DEVNAME "dtrace/systrace"
#define PROVNAME "syscall"
#define MAXSYSCALL SYS_MAXSYSCALL
@@ -98,15 +103,18 @@ extern const char *syscallnames[];
#error 1 << SYSTRACE_SHIFT must exceed number of system calls
#endif
+#ifdef __FreeBSD__
static d_open_t systrace_open;
+#endif
static int systrace_unload(void);
static void systrace_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *);
-static void systrace_provide(void *, dtrace_probedesc_t *);
+static void systrace_provide(void *, const dtrace_probedesc_t *);
static void systrace_destroy(void *, dtrace_id_t, void *);
-static void systrace_enable(void *, dtrace_id_t, void *);
+static int systrace_enable(void *, dtrace_id_t, void *);
static void systrace_disable(void *, dtrace_id_t, void *);
static void systrace_load(void *);
+#ifdef __FreeBSD__
static struct cdevsw systrace_cdevsw = {
.d_version = D_VERSION,
.d_open = systrace_open,
@@ -116,9 +124,10 @@ static struct cdevsw systrace_cdevsw = {
.d_name = "systrace",
#endif
};
+#endif
static union {
- const char **p_constnames;
+ const char * const *p_constnames;
char **pp_syscallnames;
} uglyhack = { SYSCALLNAMES };
@@ -143,7 +152,9 @@ static dtrace_pops_t systrace_pops = {
systrace_destroy
};
+#ifdef __FreeBSD__
static struct cdev *systrace_cdev;
+#endif
static dtrace_provider_id_t systrace_id;
#if !defined(LINUX_SYSTRACE)
@@ -155,21 +166,21 @@ static dtrace_provider_id_t systrace_id;
* compat syscall from something like Linux.
*/
static void
-systrace_probe(u_int32_t id, int sysnum, struct sysent *sysent, void *params)
+systrace_probe(u_int32_t id, int sysnum, struct sysent *se, void *params)
{
int n_args = 0;
- u_int64_t uargs[8];
+ union systrace_probe_args_un uargs[SYS_MAXSYSARGS];
/*
* Check if this syscall has an argument conversion function
* registered.
*/
- if (sysent->sy_systrace_args_func != NULL)
+ if (se->sy_systrace_args_func != NULL)
/*
* Convert the syscall parameters using the registered
* function.
*/
- (*sysent->sy_systrace_args_func)(sysnum, params, uargs, &n_args);
+ (*se->sy_systrace_args_func)(sysnum, params, uargs, &n_args);
else
/*
* Use the built-in system call argument conversion
@@ -180,7 +191,8 @@ systrace_probe(u_int32_t id, int sysnum,
systrace_args(sysnum, params, uargs, &n_args);
/* Process the probe using the converted argments. */
- dtrace_probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4]);
+ dtrace_probe(id, uargs[0].u, uargs[1].u, uargs[2].u, uargs[3].u,
+ uargs[4].u);
}
#endif
@@ -199,7 +211,7 @@ systrace_getargdesc(void *arg, dtrace_id
}
static void
-systrace_provide(void *arg, dtrace_probedesc_t *desc)
+systrace_provide(void *arg, const dtrace_probedesc_t *desc)
{
int i;
@@ -238,7 +250,7 @@ systrace_destroy(void *
CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt
Module Name:src Committed By: riz Date: Sun Jan 12 17:48:59 UTC 2014 Modified Files: src/external/cddl/osnet/dist/tools/ctf/cvt: ctfmerge.c Log Message: Field width is an int, so cast the result of strlen() appropriately. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.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/dist/tools/ctf/cvt/ctfmerge.c diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.5 src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.6 --- src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c:1.5 Thu Feb 25 00:18:44 2010 +++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c Sun Jan 12 17:48:59 2014 @@ -238,7 +238,7 @@ usage(void) "\n" " Note: if -L labelenv is specified and labelenv is not set in\n" " the environment, a default value is used.\n", - progname, progname, strlen(progname), " ", + progname, progname, (int)strlen(progname), " ", progname, progname); }
CVS commit: src/external/cddl/osnet/usr.sbin/dtrace
Module Name:src
Committed By: riz
Date: Sun Jan 12 17:48:26 UTC 2014
Modified Files:
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
Log Message:
Disable the extra-args warning for printf formats in dtrace.c
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/usr.sbin/dtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/usr.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.4 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.5
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.4 Mon Feb 22 12:21:27 2010
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Sun Jan 12 17:48:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/02/22 12:21:27 tron Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/12 17:48:25 riz Exp $
# $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -6,6 +6,7 @@
.include "../../Makefile.inc"
PROG= dtrace
+MAN= dtrace.1
BINDIR?= /usr/sbin
@@ -28,6 +29,7 @@ CFLAGS+= -I${OSNETDIR}/sys \
#YFLAGS+= -d
COPTS.dtrace.c += -Wno-stack-protector
+COPTS.dtrace.c += -Wno-stack-protector -Wno-format-extra-args
LDFLAGS+= -pthread
@@ -39,4 +41,5 @@ LDFLAGS+= -L${LIBCTF_OBJDIR} -lctf
LDADD+= -ly -ll -lelf -lz
+
.include
CVS commit: [netbsd-6-1] src/distrib/notes/common
Module Name:src Committed By: bouyer Date: Sun Jan 12 16:06:49 UTC 2014 Modified Files: src/distrib/notes/common [netbsd-6-1]: main Log Message: Formating fixes. To generate a diff of this commit: cvs rdiff -u -r1.484.2.6.2.3 -r1.484.2.6.2.4 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.484.2.6.2.3 src/distrib/notes/common/main:1.484.2.6.2.4 --- src/distrib/notes/common/main:1.484.2.6.2.3 Sun Jan 12 15:11:58 2014 +++ src/distrib/notes/common/main Sun Jan 12 16:06:49 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.484.2.6.2.3 2014/01/12 15:11:58 bouyer Exp $ +.\" $NetBSD: main,v 1.484.2.6.2.4 2014/01/12 16:06:49 bouyer Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -462,7 +462,7 @@ wouldn't exist. .Pp .Nx \*V -is the second critical/security update of the NetBSD 6.1 release branch. +is the third critical/security update of the NetBSD 6.1 release branch. It represents a selected subset of fixes deemed critical for security or stability reasons. .Pp @@ -504,14 +504,12 @@ NetBSD 6.1.2: .Ss2 Kernel .(bullet .Xr pci 4 : -Work around a qemu bug preventing NetBSD from booting on some versions of QEMU and KVM. -(PR#45671): +Work around a QEMU bug preventing NetBSD from booting on some versions of QEMU and KVM. (PR#45671): .Lk http://gnats.netbsd.org/45671 .It Xen: fix dom0 crash with some domUs .It -Xen: remove a bogus diagostic message spamming the console. -(PR#46313): +Xen: remove a bogus diagostic message spamming the console. (PR#46313): .Lk http://gnats.netbsd.org/46313 .bullet) . @@ -530,17 +528,14 @@ ffs: Fixed a fsck_ffs internal error on .Ss2 Miscellaneous .(bullet .Xr Xserver 1 : -Fixed crash on i810e. -(PR#48315): +Fixed crash on i810e. (PR#48315): .Lk http://gnats.netbsd.org/48315 .It .Xr sysinst 8 : -Fixed wrong MBR partiton offset on small disks. -(PR#48304): +Fixed wrong MBR partiton offset on small disks. (PR#48304): .Lk http://gnats.netbsd.org/48304 .Xr ld.elf_so 1 : -Fixed memory corruption. -(PR#48324): +Fixed memory corruption. (PR#48324): .Lk http://gnats.netbsd.org/48324 .It sparc64: fix a kernel diagnostic panic.
CVS commit: [netbsd-6-0] src/distrib/notes/common
Module Name:src Committed By: bouyer Date: Sun Jan 12 16:06:37 UTC 2014 Modified Files: src/distrib/notes/common [netbsd-6-0]: main Log Message: Formating fixes. To generate a diff of this commit: cvs rdiff -u -r1.484.2.4.2.4 -r1.484.2.4.2.5 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.484.2.4.2.4 src/distrib/notes/common/main:1.484.2.4.2.5 --- src/distrib/notes/common/main:1.484.2.4.2.4 Sun Jan 12 15:11:17 2014 +++ src/distrib/notes/common/main Sun Jan 12 16:06:36 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.484.2.4.2.4 2014/01/12 15:11:17 bouyer Exp $ +.\" $NetBSD: main,v 1.484.2.4.2.5 2014/01/12 16:06:36 bouyer Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -498,14 +498,12 @@ NetBSD 6.0.3: .Ss2 Kernel .(bullet .Xr pci 4 : -Work around a qemu bug preventing NetBSD from booting on some versions of QEMU and KVM. -(PR#45671): +Work around a QEMU bug preventing NetBSD from booting on some versions of QEMU and KVM. (PR#45671): .Lk http://gnats.netbsd.org/45671 .It Xen: fix dom0 crash with some domUs .It -Xen: remove a bogus diagostic message spamming the console. -(PR#46313): +Xen: remove a bogus diagostic message spamming the console. (PR#46313): .Lk http://gnats.netbsd.org/46313 .bullet) . @@ -522,17 +520,14 @@ ffs: Fixed a fsck_ffs internal error on .Ss2 Miscellaneous .(bullet .Xr Xserver 1 : -Fixed crash on i810e. -(PR#48315): +Fixed crash on i810e. (PR#48315): .Lk http://gnats.netbsd.org/48315 .It .Xr sysinst 8 : -Fixed wrong MBR partiton offset on small disks. -(PR#48304): +Fixed wrong MBR partiton offset on small disks. (PR#48304): .Lk http://gnats.netbsd.org/48304 .Xr ld.elf_so 1 : -Fixed memory corruption. -(PR#48324): +Fixed memory corruption. (PR#48324): .Lk http://gnats.netbsd.org/48324 .It sparc64: fix a kernel diagnostic panic.
CVS commit: src/sys/arch
Module Name:src Committed By: tsutsui Date: Sun Jan 12 15:26:31 UTC 2014 Modified Files: src/sys/arch/acorn26/stand: Makefile.buildboot src/sys/arch/acorn32/stand: Makefile.buildboot src/sys/arch/alpha/stand: Makefile.bootprogs src/sys/arch/arc/stand/boot: Makefile src/sys/arch/atari/stand/bootxx: Makefile.bootxx src/sys/arch/atari/stand/bootxxx: Makefile.bootxxx src/sys/arch/atari/stand/xxboot: Makefile.xxboot src/sys/arch/atari/stand/xxboot/ahdi-sdb00t: Makefile.sdb00t src/sys/arch/atari/stand/xxboot/ahdi-wdb00t: Makefile src/sys/arch/atari/stand/xxboot/ahdi-xxboot: Makefile.xxb src/sys/arch/atari/stand/xxboot/fdboot: Makefile.fdboot src/sys/arch/atari/stand/xxboot/sdboot: Makefile.sdboot src/sys/arch/atari/stand/xxboot/wdboot: Makefile src/sys/arch/bebox/stand/boot: Makefile src/sys/arch/cobalt/stand/boot: Makefile src/sys/arch/emips/stand: Makefile.booters src/sys/arch/evbarm/stand/boot2440: Makefile src/sys/arch/evbarm/stand/bootimx23: Makefile src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot src/sys/arch/ews4800mips/stand: Makefile.bootxx src/sys/arch/ews4800mips/stand/boot: Makefile src/sys/arch/hp300/stand: Makefile.buildboot src/sys/arch/hp700/stand: Makefile.buildboot src/sys/arch/hp700/stand/xxboot: Makefile src/sys/arch/i386/stand: Makefile.booters src/sys/arch/i386/stand/boot: Makefile.boot src/sys/arch/i386/stand/bootxx: Makefile.bootxx src/sys/arch/i386/stand/cdboot: Makefile src/sys/arch/i386/stand/fatboot: Makefile.fat src/sys/arch/i386/stand/mbr: Makefile.mbr src/sys/arch/ia64/stand/ia64: Makefile.booters src/sys/arch/landisk/stand: Makefile.bootprogs src/sys/arch/landisk/stand/mbr: Makefile.mbr src/sys/arch/luna68k/stand: Makefile.inc src/sys/arch/macppc/stand/bootxx: Makefile src/sys/arch/macppc/stand/ofwboot: Makefile src/sys/arch/mipsco/stand: Makefile.booters src/sys/arch/mmeye/stand/boot: Makefile src/sys/arch/mvme68k/stand: Makefile.booters src/sys/arch/mvmeppc/stand: Makefile.booters src/sys/arch/news68k/stand: Makefile.inc src/sys/arch/newsmips/stand: Makefile.inc src/sys/arch/next68k/stand/boot: Makefile src/sys/arch/ofppc/stand/ofwboot: Makefile src/sys/arch/pmax/stand: Makefile.booters src/sys/arch/prep/stand/boot: Makefile src/sys/arch/rs6000/stand/boot: Makefile src/sys/arch/sandpoint/stand/altboot: Makefile src/sys/arch/sbmips/stand: Makefile.bootprogs src/sys/arch/sgimips/stand: Makefile.booters src/sys/arch/shark/stand/ofwboot: Makefile src/sys/arch/sparc/stand/bootxx: Makefile src/sys/arch/sparc/stand/ofwboot: Makefile src/sys/arch/sun68k/stand: Makefile.inc src/sys/arch/x68k/stand: Makefile.booters src/sys/arch/zaurus/stand/zboot: Makefile Log Message: Add empty LIBCRTI= as LIBCRT0 to build sa programs without installed DESTDIR. XXX: probabry we should have bsd.saprog.mk or something. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn26/stand/Makefile.buildboot cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn32/stand/Makefile.buildboot cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/stand/Makefile.bootprogs cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/stand/boot/Makefile cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/stand/bootxx/Makefile.bootxx cvs rdiff -u -r1.7 -r1.8 src/sys/arch/atari/stand/bootxxx/Makefile.bootxxx cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/stand/xxboot/Makefile.xxboot cvs rdiff -u -r1.3 -r1.4 \ src/sys/arch/atari/stand/xxboot/ahdi-sdb00t/Makefile.sdb00t cvs rdiff -u -r1.9 -r1.10 \ src/sys/arch/atari/stand/xxboot/ahdi-wdb00t/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/sys/arch/atari/stand/xxboot/ahdi-xxboot/Makefile.xxb cvs rdiff -u -r1.3 -r1.4 \ src/sys/arch/atari/stand/xxboot/fdboot/Makefile.fdboot cvs rdiff -u -r1.3 -r1.4 \ src/sys/arch/atari/stand/xxboot/sdboot/Makefile.sdboot cvs rdiff -u -r1.9 -r1.10 src/sys/arch/atari/stand/xxboot/wdboot/Makefile cvs rdiff -u -r1.33 -r1.34 src/sys/arch/bebox/stand/boot/Makefile cvs rdiff -u -r1.25 -r1.26 src/sys/arch/cobalt/stand/boot/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/arch/emips/stand/Makefile.booters cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/stand/boot2440/Makefile cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/stand/bootimx23/Makefile cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ews4800mips/stand/Makefile.bootxx cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ews4800mips/stand/boot/Makefile cvs rdiff -u -r1.32 -r1.33 src/sys/arch/hp300/stand/Makefile.buildboot cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp700/stand/Makefile.buildboot cvs
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: tsutsui
Date: Sun Jan 12 15:19:57 UTC 2014
Modified Files:
src/sys/lib/libsa: Makefile
Removed Files:
src/sys/lib/libsa: exec.c
Log Message:
Remove obsolete exec.c for a.out. It was superseded by loadfile() long ago.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/lib/libsa/Makefile
cvs rdiff -u -r1.28 -r0 src/sys/lib/libsa/exec.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/lib/libsa/Makefile
diff -u src/sys/lib/libsa/Makefile:1.79 src/sys/lib/libsa/Makefile:1.80
--- src/sys/lib/libsa/Makefile:1.79 Wed Aug 21 08:30:50 2013
+++ src/sys/lib/libsa/Makefile Sun Jan 12 15:19:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2013/08/21 08:30:50 matt Exp $
+# $NetBSD: Makefile,v 1.80 2014/01/12 15:19:57 tsutsui Exp $
LIB= sa
LIBISPRIVATE?= yes
@@ -28,10 +28,6 @@ SRCS+= alloc.c errno.c exit.c files.c \
panic.c printf.c qsort.c snprintf.c sprintf.c strerror.c \
subr_prf.c twiddle.c vsprintf.c checkpasswd.c
-.if (${MACHINE_CPU} != "mips")
-SRCS+= exec.c
-.endif
-
# string routines
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
SRCS+= memcmp.c memcpy.c memmove.c memset.c strchr.c
CVS commit: [netbsd-6-1] src/distrib/notes/common
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 15:11:58 UTC 2014
Modified Files:
src/distrib/notes/common [netbsd-6-1]: main
Log Message:
Sync release notes with changes since 6.1.2
To generate a diff of this commit:
cvs rdiff -u -r1.484.2.6.2.2 -r1.484.2.6.2.3 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.484.2.6.2.2 src/distrib/notes/common/main:1.484.2.6.2.3
--- src/distrib/notes/common/main:1.484.2.6.2.2 Thu Sep 26 15:42:10 2013
+++ src/distrib/notes/common/main Sun Jan 12 15:11:58 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.484.2.6.2.2 2013/09/26 15:42:10 riz Exp $
+.\" $NetBSD: main,v 1.484.2.6.2.3 2014/01/12 15:11:58 bouyer Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -458,7 +458,7 @@ possible, it's likely that
wouldn't exist.
.
.if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 6.1.1 and 6.1.2 Releases
+.Ss Changes Between The NetBSD 6.1.2 and 6.1.3 Releases
.Pp
.Nx
\*V
@@ -467,14 +467,34 @@ It represents a selected subset of fixes
or stability reasons.
.Pp
The complete list of changes can be found in the
-CHANGES-6.1.2:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.1.2/CHANGES-6.1.2
-file in the top level directory of the NetBSD 6.1.2 release tree. An abbreviated list is as follows:
+CHANGES-6.1.3:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.1.3/CHANGES-6.1.3
+file in the top level directory of the NetBSD 6.1.3 release tree. An abbreviated list is as follows:
.Ss2 Security Advisory Fixes
.(bullet
-NetBSD-SA2013-009:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-009.txt.asc
-user settable small BPF buffer can cause a panic
+NetBSD-SA2013-010:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-010.txt.asc
+Use after free in Xserver handling of ImageText requests (CVE-2013-4396)
+.It
+NetBSD-SA2013-011:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-011.txt.asc
+embryonic TCP sockets local DoS
+.It
+NetBSD-SA2013-012:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-012.txt.asc
+Router Advertisement sysctl local Denial of Service
+.It
+NetBSD-SA2013-013:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-013.txt.asc
+Memory leak when trying to execute bogus ELF binaries
+.It
+NetBSD-SA2014-001:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2014-001.txt.asc
+Stack buffer overflow in libXfont (CVE-2013-6462)
+.It
+NetBSD-SA2014-002:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2014-002.txt.asc
+ntpd used as DDoS amplifier
.bullet)
.
.Pp
@@ -483,57 +503,49 @@ NetBSD 6.1.2:
.Lk http://www.NetBSD.org/support/security/patches-6.1.2.html .
.Ss2 Kernel
.(bullet
-.Xr virtio 4 :
-Fixed a panic during shutdown on KVM.
-(PR#48105):
-.Lk http://gnats.netbsd.org/48105
-.It
-.Xr uhci 4 :
-Fixed USB device enumeration in some cases, fixed some ops on big-endian machines.
-(PR#47522, :
-.Lk http://gnats.netbsd.org/47522
-PR#48237):
-.Lk http://gnats.netbsd.org/48237
+.Xr pci 4 :
+Work around a qemu bug preventing NetBSD from booting on some versions of QEMU and KVM.
+(PR#45671):
+.Lk http://gnats.netbsd.org/45671
+.It
+Xen: fix dom0 crash with some domUs
+.It
+Xen: remove a bogus diagostic message spamming the console.
+(PR#46313):
+.Lk http://gnats.netbsd.org/46313
.bullet)
.
.Ss2 Networking
.(bullet
-Include BRDADDR and NETMASK in the IPv4 ioctls we ban for IPv6.
+NPF: fix byteorder for port range comparison.
.It
-.Xr npf 3 :
-Fixed panic with IPv6 when nbufs are reallocated.
-.It
-.Xr npf 3 :
-Fixed filtering with dynamic rules.
+NPF: fix a race condition.
.bullet)
.
.Ss2 File Systems
.(bullet
-udf: Fixed a problem which could result in garbage after the 4GB limit.
+ffs: Fixed a fsck_ffs internal error on UFS1.
.bullet)
.
.Ss2 Miscellaneous
.(bullet
-.Xr pthread 3 :
-Fixed error return from pthread_create() in some cases.
-.It
-Update tzdata to 2013e.
-.It
-Update some TNF ssh keys in /etc/ssh/ssh_known_hosts.
+.Xr Xserver 1 :
+Fixed crash on i810e.
+(PR#48315):
+.Lk http://gnats.netbsd.org/48315
+.It
+.Xr sysinst 8 :
+Fixed wrong MBR partiton offset on small disks.
+(PR#48304):
+.Lk http://gnats.netbsd.org/48304
+.Xr ld.elf_so 1 :
+Fixed memory corruption.
+(PR#48324):
+.Lk http://gnats.netbsd.org/48324
.It
-Fixed an environment issue which could cause crashes in Emacs 24 and certain other applications.
+sparc64: fix a kernel diagnostic panic.
.It
-pkg_install: Fixed installation of signed packages.
-(PR#48194):
-.Lk http://gnats.netbsd.org/48194
-.It
-Fixed regression introduced in NetBSD 6.1.1 affecting certain applications running under X.
-(PR#48170):
-.Lk http://gnats.netbsd.org/48170
-.It
-mvme68k: Fixed boot panic.
-(PR#45
CVS commit: [netbsd-6-0] src/distrib/notes/common
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 15:11:17 UTC 2014
Modified Files:
src/distrib/notes/common [netbsd-6-0]: main
Log Message:
Sync release notes with changes since 6.0.3
To generate a diff of this commit:
cvs rdiff -u -r1.484.2.4.2.3 -r1.484.2.4.2.4 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.484.2.4.2.3 src/distrib/notes/common/main:1.484.2.4.2.4
--- src/distrib/notes/common/main:1.484.2.4.2.3 Thu Sep 26 15:41:52 2013
+++ src/distrib/notes/common/main Sun Jan 12 15:11:17 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.484.2.4.2.3 2013/09/26 15:41:52 riz Exp $
+.\" $NetBSD: main,v 1.484.2.4.2.4 2014/01/12 15:11:17 bouyer Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -458,120 +458,86 @@ possible, it's likely that
wouldn't exist.
.
.if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 6.0.2 and 6.0.3 Releases
+.Ss Changes Between The NetBSD 6.0.3 and 6.0.4 Releases
.Pp
The complete list of changes can be found in the
-CHANGES-6.0.3:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0.3/CHANGES-6.0.3
-file in the top level directory of the NetBSD 6.0.3 release tree. An abbreviated list is as follows:
+CHANGES-6.0.4:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0.4/CHANGES-6.0.4
+file in the top level directory of the NetBSD 6.0.4 release tree. An abbreviated list is as follows:
.Ss2 Security Advisory Fixes
.(bullet
-NetBSD-SA2013-005:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-005.txt.asc
-bind Denial of Service (CVE-2013-4854)
-.It
-NetBSD-SA2013-006:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-006.txt.asc
-Arbitrary Kernel Read with netstat -P
-.It
-NetBSD-SA2013-007:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-007.txt.asc
-Protocol handling issues in X Window System client libraries
-.It
-NetBSD-SA2013-008:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-008.txt.asc
-Error in authorization check re tcpdrop sysctl
-.It
-NetBSD-SA2013-009:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-009.txt.asc
-user settable small BPF buffer can cause a panic
+NetBSD-SA2013-010:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-010.txt.asc
+Use after free in Xserver handling of ImageText requests (CVE-2013-4396)
+.It
+NetBSD-SA2013-011:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-011.txt.asc
+embryonic TCP sockets local DoS
+.It
+NetBSD-SA2013-012:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-012.txt.asc
+Router Advertisement sysctl local Denial of Service
+.It
+NetBSD-SA2013-013:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-013.txt.asc
+Memory leak when trying to execute bogus ELF binaries
+.It
+NetBSD-SA2014-001:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2014-001.txt.asc
+Stack buffer overflow in libXfont (CVE-2013-6462)
+.It
+NetBSD-SA2014-002:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2014-002.txt.asc
+ntpd used as DDoS amplifier
.bullet)
.
.Pp
-Advisories prior to NetBSD-SA2013-005 do not affect
+Advisories prior to NetBSD-SA2013-009 do not affect
NetBSD 6.0.3:
.Lk http://www.NetBSD.org/support/security/patches-6.0.3.html .
.Ss2 Kernel
.(bullet
-.Xr virtio 4 :
-Fixed a panic during shutdown on KVM.
-(PR#48105):
-.Lk http://gnats.netbsd.org/48105
-.It
-.Xr uhci 4 :
-Fixed USB device enumeration in some cases, fixed some ops on big-endian machines.
-(PR#47522, :
-.Lk http://gnats.netbsd.org/47522
-PR#48237):
-.Lk http://gnats.netbsd.org/48237
+.Xr pci 4 :
+Work around a qemu bug preventing NetBSD from booting on some versions of QEMU and KVM.
+(PR#45671):
+.Lk http://gnats.netbsd.org/45671
+.It
+Xen: fix dom0 crash with some domUs
+.It
+Xen: remove a bogus diagostic message spamming the console.
+(PR#46313):
+.Lk http://gnats.netbsd.org/46313
.bullet)
.
.Ss2 Networking
.(bullet
-Include BRDADDR and NETMASK in the IPv4 ioctls we ban for IPv6.
-.It
-Added 4 new sysctls to help avoid IPv6 DoS attacks.
-.It
-Prevent a panic in
-.Xr mpls 4
-due to kmem abuse.
-.It
-Fixed a crash destroying
-.Xr tap 4
-interfaces after deleting the link-local address.
-(PR#47576):
-.Lk http://gnats.netbsd.org/47576
+NPF: fix byteorder for port range comparison.
.bullet)
.
.Ss2 File Systems
.(bullet
-nilfs: Fixed a serious file-read problem.
-(PR#45605):
-.Lk http://gnats.netbsd.org/45605
-.It
-procfs: Fixed a problem in an error case in procfs_domap().
-(PR#48048):
-.Lk http://gnats.netbsd.org/48048
-.It
-udf: Fixed a problem which could result in garbage after the 4GB limit.
+ffs: Fixed a fsck_ffs internal error on UFS1.
.bullet)
.
.Ss2 Miscellaneous
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 13:37:33 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: ticket 1012 To generate a diff of this commit: cvs rdiff -u -r1.1.2.79 -r1.1.2.80 src/doc/CHANGES-6.2 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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.79 src/doc/CHANGES-6.2:1.1.2.80 --- src/doc/CHANGES-6.2:1.1.2.79 Sun Jan 12 12:41:24 2014 +++ src/doc/CHANGES-6.2 Sun Jan 12 13:37:33 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.79 2014/01/12 12:41:24 bouyer Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.80 2014/01/12 13:37:33 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1248,3 +1248,8 @@ sys/arch/next68k/next68k/pmap_bootstrap. this is the last possible m68k MD part of this PR. [tsutsui, ticket #1008] +external/mit/xf86-input-elographics/dist/src/xf86Elo.c 1.5 + + Add support for inverted axis, from upstream repository. + [mbalmer, ticket #1012] +
CVS commit: [netbsd-6] xsrc/external/mit/xf86-input-elographics/dist/src
Module Name:xsrc
Committed By: bouyer
Date: Sun Jan 12 13:37:07 UTC 2014
Modified Files:
xsrc/external/mit/xf86-input-elographics/dist/src [netbsd-6]: xf86Elo.c
Log Message:
Pull up following revision(s) (requested by mbalmer in ticket #1012):
external/mit/xf86-input-elographics/dist/src/xf86Elo.c: revision 1.5
Add support for inverted axis, from upstream repository.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c
diff -u xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.2 xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.2.2.1
--- xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c:1.2 Sat Jul 23 21:56:54 2011
+++ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c Sun Jan 12 13:37:07 2014
@@ -360,6 +360,22 @@ xf86EloReadInput(InputInfoPtr pInfo)
cur_y = WORD_ASSEMBLY(priv->packet_buf[5], priv->packet_buf[6]);
state = priv->packet_buf[2] & 0x07;
+ DBG(5, ErrorF("ELO got: x(%d), y(%d), %s\n",
+ cur_x, cur_y,
+ (state == ELO_PRESS) ? "Press" :
+ ((state == ELO_RELEASE) ? "Release" : "Stream")));
+
+ if (priv->min_y > priv->max_y) {
+/* inverted y axis */
+cur_y = priv->max_y - cur_y + priv->min_y;
+ }
+
+ if (priv->min_x > priv->max_x) {
+/* inverted x axis */
+cur_x = priv->max_x - cur_x + priv->min_x;
+ }
+
+
/*
* Send events.
*
@@ -676,6 +692,7 @@ xf86EloControl(DeviceIntPtr dev,
unsigned char reply[ELO_PACKET_SIZE];
Atom btn_label;
Atom axis_labels[2] = { 0, 0 };
+ int x0, x1, y0, y1;
switch(mode) {
@@ -719,10 +736,20 @@ xf86EloControl(DeviceIntPtr dev,
return !Success;
}
else {
+
+ /* Correct the coordinates for possibly inverted axis.
+ Leave priv->variables untouched so we can check for
+ inversion on incoming events.
+ */
+ y0 = min(priv->min_y, priv->max_y);
+ y1 = max(priv->min_y, priv->max_y);
+ x0 = min(priv->min_x, priv->max_x);
+ x1 = max(priv->min_x, priv->max_x);
+
/* I will map coordinates myself */
InitValuatorAxisStruct(dev, 0,
axis_labels[0],
- -1, -1,
+ x0, x1,
9500,
0 /* min_res */,
9500 /* max_res */
@@ -732,7 +759,7 @@ xf86EloControl(DeviceIntPtr dev,
);
InitValuatorAxisStruct(dev, 1,
axis_labels[1],
- -1, -1,
+ y0, y1,
10500,
0 /* min_res */,
10500 /* max_res */
@@ -854,6 +881,11 @@ xf86EloControl(DeviceIntPtr dev,
DBG(2, ErrorF("Done\n"));
return Success;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
+ case DEVICE_ABORT:
+return Success;
+#endif
+
default:
ErrorF("unsupported mode=%d\n", mode);
return !Success;
CVS commit: [netbsd-6] src/sys/arch/next68k/next68k
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:41:12 UTC 2014
Modified Files:
src/sys/arch/next68k/next68k [netbsd-6]: pmap_bootstrap.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1008):
sys/arch/next68k/next68k/pmap_bootstrap.c: revision 1.43
Move physmem calculations before nptpage initialization.
Should fix next68k specific part of PR port-m68k/45915
(panic: pmap_enter_ptpage: can't get KPT page), and
this is the last possible m68k MD part of this PR.
Note this change is not tested on the actual machine (yet),
but as noted in comment next68k/pmap_bootstrap.c is based on
the mvme68k one which has been fixed by the similar diff.
Should be pulled up to all netbsd-6 branches.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/arch/next68k/next68k/pmap_bootstrap.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/next68k/next68k/pmap_bootstrap.c
diff -u src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.42 src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.42.2.1
--- src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.42 Fri Feb 10 06:28:39 2012
+++ src/sys/arch/next68k/next68k/pmap_bootstrap.c Sun Jan 12 12:41:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.42 2012/02/10 06:28:39 mhitch Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.42.2.1 2014/01/12 12:41:12 bouyer Exp $ */
/*
* This file was taken from mvme68k/mvme68k/pmap_bootstrap.c
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.42 2012/02/10 06:28:39 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.42.2.1 2014/01/12 12:41:12 bouyer Exp $");
#include "opt_m68k_arch.h"
@@ -111,6 +111,42 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
#endif
/*
+ * Initialize the mem_clusters[] array for the crash dump
+ * code. While we're at it, compute the total amount of
+ * physical memory in the system.
+ */
+ for (i = 0; i < VM_PHYSSEG_MAX; i++) {
+ if (RELOC(phys_seg_list[i].ps_start, paddr_t) ==
+ RELOC(phys_seg_list[i].ps_end, paddr_t)) {
+ /*
+ * No more memory.
+ */
+ break;
+ }
+
+ /*
+ * Make sure these are properly rounded.
+ */
+ RELOC(phys_seg_list[i].ps_start, paddr_t) =
+ m68k_round_page(RELOC(phys_seg_list[i].ps_start,
+ paddr_t));
+ RELOC(phys_seg_list[i].ps_end, paddr_t) =
+ m68k_trunc_page(RELOC(phys_seg_list[i].ps_end,
+ paddr_t));
+
+ size = RELOC(phys_seg_list[i].ps_end, paddr_t) -
+ RELOC(phys_seg_list[i].ps_start, paddr_t);
+
+ RELOC(mem_clusters[i].start, u_quad_t) =
+ RELOC(phys_seg_list[i].ps_start, paddr_t);
+ RELOC(mem_clusters[i].size, u_quad_t) = size;
+
+ RELOC(physmem, int) += size >> PGSHIFT;
+
+ RELOC(mem_cluster_cnt, int) += 1;
+ }
+
+ /*
* Calculate important physical addresses:
*
* lwp0upa lwp0 u-area UPAGES pages
@@ -484,42 +520,6 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
RELOC(lwp0uarea, vaddr_t) = lwp0upa - firstpa;
/*
- * Initialize the mem_clusters[] array for the crash dump
- * code. While we're at it, compute the total amount of
- * physical memory in the system.
- */
- for (i = 0; i < VM_PHYSSEG_MAX; i++) {
- if (RELOC(phys_seg_list[i].ps_start, paddr_t) ==
- RELOC(phys_seg_list[i].ps_end, paddr_t)) {
- /*
- * No more memory.
- */
- break;
- }
-
- /*
- * Make sure these are properly rounded.
- */
- RELOC(phys_seg_list[i].ps_start, paddr_t) =
- m68k_round_page(RELOC(phys_seg_list[i].ps_start,
- paddr_t));
- RELOC(phys_seg_list[i].ps_end, paddr_t) =
- m68k_trunc_page(RELOC(phys_seg_list[i].ps_end,
- paddr_t));
-
- size = RELOC(phys_seg_list[i].ps_end, paddr_t) -
- RELOC(phys_seg_list[i].ps_start, paddr_t);
-
- RELOC(mem_clusters[i].start, u_quad_t) =
- RELOC(phys_seg_list[i].ps_start, paddr_t);
- RELOC(mem_clusters[i].size, u_quad_t) = size;
-
- RELOC(physmem, int) += size >> PGSHIFT;
-
- RELOC(mem_cluster_cnt, int) += 1;
- }
-
- /*
* Scoot the start of available on-board RAM forward to
* account for:
*
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:41:24 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: ticket 1008 To generate a diff of this commit: cvs rdiff -u -r1.1.2.78 -r1.1.2.79 src/doc/CHANGES-6.2 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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.78 src/doc/CHANGES-6.2:1.1.2.79 --- src/doc/CHANGES-6.2:1.1.2.78 Sun Jan 12 12:38:31 2014 +++ src/doc/CHANGES-6.2 Sun Jan 12 12:41:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.78 2014/01/12 12:38:31 bouyer Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.79 2014/01/12 12:41:24 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1240,3 +1240,11 @@ sys/arch/evbsh3/t_sh7706lan/ssumci.c 1. fix CS bit, fixing card detection. [nonaka, ticket #1007] +sys/arch/next68k/next68k/pmap_bootstrap.c 1.43 + + Move physmem calculations before nptpage initialization. + Should fix next68k specific part of PR port-m68k/45915 + (panic: pmap_enter_ptpage: can't get KPT page), and + this is the last possible m68k MD part of this PR. + [tsutsui, ticket #1008] +
CVS commit: [netbsd-6-1] src/sys/arch/evbsh3/t_sh7706lan
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:38:37 UTC 2014
Modified Files:
src/sys/arch/evbsh3/t_sh7706lan [netbsd-6-1]: ssumci.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1007):
sys/arch/evbsh3/t_sh7706lan/ssumci.c: revision 1.3
fix CS bit.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.16.1 src/sys/arch/evbsh3/t_sh7706lan/ssumci.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/evbsh3/t_sh7706lan/ssumci.c
diff -u src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2.16.1
--- src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2 Sat Jan 21 19:44:29 2012
+++ src/sys/arch/evbsh3/t_sh7706lan/ssumci.c Sun Jan 12 12:38:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ssumci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
+/* $NetBSD: ssumci.c,v 1.2.16.1 2014/01/12 12:38:37 bouyer Exp $ */
/*-
* Copyright (C) 2010 NONAKA Kimihiro
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.2.16.1 2014/01/12 12:38:37 bouyer Exp $");
#include
#include
@@ -151,7 +151,7 @@ do { \
#define SCPDR_CMD 0x04
#define SCPCR_CS_MASK 0x000C
#define SCPCR_CS_OUT 0x0004
-#define SCPDR_CS 0x08
+#define SCPDR_CS 0x02
#define SCPCR_EJECT 0x00C0
#define SCPDR_EJECT 0x08
CVS commit: [netbsd-6-0] src/sys/arch/evbsh3/t_sh7706lan
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:38:35 UTC 2014
Modified Files:
src/sys/arch/evbsh3/t_sh7706lan [netbsd-6-0]: ssumci.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1007):
sys/arch/evbsh3/t_sh7706lan/ssumci.c: revision 1.3
fix CS bit.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/arch/evbsh3/t_sh7706lan/ssumci.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/evbsh3/t_sh7706lan/ssumci.c
diff -u src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2.8.1
--- src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2 Sat Jan 21 19:44:29 2012
+++ src/sys/arch/evbsh3/t_sh7706lan/ssumci.c Sun Jan 12 12:38:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ssumci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
+/* $NetBSD: ssumci.c,v 1.2.8.1 2014/01/12 12:38:35 bouyer Exp $ */
/*-
* Copyright (C) 2010 NONAKA Kimihiro
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.2.8.1 2014/01/12 12:38:35 bouyer Exp $");
#include
#include
@@ -151,7 +151,7 @@ do { \
#define SCPDR_CMD 0x04
#define SCPCR_CS_MASK 0x000C
#define SCPCR_CS_OUT 0x0004
-#define SCPDR_CS 0x08
+#define SCPDR_CS 0x02
#define SCPCR_EJECT 0x00C0
#define SCPDR_EJECT 0x08
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:38:49 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.4 Log Message: ticket 1007 To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.0.4 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-6.0.4 diff -u src/doc/CHANGES-6.0.4:1.1.2.14 src/doc/CHANGES-6.0.4:1.1.2.15 --- src/doc/CHANGES-6.0.4:1.1.2.14 Sun Jan 12 12:36:16 2014 +++ src/doc/CHANGES-6.0.4 Sun Jan 12 12:38:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.4,v 1.1.2.14 2014/01/12 12:36:16 bouyer Exp $ +# $NetBSD: CHANGES-6.0.4,v 1.1.2.15 2014/01/12 12:38:49 bouyer Exp $ A complete list of changes from the NetBSD 6.0.3 release to the NetBSD 6.0.4 release: @@ -161,3 +161,8 @@ external/gpl3/gcc/dist/gcc/config/sparc/ This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. [martin, ticket #1006] +sys/arch/evbsh3/t_sh7706lan/ssumci.c 1.3 + + fix CS bit, fixing card detection. + [nonaka, ticket #1007] +
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:38:49 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.3 Log Message: ticket 1007 To generate a diff of this commit: cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/doc/CHANGES-6.1.3 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-6.1.3 diff -u src/doc/CHANGES-6.1.3:1.1.2.15 src/doc/CHANGES-6.1.3:1.1.2.16 --- src/doc/CHANGES-6.1.3:1.1.2.15 Sun Jan 12 12:36:17 2014 +++ src/doc/CHANGES-6.1.3 Sun Jan 12 12:38:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.3,v 1.1.2.15 2014/01/12 12:36:17 bouyer Exp $ +# $NetBSD: CHANGES-6.1.3,v 1.1.2.16 2014/01/12 12:38:49 bouyer Exp $ A complete list of changes from the NetBSD 6.1.2 release to the NetBSD 6.1.3 release: @@ -169,3 +169,8 @@ external/gpl3/gcc/dist/gcc/config/sparc/ This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. [martin, ticket #1006] +sys/arch/evbsh3/t_sh7706lan/ssumci.c 1.3 + + fix CS bit, fixing card detection. + [nonaka, ticket #1007] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:38:31 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: ticket 1007 To generate a diff of this commit: cvs rdiff -u -r1.1.2.77 -r1.1.2.78 src/doc/CHANGES-6.2 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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.77 src/doc/CHANGES-6.2:1.1.2.78 --- src/doc/CHANGES-6.2:1.1.2.77 Sun Jan 12 12:36:13 2014 +++ src/doc/CHANGES-6.2 Sun Jan 12 12:38:31 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.77 2014/01/12 12:36:13 bouyer Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.78 2014/01/12 12:38:31 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1235,3 +1235,8 @@ external/gpl3/gcc/dist/gcc/config/sparc/ This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. [martin, ticket #1006] +sys/arch/evbsh3/t_sh7706lan/ssumci.c 1.3 + + fix CS bit, fixing card detection. + [nonaka, ticket #1007] +
CVS commit: [netbsd-6] src/sys/arch/evbsh3/t_sh7706lan
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:38:13 UTC 2014
Modified Files:
src/sys/arch/evbsh3/t_sh7706lan [netbsd-6]: ssumci.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1007):
sys/arch/evbsh3/t_sh7706lan/ssumci.c: revision 1.3
fix CS bit.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/arch/evbsh3/t_sh7706lan/ssumci.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/evbsh3/t_sh7706lan/ssumci.c
diff -u src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2 src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2.2.1
--- src/sys/arch/evbsh3/t_sh7706lan/ssumci.c:1.2 Sat Jan 21 19:44:29 2012
+++ src/sys/arch/evbsh3/t_sh7706lan/ssumci.c Sun Jan 12 12:38:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ssumci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $ */
+/* $NetBSD: ssumci.c,v 1.2.2.1 2014/01/12 12:38:13 bouyer Exp $ */
/*-
* Copyright (C) 2010 NONAKA Kimihiro
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.2 2012/01/21 19:44:29 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssumci.c,v 1.2.2.1 2014/01/12 12:38:13 bouyer Exp $");
#include
#include
@@ -151,7 +151,7 @@ do { \
#define SCPDR_CMD 0x04
#define SCPCR_CS_MASK 0x000C
#define SCPCR_CS_OUT 0x0004
-#define SCPDR_CS 0x08
+#define SCPDR_CS 0x02
#define SCPCR_EJECT 0x00C0
#define SCPDR_EJECT 0x08
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:36:16 UTC 2014 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.4 Log Message: ticket 1006 To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-6.0.4 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-6.0.4 diff -u src/doc/CHANGES-6.0.4:1.1.2.13 src/doc/CHANGES-6.0.4:1.1.2.14 --- src/doc/CHANGES-6.0.4:1.1.2.13 Tue Jan 7 18:03:20 2014 +++ src/doc/CHANGES-6.0.4 Sun Jan 12 12:36:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.4,v 1.1.2.13 2014/01/07 18:03:20 bouyer Exp $ +# $NetBSD: CHANGES-6.0.4,v 1.1.2.14 2014/01/12 12:36:16 bouyer Exp $ A complete list of changes from the NetBSD 6.0.3 release to the NetBSD 6.0.4 release: @@ -152,3 +152,12 @@ xsrc/xfree/xc/lib/font/bitmap/bdfread.c with huge input data. [wiz, ticket #1011] +external/gpl3/gcc/dist/gcc/config/sparc/constraints.md 1.2 +external/gpl3/gcc/dist/gcc/config/sparc/predicates.md 1.2 +external/gpl3/gcc/dist/gcc/config/sparc/sync.md 1.2 + + Port from newer gcc, fixes compile errors (invalid asm generated + by gcc). + This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. + [martin, ticket #1006] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:36:13 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: ticket 1006 To generate a diff of this commit: cvs rdiff -u -r1.1.2.76 -r1.1.2.77 src/doc/CHANGES-6.2 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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.76 src/doc/CHANGES-6.2:1.1.2.77 --- src/doc/CHANGES-6.2:1.1.2.76 Sun Jan 12 12:26:30 2014 +++ src/doc/CHANGES-6.2 Sun Jan 12 12:36:13 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.76 2014/01/12 12:26:30 bouyer Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.77 2014/01/12 12:36:13 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1226,3 +1226,12 @@ sys/arch/luna68k/dev/omrasopsvar.h 1.2 much more work). [tsutsui, ticket #1005] +external/gpl3/gcc/dist/gcc/config/sparc/constraints.md 1.2 +external/gpl3/gcc/dist/gcc/config/sparc/predicates.md 1.2 +external/gpl3/gcc/dist/gcc/config/sparc/sync.md 1.2 + + Port from newer gcc, fixes compile errors (invalid asm generated + by gcc). + This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. + [martin, ticket #1006] +
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:36:17 UTC 2014 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.3 Log Message: ticket 1006 To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/CHANGES-6.1.3 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-6.1.3 diff -u src/doc/CHANGES-6.1.3:1.1.2.14 src/doc/CHANGES-6.1.3:1.1.2.15 --- src/doc/CHANGES-6.1.3:1.1.2.14 Fri Jan 10 12:31:33 2014 +++ src/doc/CHANGES-6.1.3 Sun Jan 12 12:36:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.3,v 1.1.2.14 2014/01/10 12:31:33 sborrill Exp $ +# $NetBSD: CHANGES-6.1.3,v 1.1.2.15 2014/01/12 12:36:17 bouyer Exp $ A complete list of changes from the NetBSD 6.1.2 release to the NetBSD 6.1.3 release: @@ -160,3 +160,12 @@ xsrc/xfree/xc/lib/font/bitmap/bdfread.c with huge input data. [wiz, ticket #1011] +external/gpl3/gcc/dist/gcc/config/sparc/constraints.md 1.2 +external/gpl3/gcc/dist/gcc/config/sparc/predicates.md 1.2 +external/gpl3/gcc/dist/gcc/config/sparc/sync.md 1.2 + + Port from newer gcc, fixes compile errors (invalid asm generated + by gcc). + This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. + [martin, ticket #1006] +
CVS commit: [netbsd-6-1] src/external/gpl3/gcc/dist/gcc/config/sparc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:35:44 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/sparc [netbsd-6-1]: constraints.md predicates.md sync.md Log Message: Pull up following revision(s) (requested by martin in ticket #1006): external/gpl3/gcc/dist/gcc/config/sparc/constraints.md: revision 1.2 external/gpl3/gcc/dist/gcc/config/sparc/predicates.md: revision 1.2 external/gpl3/gcc/dist/gcc/config/sparc/sync.md: revision 1.2 Port from newer gcc: Add a "mem_noofs_operand" predicate and corresponding "w" constraint. Use those instead of "memory_reg_operand"/"m" for some atomic instrinsic patterns: casx (and friends) do not accept an offset from the pointer register (they are synthetic instructions mapping to e.g. casxa [..] ASI_P, ... and the opcode space encoding offsets in other instructions is needed to encode the ASI here). This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.16.1 \ src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md \ src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md \ src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1.16.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1 Tue Jun 21 01:22:24 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md Sun Jan 12 12:35:43 2014 @@ -141,6 +141,10 @@ "Memory reference for 'e' constraint floating-point register" (and (match_code "mem,reg") (match_test "memory_ok_for_ldd (op)"))) + +(define_memory_constraint "w" + "A memory with only a base register" + (match_operand 0 "mem_noofs_operand")) (define_constraint "Y" "The vector zero constant" Index: src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1.16.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1 Tue Jun 21 01:22:24 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md Sun Jan 12 12:35:43 2014 @@ -427,6 +427,9 @@ (and (match_code "mem") (match_test "call_address_operand (XEXP (op, 0), mode)"))) +(define_predicate "mem_noofs_operand" + (and (match_code "mem") + (match_code "reg" "0"))) ;; Predicates for operators. Index: src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1.16.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1 Tue Jun 21 01:22:25 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md Sun Jan 12 12:35:43 2014 @@ -81,7 +81,7 @@ (define_insn "*sync_compare_and_swap" [(set (match_operand:I48MODE 0 "register_operand" "=r") - (match_operand:I48MODE 1 "memory_reg_operand" "+m")) + (match_operand:I48MODE 1 "mem_noofs_operand" "+w")) (set (match_dup 1) (unspec_volatile:I48MODE [(match_operand:I48MODE 2 "register_operand" "r") @@ -93,7 +93,7 @@ (define_insn "*sync_compare_and_swapdi_v8plus" [(set (match_operand:DI 0 "register_operand" "=h") - (match_operand:DI 1 "memory_reg_operand" "+m")) + (match_operand:DI 1 "mem_noofs_operand" "+w")) (set (match_dup 1) (unspec_volatile:DI [(match_operand:DI 2 "register_operand" "h")
CVS commit: [netbsd-6-0] src/external/gpl3/gcc/dist/gcc/config/sparc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:35:39 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/sparc [netbsd-6-0]: constraints.md predicates.md sync.md Log Message: Pull up following revision(s) (requested by martin in ticket #1006): external/gpl3/gcc/dist/gcc/config/sparc/constraints.md: revision 1.2 external/gpl3/gcc/dist/gcc/config/sparc/predicates.md: revision 1.2 external/gpl3/gcc/dist/gcc/config/sparc/sync.md: revision 1.2 Port from newer gcc: Add a "mem_noofs_operand" predicate and corresponding "w" constraint. Use those instead of "memory_reg_operand"/"m" for some atomic instrinsic patterns: casx (and friends) do not accept an offset from the pointer register (they are synthetic instructions mapping to e.g. casxa [..] ASI_P, ... and the opcode space encoding offsets in other instructions is needed to encode the ASI here). This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \ src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md \ src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md \ src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1.10.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1 Tue Jun 21 01:22:24 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md Sun Jan 12 12:35:39 2014 @@ -141,6 +141,10 @@ "Memory reference for 'e' constraint floating-point register" (and (match_code "mem,reg") (match_test "memory_ok_for_ldd (op)"))) + +(define_memory_constraint "w" + "A memory with only a base register" + (match_operand 0 "mem_noofs_operand")) (define_constraint "Y" "The vector zero constant" Index: src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1.10.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1 Tue Jun 21 01:22:24 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md Sun Jan 12 12:35:39 2014 @@ -427,6 +427,9 @@ (and (match_code "mem") (match_test "call_address_operand (XEXP (op, 0), mode)"))) +(define_predicate "mem_noofs_operand" + (and (match_code "mem") + (match_code "reg" "0"))) ;; Predicates for operators. Index: src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1.10.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1 Tue Jun 21 01:22:25 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md Sun Jan 12 12:35:39 2014 @@ -81,7 +81,7 @@ (define_insn "*sync_compare_and_swap" [(set (match_operand:I48MODE 0 "register_operand" "=r") - (match_operand:I48MODE 1 "memory_reg_operand" "+m")) + (match_operand:I48MODE 1 "mem_noofs_operand" "+w")) (set (match_dup 1) (unspec_volatile:I48MODE [(match_operand:I48MODE 2 "register_operand" "r") @@ -93,7 +93,7 @@ (define_insn "*sync_compare_and_swapdi_v8plus" [(set (match_operand:DI 0 "register_operand" "=h") - (match_operand:DI 1 "memory_reg_operand" "+m")) + (match_operand:DI 1 "mem_noofs_operand" "+w")) (set (match_dup 1) (unspec_volatile:DI [(match_operand:DI 2 "register_operand" "h")
CVS commit: [netbsd-6] src/external/gpl3/gcc/dist/gcc/config/sparc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:35:12 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/sparc [netbsd-6]: constraints.md predicates.md sync.md Log Message: Pull up following revision(s) (requested by martin in ticket #1006): external/gpl3/gcc/dist/gcc/config/sparc/constraints.md: revision 1.2 external/gpl3/gcc/dist/gcc/config/sparc/predicates.md: revision 1.2 external/gpl3/gcc/dist/gcc/config/sparc/sync.md: revision 1.2 Port from newer gcc: Add a "mem_noofs_operand" predicate and corresponding "w" constraint. Use those instead of "memory_reg_operand"/"m" for some atomic instrinsic patterns: casx (and friends) do not accept an offset from the pointer register (they are synthetic instructions mapping to e.g. casxa [..] ASI_P, ... and the opcode space encoding offsets in other instructions is needed to encode the ASI here). This fixes the build of gtk+-3.10.6 from pkgsrc on sparc64. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \ src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md \ src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md \ src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1.4.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md:1.1.1.1 Tue Jun 21 01:22:24 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md Sun Jan 12 12:35:12 2014 @@ -141,6 +141,10 @@ "Memory reference for 'e' constraint floating-point register" (and (match_code "mem,reg") (match_test "memory_ok_for_ldd (op)"))) + +(define_memory_constraint "w" + "A memory with only a base register" + (match_operand 0 "mem_noofs_operand")) (define_constraint "Y" "The vector zero constant" Index: src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1.4.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md:1.1.1.1 Tue Jun 21 01:22:24 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md Sun Jan 12 12:35:12 2014 @@ -427,6 +427,9 @@ (and (match_code "mem") (match_test "call_address_operand (XEXP (op, 0), mode)"))) +(define_predicate "mem_noofs_operand" + (and (match_code "mem") + (match_code "reg" "0"))) ;; Predicates for operators. Index: src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1.4.1 --- src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md:1.1.1.1 Tue Jun 21 01:22:25 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/sync.md Sun Jan 12 12:35:12 2014 @@ -81,7 +81,7 @@ (define_insn "*sync_compare_and_swap" [(set (match_operand:I48MODE 0 "register_operand" "=r") - (match_operand:I48MODE 1 "memory_reg_operand" "+m")) + (match_operand:I48MODE 1 "mem_noofs_operand" "+w")) (set (match_dup 1) (unspec_volatile:I48MODE [(match_operand:I48MODE 2 "register_operand" "r") @@ -93,7 +93,7 @@ (define_insn "*sync_compare_and_swapdi_v8plus" [(set (match_operand:DI 0 "register_operand" "=h") - (match_operand:DI 1 "memory_reg_operand" "+m")) + (match_operand:DI 1 "mem_noofs_operand" "+w")) (set (match_dup 1) (unspec_volatile:DI [(match_operand:DI 2 "register_operand" "h")
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:26:30 UTC 2014 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Tickets 1000 - 1005 To generate a diff of this commit: cvs rdiff -u -r1.1.2.75 -r1.1.2.76 src/doc/CHANGES-6.2 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-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.75 src/doc/CHANGES-6.2:1.1.2.76 --- src/doc/CHANGES-6.2:1.1.2.75 Tue Jan 7 18:03:26 2014 +++ src/doc/CHANGES-6.2 Sun Jan 12 12:26:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.75 2014/01/07 18:03:26 bouyer Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.76 2014/01/12 12:26:30 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -1174,3 +1174,55 @@ xsrc/xfree/xc/lib/font/bitmap/bdfread.c with huge input data. [wiz, ticket #1011] +sys/arch/luna68k/conf/GENERIC 1.106, 1.109, 1.110 + + Enable cd at scsibus, just works on LUNA-II. + Add and enable wsmux(4) in GENERIC (for mlterm-fb demonstration). + Enable file-system CD9660 to make cd(4) actually usable. + [tsutsui, ticket #1000] + +sys/arch/x68k/x68k/locore.s 1.111 +sys/arch/x68k/x68k/machdep.c 1.187 +sys/arch/x68k/x68k/pmap_bootstrap.c 1.60 + + Probe extended memories before pmap_boostrap() for actual fix of + PR/45915. + Also expand expected maximum extended memory regions to recognize + upto 1008 MB RAM that is supported by the XM6i emulator. + [tsutsui, ticket #1001] + +sys/arch/luna68k/luna68k/disksubr.c 1.30 + + Make the default disklabel (for disks without label) have saner value. + [tsutsui, ticket #1002] + +sys/arch/luna68k/dev/timekeeper.c 1.11 - 1.13 +sys/arch/luna68k/dev/timekeeper.h 1.3 + + Fix offset of DS1287A NVRAM address on LUNA-II. + Add an initialization function of DS1287A RTC and call it during + attach, so that the RTC oscillator is started properly after + replacement. + [tsutsui, ticket #1003] + +sys/arch/luna68k/dev/lunaws.c 1.25 - 1.27 +sys/arch/luna68k/dev/siotty.c 1.34 - 1.38 +sys/arch/luna68k/dev/siovar.h 1.7 + + Use softint(9) to pass received data into wskbd(9) and wsmouse(9) + layers. + Use softint(9) properly to process TX/RX data between tty(4) layer. + Handle cnmagic(9) properly (now entering ddb(4) by console BREAK works) + [tsutsui, ticket #1004] + +sys/arch/luna68k/dev/lunafb.c 1.27 - 1.30 +sys/arch/luna68k/dev/omrasops.c 1.14 - 1.16 +sys/arch/luna68k/dev/omrasopsvar.h 1.2 + + Properly initialize the palette for while on black even on 1bpp + framebuffer. Add preleminary support of 4bpp LUNA framebuffer. + Now we can use ANSI 16 color text console and also can demonstrate + mlterm-fb with color sixel graphics and wallpaper (Xserver needs + much more work). + [tsutsui, ticket #1005] +
CVS commit: [netbsd-6] src/sys/arch/luna68k/dev
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:25:03 UTC 2014
Modified Files:
src/sys/arch/luna68k/dev [netbsd-6]: lunafb.c omrasops.c omrasopsvar.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1005):
sys/arch/luna68k/dev/omrasops.c: revision 1.15
sys/arch/luna68k/dev/omrasops.c: revision 1.16
sys/arch/luna68k/dev/lunafb.c: revision 1.27
sys/arch/luna68k/dev/lunafb.c: revision 1.28
sys/arch/luna68k/dev/lunafb.c: revision 1.29
sys/arch/luna68k/dev/lunafb.c: revision 1.30
sys/arch/luna68k/dev/omrasopsvar.h: revision 1.2
sys/arch/luna68k/dev/omrasops.c: revision 1.14
Properly initialize the palette for while on black even on 1bpp framebuffer.
Preparing for demonstration in Open Source Conference 2013 Kyoto.
Fix off by one in copyrows() backward case.
Make omrasops copycols() op work even if columns are not 32 bit aligned.
This means command line editing works properly in any cases.
The bitcopy strategies for 1bpp copycols() op are taken from
recently fixed MI sys/dev/rasops/rasops_bitops.h.
GETBITS() and PUTBITS() m68k asm macro are taken from hp300.
Tested on both 1bpp (on LUNA-II) and 4bpp (on LUNA) framebuffers.
Initialize capabilities in struct wsscreen_descr per omrasops settings.
Now REVERSE characters are drawn properly.
Add preleminary support of 4bpp LUNA framebuffer.
Changes details:
- prepare and switch 4bpp rasops functions that read/write all 4 planes
and also handle both fg and bg colors
- make 1bpp ops use first plane on write rather than common bitmap plane
(which is prepared for multiple plane write with raster ops)
- prepare 4bpp allocattr function to handle ANSI 16 color text
- split omrasops_init() function for each bpp
- move struct hwcmap from softc to hwdevconfig to sync palette values
on initialization
- allow mmap(2) against all available planes
Now we can use ANSI 16 color text console and also can
demonstrate mlterm-fb with color sixel graphics and wallpaper.
XXX: Xserver needs much more work.
Pull a fix of Bt458 (8bpp framebuffer) initialization from OpenBSD/luna88k.
http://marc.info/?l=openbsd-cvs&m=138838884202196
> Correct initialization of Bt458, used in LUNA's 8bpp frame buffer.
>
> According to the manual, the address register does not automatically
> increment when we access to the control registers. Also we disable
> overlay planes, because we do not use them.
To generate a diff of this commit:
cvs rdiff -u -r1.25.8.1 -r1.25.8.2 src/sys/arch/luna68k/dev/lunafb.c
cvs rdiff -u -r1.11.8.1 -r1.11.8.2 src/sys/arch/luna68k/dev/omrasops.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/luna68k/dev/omrasopsvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.25.8.1 src/sys/arch/luna68k/dev/lunafb.c:1.25.8.2
--- src/sys/arch/luna68k/dev/lunafb.c:1.25.8.1 Wed Jul 25 21:30:35 2012
+++ src/sys/arch/luna68k/dev/lunafb.c Sun Jan 12 12:25:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.25.8.1 2012/07/25 21:30:35 martin Exp $ */
+/* $NetBSD: lunafb.c,v 1.25.8.2 2014/01/12 12:25:03 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.25.8.1 2012/07/25 21:30:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.25.8.2 2014/01/12 12:25:03 bouyer Exp $");
#include
#include
@@ -82,27 +82,50 @@ struct bt458 {
#define OMFB_RAMDAC 0xC110 /* Bt454/Bt458 RAMDAC */
#define OMFB_SIZE (0xB130 - 0xB108 + PAGE_SIZE)
+struct hwcmap {
+#define CMAP_SIZE 256
+ uint8_t r[CMAP_SIZE];
+ uint8_t g[CMAP_SIZE];
+ uint8_t b[CMAP_SIZE];
+};
+
+static const struct {
+ uint8_t r;
+ uint8_t g;
+ uint8_t b;
+} ansicmap[16] = {
+ {0,0,0},
+ { 0x80,0,0},
+ {0, 0x80,0},
+ { 0x80, 0x80,0},
+ {0,0, 0x80},
+ { 0x80,0, 0x80},
+ {0, 0x80, 0x80},
+ { 0xc0, 0xc0, 0xc0},
+ { 0x80, 0x80, 0x80},
+ { 0xff,0,0},
+ {0, 0xff,0},
+ { 0xff, 0xff,0},
+ {0,0, 0xff},
+ { 0xff,0, 0xff},
+ {0, 0xff, 0xff},
+ { 0xff, 0xff, 0xff},
+};
+
struct om_hwdevconfig {
int dc_wid; /* width of frame buffer */
int dc_ht; /* height of frame buffer */
int dc_depth; /* depth, bits per pixel */
int dc_rowbytes; /* bytes in a FB scan line */
int dc_cmsize; /* colormap size */
+ struct hwcmap dc_cmap; /* software copy of colormap */
vaddr_t dc_videobase; /* base of flat frame buffer */
struct rasops_info dc_ri; /* raster blitter variables */
};
-struct hwcmap {
-#define CMAP_SIZE 256
- uint8_t r[CMAP_SIZE];
- uint8_t g[CMAP_SIZE];
- uint8_t b[CMAP_SIZE];
-};
-
struct omfb_softc {
device_t sc_dev; /* base device */
struct om_hwdevconfig *sc_dc; /* device configuration */
- struct hwcm
CVS commit: [netbsd-6] src/sys/arch/luna68k/dev
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:21:16 UTC 2014
Modified Files:
src/sys/arch/luna68k/dev [netbsd-6]: lunaws.c siotty.c siovar.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1004):
sys/arch/luna68k/dev/siotty.c: revision 1.35
sys/arch/luna68k/dev/siotty.c: revision 1.36
sys/arch/luna68k/dev/siotty.c: revision 1.37
sys/arch/luna68k/dev/siotty.c: revision 1.38
sys/arch/luna68k/dev/lunaws.c: revision 1.25
sys/arch/luna68k/dev/lunaws.c: revision 1.26
sys/arch/luna68k/dev/lunaws.c: revision 1.27
sys/arch/luna68k/dev/siovar.h: revision 1.7
sys/arch/luna68k/dev/siotty.c: revision 1.34
struct device * -> device_t, use device_xname() (from chs@)
Whitespace cleanup.
Use softint(9) to pass received data into wskbd(9) and wsmouse(9) layers.
It might be problematic to call them from an interrupt handler at IPL_SERIAL.
Tab/space cleanup.
Use softint(9) properly to process TX/RX data between tty(4) layer.
It could cause possible locking issue to call tty(4) layer functions
from IPL_SERIAL interrupt handlers.
Changes details (mostly similar to com(4) and z8530tty(4)):
- allocate RX buffer and put data and status into it in the interrupt handler
- call t_linesw->l_rint from the software interrupt handler
- set the only first byte in siottystart() and use t_outq buffer to send
multiple TX data
- call the next t_linesw->l_start on TX complete in the software interrupt
handler
Also put more changes:
- handle cnmagic(9) properly (now entering ddb(4) by console BREAK works)
- allocate tty in the attach function as other drivers rather than first open
- use proper variable types
Remove initialization of unused t_softc in struct tty (to make pullup easier).
To generate a diff of this commit:
cvs rdiff -u -r1.23.8.1 -r1.23.8.2 src/sys/arch/luna68k/dev/lunaws.c
cvs rdiff -u -r1.33 -r1.33.4.1 src/sys/arch/luna68k/dev/siotty.c
cvs rdiff -u -r1.6 -r1.6.8.1 src/sys/arch/luna68k/dev/siovar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/dev/lunaws.c
diff -u src/sys/arch/luna68k/dev/lunaws.c:1.23.8.1 src/sys/arch/luna68k/dev/lunaws.c:1.23.8.2
--- src/sys/arch/luna68k/dev/lunaws.c:1.23.8.1 Wed Jul 25 21:30:35 2012
+++ src/sys/arch/luna68k/dev/lunaws.c Sun Jan 12 12:21:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.23.8.1 2012/07/25 21:30:35 martin Exp $ */
+/* $NetBSD: lunaws.c,v 1.23.8.2 2014/01/12 12:21:16 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.23.8.1 2012/07/25 21:30:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.23.8.2 2014/01/12 12:21:16 bouyer Exp $");
#include "wsmouse.h"
@@ -51,6 +51,10 @@ __KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1
#include "ioconf.h"
+#define OMKBD_RXQ_LEN 64
+#define OMKBD_RXQ_LEN_MASK (OMKBD_RXQ_LEN - 1)
+#define OMKBD_NEXTRXQ(x) (((x) + 1) & OMKBD_RXQ_LEN_MASK)
+
static const uint8_t ch1_regs[6] = {
WR0_RSTINT,/* Reset E/S Interrupt */
WR1_RXALLS,/* Rx per char, No Tx */
@@ -64,12 +68,16 @@ struct ws_softc {
device_t sc_dev;
struct sioreg *sc_ctl;
uint8_t sc_wr[6];
- struct device *sc_wskbddev;
+ device_t sc_wskbddev;
+ uint8_t sc_rxq[OMKBD_RXQ_LEN];
+ u_int sc_rxqhead;
+ u_int sc_rxqtail;
#if NWSMOUSE > 0
- struct device *sc_wsmousedev;
+ device_t sc_wsmousedev;
int sc_msreport;
- int buttons, dx, dy;
+ int sc_msbuttons, sc_msdx, sc_msdy;
#endif
+ void *sc_si;
};
static void omkbd_input(void *, int);
@@ -111,6 +119,7 @@ static const struct wsmouse_accessops om
#endif
static void wsintr(int);
+static void wssoftintr(void *);
static int wsmatch(device_t, cfdata_t, void *);
static void wsattach(device_t, device_t, void *);
@@ -143,7 +152,7 @@ wsattach(device_t parent, device_t self,
sc->sc_ctl = (struct sioreg *)scp->scp_ctl + 1;
memcpy(sc->sc_wr, ch1_regs, sizeof(ch1_regs));
scp->scp_intr[1] = wsintr;
-
+
setsioreg(sc->sc_ctl, WR0, sc->sc_wr[WR0]);
setsioreg(sc->sc_ctl, WR4, sc->sc_wr[WR4]);
setsioreg(sc->sc_ctl, WR3, sc->sc_wr[WR3]);
@@ -153,6 +162,11 @@ wsattach(device_t parent, device_t self,
syscnputc((dev_t)1, 0x20); /* keep quiet mouse */
+ sc->sc_rxqhead = 0;
+ sc->sc_rxqtail = 0;
+
+ sc->sc_si = softint_establish(SOFTINT_SERIAL, wssoftintr, sc);
+
aprint_normal("\n");
a.console = (args->hwflags == 1);
@@ -165,7 +179,7 @@ wsattach(device_t parent, device_t self,
{
struct wsmousedev_attach_args b;
b.accessops = &omms_accessops;
- b.accesscookie = (void *)sc;
+ b.accesscookie = (void *)sc;
sc->sc_wsmousedev =
config_found_ia(self, "wsmousedev", &b, wsmousedevprint);
sc->sc_msreport = 0;
@@ -179,7 +193,7 @@ wsintr(int chan)
{
struct ws_softc *sc = device_lookup_private(&ws_
CVS commit: [netbsd-6] src/sys/arch/luna68k/dev
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:16:51 UTC 2014
Modified Files:
src/sys/arch/luna68k/dev [netbsd-6]: timekeeper.c timekeeper.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1003):
sys/arch/luna68k/dev/timekeeper.h: revision 1.3
sys/arch/luna68k/dev/timekeeper.c: revision 1.11
sys/arch/luna68k/dev/timekeeper.c: revision 1.12
sys/arch/luna68k/dev/timekeeper.c: revision 1.13
Whitespace cleanup.
Fix offset of DS1287A NVRAM address on LUNA-II.
Add an initialization function of DS1287A RTC and call it during attach.
It looks the boot firmware doesn't initialize the control registers
of DS1287A (while it resets NVRAM settings) and RTC oscillator is not
started properly after replacement.
Now my LUNA-II can keep RTC properly even after reboot.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/luna68k/dev/timekeeper.c
cvs rdiff -u -r1.2 -r1.2.40.1 src/sys/arch/luna68k/dev/timekeeper.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/dev/timekeeper.c
diff -u src/sys/arch/luna68k/dev/timekeeper.c:1.10 src/sys/arch/luna68k/dev/timekeeper.c:1.10.8.1
--- src/sys/arch/luna68k/dev/timekeeper.c:1.10 Wed Jul 27 14:17:55 2011
+++ src/sys/arch/luna68k/dev/timekeeper.c Sun Jan 12 12:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: timekeeper.c,v 1.10 2011/07/27 14:17:55 tsutsui Exp $ */
+/* $NetBSD: timekeeper.c,v 1.10.8.1 2014/01/12 12:16:51 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: timekeeper.c,v 1.10 2011/07/27 14:17:55 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timekeeper.c,v 1.10.8.1 2014/01/12 12:16:51 bouyer Exp $");
#include
#include
@@ -58,6 +58,7 @@ struct timekeeper_softc {
static int clock_match(device_t, cfdata_t, void *);
static void clock_attach(device_t, device_t, void *);
+static void dsclock_init(struct timekeeper_softc *);
CFATTACH_DECL_NEW(clock, sizeof (struct timekeeper_softc),
clock_match, clock_attach, NULL, NULL);
@@ -93,16 +94,17 @@ clock_attach(device_t parent, device_t s
sc->sc_nvramsize = 2040;
sc->sc_todr.todr_gettime_ymdhms = mkclock_get;
sc->sc_todr.todr_settime_ymdhms = mkclock_set;
- sc->sc_todr.cookie = sc;
+ sc->sc_todr.cookie = sc;
aprint_normal(": mk48t02\n");
break;
case LUNA_II: /* Dallas DS1287A */
sc->sc_clock = (void *)ma->ma_addr;
- sc->sc_nvram = (void *)(ma->ma_addr + 50);
+ sc->sc_nvram = (void *)(ma->ma_addr + MC_NREGS);
sc->sc_nvramsize = 50;
sc->sc_todr.todr_gettime_ymdhms = dsclock_get;
sc->sc_todr.todr_settime_ymdhms = dsclock_set;
- sc->sc_todr.cookie = sc;
+ sc->sc_todr.cookie = sc;
+ dsclock_init(sc);
aprint_normal(": ds1287a\n");
break;
}
@@ -161,6 +163,28 @@ mkclock_set(todr_chip_handle_t tch, stru
return 0;
}
+static void
+dsclock_init(struct timekeeper_softc *sc)
+{
+ volatile uint8_t *chiptime = (void *)sc->sc_clock;
+
+ /*
+ * It looks the firmware ROM doesn't initialize DS1287 at all
+ * even after the chip is replaced, so explicitly initialize
+ * control registers here.
+ */
+ chiptime = (void *)sc->sc_clock;
+
+ /* No DSE, 24HR, BINARY */
+ chiptime[MC_REGB] =
+ (chiptime[MC_REGB] & ~MC_REGB_DSE) |
+ (MC_REGB_24HR | MC_REGB_BINARY);
+
+ /* make sure to start integrated clock OSC */
+ chiptime[MC_REGA] =
+ (chiptime[MC_REGA] & ~MC_REGA_DVMASK) | MC_BASE_32_KHz;
+}
+
/*
* Get the time of day, based on the clock's value and/or the base value.
*/
Index: src/sys/arch/luna68k/dev/timekeeper.h
diff -u src/sys/arch/luna68k/dev/timekeeper.h:1.2 src/sys/arch/luna68k/dev/timekeeper.h:1.2.40.1
--- src/sys/arch/luna68k/dev/timekeeper.h:1.2 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/luna68k/dev/timekeeper.h Sun Jan 12 12:16:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: timekeeper.h,v 1.2 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: timekeeper.h,v 1.2.40.1 2014/01/12 12:16:51 bouyer Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,6 +62,7 @@
#define MC_REGA_RSMASK 0x0f/* Interrupt rate select mask (see below) */
#define MC_REGA_DVMASK 0x70/* Divisor select mask (see below) */
#define MC_REGA_UIP0x80/* Update in progress; read only. */
+#define MC_BASE_32_KHz 0x20/* 32 KHz crystal (enable OSC on DS1287) */
#define MC_REGB 0xb /* Control register B */
#define MC_REGB_DSE0x01/* Daylight Savings Enable */
CVS commit: [netbsd-6] src/sys/arch/luna68k/luna68k
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:12:58 UTC 2014
Modified Files:
src/sys/arch/luna68k/luna68k [netbsd-6]: disksubr.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1002):
sys/arch/luna68k/luna68k/disksubr.c: revision 1.30
Make the default disklabel (for disks without label) have saner value.
I.e. use d_secperunit for RAW_PART rather than 0x1fff for part a.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.18.1 src/sys/arch/luna68k/luna68k/disksubr.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/luna68k/luna68k/disksubr.c
diff -u src/sys/arch/luna68k/luna68k/disksubr.c:1.29 src/sys/arch/luna68k/luna68k/disksubr.c:1.29.18.1
--- src/sys/arch/luna68k/luna68k/disksubr.c:1.29 Mon Oct 26 19:16:56 2009
+++ src/sys/arch/luna68k/luna68k/disksubr.c Sun Jan 12 12:12:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.29 2009/10/26 19:16:56 cegger Exp $ */
+/* $NetBSD: disksubr.c,v 1.29.18.1 2014/01/12 12:12:58 bouyer Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -103,7 +103,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29 2009/10/26 19:16:56 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.29.18.1 2014/01/12 12:12:58 bouyer Exp $");
#include
#include
@@ -180,14 +180,20 @@ readdisklabel(dev_t dev, void (*strat)(s
struct disklabel *dlp;
struct sun_disklabel *slp;
int error;
+ int i;
/* minimal requirements for archtypal disk label */
if (lp->d_secperunit == 0)
lp->d_secperunit = 0x1fff;
- lp->d_npartitions = 1;
- if (lp->d_partitions[0].p_size == 0)
- lp->d_partitions[0].p_size = 0x1fff;
- lp->d_partitions[0].p_offset = 0;
+ if (lp->d_npartitions < RAW_PART + 1)
+ lp->d_npartitions = RAW_PART + 1;
+ for (i = 0; i < RAW_PART; i++) {
+ lp->d_partitions[i].p_size = 0;
+ lp->d_partitions[i].p_offset = 0;
+ }
+ if (lp->d_partitions[RAW_PART].p_size == 0)
+ lp->d_partitions[RAW_PART].p_size = lp->d_secperunit;
+ lp->d_partitions[RAW_PART].p_offset = 0;
/* obtain buffer to probe drive with */
bp = geteblk((int)lp->d_secsize);
CVS commit: [netbsd-6] src/sys/arch/x68k/x68k
Module Name:src
Committed By: bouyer
Date: Sun Jan 12 12:10:47 UTC 2014
Modified Files:
src/sys/arch/x68k/x68k [netbsd-6]: locore.s machdep.c pmap_bootstrap.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1001):
sys/arch/x68k/x68k/machdep.c: revision 1.187
sys/arch/x68k/x68k/locore.s: revision 1.111
sys/arch/x68k/x68k/pmap_bootstrap.c: revision 1.60
Probe extended memories before pmap_boostrap() for actual fix of PR/45915.
Also expand expected maximum extended memory regions to recognize
upto 1008 MB RAM that is supported by the XM6i emulator.
See my post on port-x68k@ for more details:
http://mail-index.NetBSD.org/port-x68k/2013/10/19/msg39.html
Probably worth to pullup to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.108.2.1 src/sys/arch/x68k/x68k/locore.s
cvs rdiff -u -r1.181.2.1 -r1.181.2.2 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.58.2.1 -r1.58.2.2 src/sys/arch/x68k/x68k/pmap_bootstrap.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/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.108 src/sys/arch/x68k/x68k/locore.s:1.108.2.1
--- src/sys/arch/x68k/x68k/locore.s:1.108 Thu Dec 22 15:33:30 2011
+++ src/sys/arch/x68k/x68k/locore.s Sun Jan 12 12:10:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.108 2011/12/22 15:33:30 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.108.2.1 2014/01/12 12:10:47 bouyer Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -806,6 +806,8 @@ Lstart1:
#endif
movl #_C_LABEL(end),%d5 | end of static kernel text/data
Lstart2:
+ RELOC(setmemrange,%a0) | call setmemrange()
+ jbsr %a0@ | to probe all memory regions
addl #PAGE_SIZE-1,%d5
andl #PG_FRAME,%d5 | round to a page
movl %d5,%a4
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.181.2.1 src/sys/arch/x68k/x68k/machdep.c:1.181.2.2
--- src/sys/arch/x68k/x68k/machdep.c:1.181.2.1 Wed May 9 20:01:51 2012
+++ src/sys/arch/x68k/x68k/machdep.c Sun Jan 12 12:10:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.181.2.1 2012/05/09 20:01:51 riz Exp $ */
+/* $NetBSD: machdep.c,v 1.181.2.2 2014/01/12 12:10:47 bouyer Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.181.2.1 2012/05/09 20:01:51 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.181.2.2 2014/01/12 12:10:47 bouyer Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -138,10 +138,6 @@ void initcpu(void);
int cpu_dumpsize(void);
int cpu_dump(int (*)(dev_t, daddr_t, void *, size_t), daddr_t *);
void cpu_init_kcore_hdr(void);
-#ifdef EXTENDED_MEMORY
-static int mem_exists(void *, u_long);
-static void setmemrange(void);
-#endif
/* functions called from locore.s */
void x68k_init(void);
@@ -150,6 +146,24 @@ void straytrap(int, u_short);
void nmihand(struct frame);
void intrhand(int);
+/* memory probe function called from locore.s */
+void setmemrange(void);
+#ifdef EXTENDED_MEMORY
+static bool mem_exists(paddr_t, paddr_t);
+#endif
+
+typedef struct {
+ paddr_t start;
+ paddr_t end;
+} phys_seg_t;
+
+static int basemem;
+static phys_seg_t phys_basemem_seg;
+#ifdef EXTENDED_MEMORY
+#define EXTMEM_SEGS (VM_PHYSSEG_MAX - 1)
+static phys_seg_t phys_extmem_seg[EXTMEM_SEGS];
+#endif
+
/*
* On the 68020/68030, the value of delay_divisor is roughly
* 2048 / cpuspeed (where cpuspeed is in MHz).
@@ -175,24 +189,35 @@ x68k_init(void)
{
u_int i;
paddr_t msgbuf_pa;
+ paddr_t s, e;
/*
- * Tell the VM system about available physical memory.
+ * Most m68k ports allocate msgbuf at the end of available memory
+ * (i.e. just after avail_end), but on x68k we allocate msgbuf
+ * at the end of main memory for compatibility.
*/
- uvm_page_physload(atop(avail_start), atop(avail_end),
- atop(avail_start), atop(avail_end),
- VM_FREELIST_MAINMEM);
+ msgbuf_pa = phys_basemem_seg.end - m68k_round_page(MSGBUFSIZE);
/*
- * avail_end was pre-decremented in pmap_bootstrap to compensate
- * for msgbuf pages, but avail_end is also used to check DMA'able
- * memory range for intio devices and it would be updated per
- * probed extended memories, so explicitly save msgbuf address here.
+ * Tell the VM system about available physical memory.
*/
- msgbuf_pa = avail_end;
+ /* load the main memory region */
+ s = avail_start;
+ e = msgbuf_pa;
+ uvm_page_physload(atop(s), atop(e), atop(s), atop(e),
+ VM_FREELIST_MAINMEM);
#ifdef EXTENDED_MEMORY
- setmemrange();
+ /* load extended memory regions */
+ for (i = 0; i < EXTMEM_SEGS; i++) {
+ if (phys_extmem_seg[i].start == phys_extmem_seg[i].end)
+ continue;
+ uvm_page_physload(atop(phys_extmem_seg[i].start),
+ atop(phys_extmem_seg[i].end),
+ atop(phys_extmem_seg[i].start),
+ atop(phys_extmem_seg[i].end),
+ VM_FREELIST_HI
CVS commit: [netbsd-6] src/sys/arch/luna68k/conf
Module Name:src Committed By: bouyer Date: Sun Jan 12 12:08:36 UTC 2014 Modified Files: src/sys/arch/luna68k/conf [netbsd-6]: GENERIC Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1000): sys/arch/luna68k/conf/GENERIC: revision 1.106 sys/arch/luna68k/conf/GENERIC: revision 1.109 sys/arch/luna68k/conf/GENERIC: revision 1.110 Enable cd at scsibus, just works on LUNA-II. Add and enable wsmux(4) in GENERIC (for mlterm-fb demonstration). Enable file-system CD9660 to make cd(4) actually usable. To generate a diff of this commit: cvs rdiff -u -r1.97.2.1 -r1.97.2.2 src/sys/arch/luna68k/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/luna68k/conf/GENERIC diff -u src/sys/arch/luna68k/conf/GENERIC:1.97.2.1 src/sys/arch/luna68k/conf/GENERIC:1.97.2.2 --- src/sys/arch/luna68k/conf/GENERIC:1.97.2.1 Wed Jul 25 21:30:34 2012 +++ src/sys/arch/luna68k/conf/GENERIC Sun Jan 12 12:08:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.97.2.1 2012/07/25 21:30:34 martin Exp $ +# $NetBSD: GENERIC,v 1.97.2.2 2014/01/12 12:08:36 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.97.2.1 $" +#ident "GENERIC-$Revision: 1.97.2.2 $" maxusers 8 @@ -79,7 +79,7 @@ file-system FFS # ufs file system #file-system LFS # log-structured file system file-system NFS # nfs client support file-system MFS -#file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system CD9660 # ISO 9660 + Rock Ridge file system #file-system MSDOSFS # MS-DOS FAT file system file-system KERNFS # /kern file-system PROCFS # /proc @@ -160,8 +160,8 @@ fb0 at mainbus0 # 16 or 256 pseudo colo # Workstation Console attachments wsdisplay* at fb? -wskbd* at ws? console ? -wsmouse* at ws? +wskbd* at ws? console ? mux 1 +wsmouse* at ws? mux 0 # SCSI bus support scsibus* at spc? @@ -169,7 +169,7 @@ scsibus* at spc? # SCSI devices sd* at scsibus? target ? lun ? # SCSI disks st* at scsibus? target ? lun ? # SCSI tapes -#cd* at scsibus? target ? lun ? # SCSI CD-ROMs +cd* at scsibus? target ? lun ? # SCSI CD-ROMs #ch* at scsibus? target ? lun ? # SCSI changer devices #ss* at scsibus? target ? lun ? # SCSI scanners #uk* at scsibus? target ? lun ? # unknown SCSI devices @@ -206,6 +206,8 @@ pseudo-device ksyms # /dev/ksyms #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if +pseudo-device wsmux # mouse & keyboard multiplexsor + # Veriexec # # a pseudo device needed for veriexec
