CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: agc
Date: Wed Feb 29 04:49:50 UTC 2012
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
consolidate all of the volatile /var.* directories which are mounted as tmpfs
into a single one for /var - same as /root, /etc
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/mkimage
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/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.2 src/distrib/utils/embedded/mkimage:1.3
--- src/distrib/utils/embedded/mkimage:1.2 Fri Jan 20 02:19:47 2012
+++ src/distrib/utils/embedded/mkimage Wed Feb 29 04:49:50 2012
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mkimage,v 1.2 2012/01/20 02:19:47 agc Exp $
+# $NetBSD: mkimage,v 1.3 2012/02/29 04:49:50 agc Exp $
# Copyright (c) 2012 Alistair Crooks
# All rights reserved.
@@ -92,7 +92,7 @@ sets="base etc modules"
setsdir=/usr/build/release/$(uname -m)/binary/sets
size=0 # in MB
specialdirs="/kern /proc"
-usermodedirs="/var.run /var.log /etc.cow /root.cow /pkgs"
+usermodedirs="/var.cow /etc.cow /root.cow /pkgs"
sudo="sudo"
while [ $# -gt 0 ]; do
@@ -168,20 +168,16 @@ tmpfs /root.cow tmpfs
# mount /etc as tmpfs on top of existing dir
tmpfs /etc.cowtmpfs rw,-s12M0 0
/etc.cow/etcunion rw,hidden 0 0
-# mount /var/run as tmpfs on top of existing dir
-tmpfs /var.runtmpfs rw,-s1M 0 0
-/var.run/var/rununion rw,hidden - -
-# mount /var/log as tmpfs on top of existing dir
-tmpfs /var.logtmpfs rw,-s10M0 0
-/var.log/var/logunion rw,hidden - -
-tmpfs /var/db tmpfs rw,-s8M 0 0
+# mount /var as tmpfs on top of existing dir
+tmpfs /var.cowtmpfs rw,-s32M 0 0
+/var.cow/varunion rw,hidden - -
tmpfs /tmptmpfs rw,-s32M0 0
/dev/cd0a /cdrom cd9660 ro,noauto
EOF
${sudo} mv ${tmp} /mnt/etc/fstab
cat > ${tmp} << EOF
-# $NetBSD: mkimage,v 1.2 2012/01/20 02:19:47 agc Exp $
+# $NetBSD: mkimage,v 1.3 2012/02/29 04:49:50 agc Exp $
#
# see rc.conf(5) for more information.
#
@@ -201,7 +197,7 @@ fi
rc_configured=YES
# make sure we have the right rw filesystem at boot
-critical_filesystems_local="/var/db /var.run /var/run /var.log /var/log /etc.cow /etc /root.cow /root"
+critical_filesystems_local="/var.cow /var /etc.cow /etc /root.cow /root"
# Add local overrides below
#
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: jmmv
Date: Wed Feb 29 02:40:28 UTC 2012
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Properly find atf configuration files in the source tree. My previous
change dealt properly with etc.tgz only. Addresses PR bin/45870.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.135 src/usr.sbin/postinstall/postinstall:1.136
--- src/usr.sbin/postinstall/postinstall:1.135 Mon Feb 27 17:56:14 2012
+++ src/usr.sbin/postinstall/postinstall Wed Feb 29 02:40:28 2012
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.135 2012/02/27 17:56:14 jmmv Exp $
+# $NetBSD: postinstall,v 1.136 2012/02/29 02:40:28 jmmv Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1598,33 +1598,62 @@ do_tcpdumpchroot()
#
# atf
#
-additem atf "validate the _atf to _tests user/group renaming"
+additem atf "install missing atf configuration files and validate them"
do_atf()
{
[ -n "$1" ] || err 3 "USAGE: do_atf fix|check"
op="$1"
failed=0
- populate_dir "${op}" true \
- "${SRC_DIR}/etc/atf" "${DEST_DIR}/etc/atf" 644 \
- NetBSD.conf atf-run.hooks common.conf
+ # Ensure atf configuration files are in place.
+ if find_file_in_dirlist NetBSD.conf "NetBSD.conf" \
+ "${SRC_DIR}/external/bsd/atf/etc/atf" \
+ "${SRC_DIR}/etc/atf"; then
+ # ${dir} is set by find_file_in_dirlist()
+ populate_dir "${op}" true "${dir}" "${DEST_DIR}/etc/atf" 644 \
+ NetBSD.conf common.conf || failed=1
+ else
+ failed=1
+ fi
+ if find_file_in_dirlist atf-run.hooks "atf-run.hooks" \
+ "${SRC_DIR}/external/bsd/atf/dist/atf-run/sample" \
+ "${SRC_DIR}/etc/atf"; then
+ # ${dir} is set by find_file_in_dirlist()
+ populate_dir "${op}" true "${dir}" "${DEST_DIR}/etc/atf" 644 \
+ atf-run.hooks || failed=1
+ else
+ failed=1
+ fi
+
+ # Validate the _atf to _tests user/group renaming.
+ if [ -f "${DEST_DIR}/etc/atf/common.conf" ]; then
+ handle_atf_user "${op}" || failed=1
+ else
+ failed=1
+ fi
+
+ return ${failed}
+}
+
+handle_atf_user()
+{
+ local op="$1"
+ local failed=0
- if grep '[^#]*unprivileged-user[ \t]*=.*_atf' \
- "${DEST_DIR}/etc/atf/common.conf" >/dev/null
+ local conf="${DEST_DIR}/etc/atf/common.conf"
+ if grep '[^#]*unprivileged-user[ \t]*=.*_atf' "${conf}" >/dev/null
then
if [ "$1" = "fix" ]; then
sed -e \
"/[^#]*unprivileged-user[\ t]*=/s/_atf/_tests/" \
- "${DEST_DIR}/etc/atf/common.conf"\
- >"${DEST_DIR}/etc/atf/common.conf.new"
+ "${conf}" >"${conf}.new"
failed=$(( ${failed} + $? ))
- mv "${DEST_DIR}/etc/atf/common.conf.new" \
- "${DEST_DIR}/etc/atf/common.conf"
+ mv "${conf}.new" "${conf}"
failed=$(( ${failed} + $? ))
+ msg "Set unprivileged-user=_tests in ${conf}"
else
- msg "unprivileged-user=_atf in" \
- "${DEST_DIR}/etc/atf/common.conf" \
- "should be _tests"
+ msg "unprivileged-user=_atf in ${conf} should be" \
+ "unprivileged-user=_tests"
failed=1
fi
fi
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Wed Feb 29 02:02:57 UTC 2012 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: mips_emul.c Log Message: Fix $NetBSD$ To generate a diff of this commit: cvs rdiff -u -r1.14.78.16 -r1.14.78.17 src/sys/arch/mips/mips/mips_emul.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/mips/mips/mips_emul.c diff -u src/sys/arch/mips/mips/mips_emul.c:1.14.78.16 src/sys/arch/mips/mips/mips_emul.c:1.14.78.17 --- src/sys/arch/mips/mips/mips_emul.c:1.14.78.16 Wed Feb 29 01:55:44 2012 +++ src/sys/arch/mips/mips/mips_emul.c Wed Feb 29 02:02:57 2012 @@ -1,4 +1,4 @@ -/* mips_emul.c,v 1.14.78.14 2012/02/13 08:13:42 matt Exp */ +/* $NetBSD: mips_emul.c,v 1.14.78.17 2012/02/29 02:02:57 matt Exp $ */ /* * Copyright (c) 1999 Shuichiro URATA. All rights reserved.
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Wed Feb 29 01:55:45 UTC 2012
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_emul.c
Log Message:
Improve conditions for send_sigsegv.
To generate a diff of this commit:
cvs rdiff -u -r1.14.78.15 -r1.14.78.16 src/sys/arch/mips/mips/mips_emul.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/mips/mips/mips_emul.c
diff -u src/sys/arch/mips/mips/mips_emul.c:1.14.78.15 src/sys/arch/mips/mips/mips_emul.c:1.14.78.16
--- src/sys/arch/mips/mips/mips_emul.c:1.14.78.15 Mon Feb 27 16:59:42 2012
+++ src/sys/arch/mips/mips/mips_emul.c Wed Feb 29 01:55:44 2012
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "mips_emul.c,v 1.14.78
#include /* for VM_MAX_ADDRESS */
#include
-#ifndef NOMIPSEMUL
+#if (!defined(NOMIPSEMUL) && (MIPS1 + MIPS2) > 0) || defined(FPEMUL)
static void send_sigsegv(intptr_t, uint32_t, struct trapframe *, uint32_t);
#endif
static void send_sigill(intptr_t, uint32_t, struct trapframe *, uint32_t,
@@ -263,7 +263,7 @@ mips_emul_inst(uint32_t status, uint32_t
}
}
-#ifndef NOMIPSEMUL
+#if (!defined(NOMIPSEMUL) && (MIPS1 + MIPS2) > 0) || defined(FPEMUL)
static void
send_sigsegv(intptr_t vaddr, uint32_t exccode, struct trapframe *tf,
uint32_t cause)
@@ -821,7 +821,7 @@ mips_emul_lwr(uint32_t inst, struct trap
update_pc(tf, cause);
}
-#if defined(__mips_n32) || defined(__mips_n64) || defined(__mips_o64)
+#if !defined(__mips_o32)
void
mips_emul_lwu(uint32_t inst, struct trapframe *tf, uint32_t cause)
{
@@ -938,7 +938,7 @@ mips_emul_ldr(uint32_t inst, struct trap
update_pc(tf, cause);
}
-#endif /* defined(__mips_n32) || defined(__mips_n64) || defined(__mips_o64) */
+#endif /* !defined(__mips_o32) */
void
mips_emul_sb(uint32_t inst, struct trapframe *tf, uint32_t cause)
@@ -1081,7 +1081,7 @@ mips_emul_swr(uint32_t inst, struct trap
update_pc(tf, cause);
}
-#if defined(__mips_n32) || defined(__mips_n64) || defined(__mips_o64)
+#if !defined(__mips_o32)
void
mips_emul_sd(uint32_t inst, struct trapframe *tf, uint32_t cause)
{
@@ -1178,5 +1178,5 @@ mips_emul_sdr(uint32_t inst, struct trap
update_pc(tf, cause);
}
-#endif /* defined(__mips_n32) || defined(__mips_n64) || defined(__mips_o64) */
+#endif /* !defined(__mips_o32) */
#endif /* defined(FPEMUL) */
CVS commit: src/usr.bin/mail
Module Name:src
Committed By: joerg
Date: Tue Feb 28 22:30:44 UTC 2012
Modified Files:
src/usr.bin/mail: extern.h mime_detach.c
Log Message:
Mark sasprintf as using a printf-like format. Fix format string to use
all arguments by telling the user what file would be overwritten.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/mail/extern.h
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/mail/mime_detach.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mail/extern.h
diff -u src/usr.bin/mail/extern.h:1.31 src/usr.bin/mail/extern.h:1.32
--- src/usr.bin/mail/extern.h:1.31 Fri Apr 10 13:08:24 2009
+++ src/usr.bin/mail/extern.h Tue Feb 28 22:30:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.31 2009/04/10 13:08:24 christos Exp $ */
+/* $NetBSD: extern.h,v 1.32 2012/02/28 22:30:44 joerg Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.2 (Berkeley) 4/20/95
- * $NetBSD: extern.h,v 1.31 2009/04/10 13:08:24 christos Exp $
+ * $NetBSD: extern.h,v 1.32 2012/02/28 22:30:44 joerg Exp $
*/
#ifndef __EXTERN_H__
@@ -294,7 +294,7 @@ int isign(const char *, struct ignoretab
void istrcpy(char *, const char *);
int member(char *, struct ignoretab *);
char * nameof(struct message *, int);
-int sasprintf(char **ret, const char *format, ...);
+int sasprintf(char **ret, const char *format, ...) __printflike(2, 3);
char * savestr(const char *);
struct message *set_m_flag(int, int, int);
char * skin(char *);
Index: src/usr.bin/mail/mime_detach.c
diff -u src/usr.bin/mail/mime_detach.c:1.6 src/usr.bin/mail/mime_detach.c:1.7
--- src/usr.bin/mail/mime_detach.c:1.6 Tue May 24 12:33:22 2011
+++ src/usr.bin/mail/mime_detach.c Tue Feb 28 22:30:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mime_detach.c,v 1.6 2011/05/24 12:33:22 joerg Exp $ */
+/* $NetBSD: mime_detach.c,v 1.7 2012/02/28 22:30:44 joerg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#ifndef __lint__
-__RCSID("$NetBSD: mime_detach.c,v 1.6 2011/05/24 12:33:22 joerg Exp $");
+__RCSID("$NetBSD: mime_detach.c,v 1.7 2012/02/28 22:30:44 joerg Exp $");
#endif /* not __lint__ */
#include
@@ -132,7 +132,7 @@ detach_open_core(char *fname, const char
if (detach_ctl.ask && fd == -1 && errno == EEXIST) {
char *p;
start:
- (void)sasprintf(&p, "%-7s overwrite: Always/Never/once/next/rename (ANonr)[n]? ",
+ (void)sasprintf(&p, "%-7s overwrite %s: Always/Never/once/next/rename (ANonr)[n]? ",
partstr, fname);
p = my_gets(&elm.string, p, NULL);
if (p == NULL)
CVS commit: src/external/gpl3/gdb/lib/libgdb
Module Name:src
Committed By: joerg
Date: Tue Feb 28 22:07:54 UTC 2012
Modified Files:
src/external/gpl3/gdb/lib/libgdb: Makefile
Log Message:
gdb likes to mix different enum types in switches, so disable the check
for clang.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/lib/libgdb/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/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.2 src/external/gpl3/gdb/lib/libgdb/Makefile:1.3
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.2 Mon Sep 26 14:31:25 2011
+++ src/external/gpl3/gdb/lib/libgdb/Makefile Tue Feb 28 22:07:54 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/09/26 14:31:25 christos Exp $
+# $NetBSD: Makefile,v 1.3 2012/02/28 22:07:54 joerg Exp $
.include
@@ -35,6 +35,8 @@ CPPFLAGS+= -I${.CURDIR} \
# code that's never exercised on NetBSD.
CPPFLAGS.inf-ptrace.c= -Wno-error
+CWARNFLAGS.clang+= -Wno-switch
+
.include "../../Makefile.inc"
.include
CVS commit: src/external/mit/lua/lib/liblua
Module Name:src
Committed By: joerg
Date: Tue Feb 28 22:07:16 UTC 2012
Modified Files:
src/external/mit/lua/lib/liblua: Makefile
Log Message:
Disable -Wempty-body here.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/lua/lib/liblua/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/lua/lib/liblua/Makefile
diff -u src/external/mit/lua/lib/liblua/Makefile:1.2 src/external/mit/lua/lib/liblua/Makefile:1.3
--- src/external/mit/lua/lib/liblua/Makefile:1.2 Wed Jan 19 10:14:49 2011
+++ src/external/mit/lua/lib/liblua/Makefile Tue Feb 28 22:07:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/01/19 10:14:49 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2012/02/28 22:07:16 joerg Exp $
LIB= lua
SRCS= lapi.c lauxlib.c lbaselib.c lcode.c ldblib.c ldebug.c ldo.c \
@@ -13,6 +13,7 @@ INCS= lauxlib.h lua.h luaconf.h lualib.
INCSDIR= /usr/include
CFLAGS+= -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+CWARNFLAGS.clang+= -Wno-empty-body
.PATH: ${NETBSDSRCDIR}/external/mit/lua/dist/src
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue Feb 28 21:22:21 UTC 2012
Modified Files:
src/sys/dev/pci: radeonfb.c
Log Message:
let the fifo drain periodically - we need this even in 8 bit on some
hardware, like rv100 paired with a semi-fast CPU
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/radeonfb.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/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.56 src/sys/dev/pci/radeonfb.c:1.57
--- src/sys/dev/pci/radeonfb.c:1.56 Tue Feb 28 20:23:51 2012
+++ src/sys/dev/pci/radeonfb.c Tue Feb 28 21:22:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.56 2012/02/28 20:23:51 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.57 2012/02/28 21:22:20 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.56 2012/02/28 20:23:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.57 2012/02/28 21:22:20 macallan Exp $");
#include
#include
@@ -2672,7 +2672,7 @@ radeonfb_putchar_aa8(void *cookie, int r
int i, x, y, wi, he, r, g, b, aval;
int r1, g1, b1, r0, g0, b0, fgo, bgo;
uint8_t *data8;
- int rv;
+ int rv, cnt;
if (dp->rd_wsmode != WSDISPLAYIO_MODE_EMUL)
return;
@@ -2734,6 +2734,9 @@ radeonfb_putchar_aa8(void *cookie, int r
#define R3G3B2(r, g, b) ((r & 0xe0) | ((g >> 3) & 0x1c) | (b >> 6))
bg8 = R3G3B2(r0, g0, b0);
fg8 = R3G3B2(r1, g1, b1);
+
+ radeonfb_wait_fifo(sc, 20);
+ cnt = 0;
for (i = 0; i < ri->ri_fontscale; i++) {
aval = *data8;
if (aval == 0) {
@@ -2757,6 +2760,11 @@ radeonfb_putchar_aa8(void *cookie, int r
* out
*/
latch = 0;
+ cnt++;
+ if (cnt > 16) {
+cnt = 0;
+radeonfb_wait_fifo(sc, 20);
+ }
}
data8++;
}
CVS commit: src/common/lib/libc/atomic
Module Name:src
Committed By: joerg
Date: Tue Feb 28 20:41:19 UTC 2012
Modified Files:
src/common/lib/libc/atomic: atomic_init_testset.c
Log Message:
Make sure to create the right aliases.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/atomic/atomic_init_testset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/atomic/atomic_init_testset.c
diff -u src/common/lib/libc/atomic/atomic_init_testset.c:1.7 src/common/lib/libc/atomic/atomic_init_testset.c:1.8
--- src/common/lib/libc/atomic/atomic_init_testset.c:1.7 Mon Dec 14 00:39:00 2009
+++ src/common/lib/libc/atomic/atomic_init_testset.c Tue Feb 28 20:41:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_init_testset.c,v 1.7 2009/12/14 00:39:00 matt Exp $ */
+/* $NetBSD: atomic_init_testset.c,v 1.8 2012/02/28 20:41:19 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__RCSID("$NetBSD: atomic_init_testset.c,v 1.7 2009/12/14 00:39:00 matt Exp $");
+__RCSID("$NetBSD: atomic_init_testset.c,v 1.8 2012/02/28 20:41:19 joerg Exp $");
#include "atomic_op_namespace.h"
@@ -135,6 +135,10 @@ __libc_atomic_init(void)
#undef atomic_cas_uint
#undef atomic_cas_ulong
#undef atomic_cas_ptr
+#undef atomic_cas_32_ni
+#undef atomic_cas_uint_ni
+#undef atomic_cas_ulong_ni
+#undef atomic_cas_ptr_ni
atomic_op_alias(atomic_cas_32,_atomic_cas_32)
atomic_op_alias(atomic_cas_uint,_atomic_cas_32)
CVS commit: src/sys/arch/x86/isa
Module Name:src
Committed By: mbalmer
Date: Tue Feb 28 20:26:38 UTC 2012
Modified Files:
src/sys/arch/x86/isa: isa_machdep.c
Log Message:
cosmetic, spelling, and grammar adjustments
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/x86/isa/isa_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/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.31 src/sys/arch/x86/isa/isa_machdep.c:1.32
--- src/sys/arch/x86/isa/isa_machdep.c:1.31 Tue Oct 18 23:43:36 2011
+++ src/sys/arch/x86/isa/isa_machdep.c Tue Feb 28 20:26:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.31 2011/10/18 23:43:36 dyoung Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.32 2012/02/28 20:26:37 mbalmer Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.31 2011/10/18 23:43:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.32 2012/02/28 20:26:37 mbalmer Exp $");
#include
#include
@@ -145,12 +145,10 @@ isa_intr_alloc(isa_chipset_tag_t ic, int
continue;
isp = ci->ci_isources[i];
if (isp == NULL) {
- /*
- * if nothing's using the irq, just return it
- */
+ /* if nothing's using the irq, just return it */
*irq = i;
mutex_exit(&cpu_lock);
- return (0);
+ return 0;
}
switch(isp->is_type) {
@@ -175,7 +173,6 @@ isa_intr_alloc(isa_chipset_tag_t ic, int
count = tmp;
}
break;
-
case IST_PULSE:
/* this just isn't shareable */
continue;
@@ -185,30 +182,23 @@ isa_intr_alloc(isa_chipset_tag_t ic, int
mutex_exit(&cpu_lock);
if (bestirq == -1)
- return (1);
+ return 1;
*irq = bestirq;
- return (0);
+ return 0;
}
const struct evcnt *
isa_intr_evcnt(isa_chipset_tag_t ic, int irq)
{
-
/* XXX for now, no evcnt parent reported */
return NULL;
}
void *
-isa_intr_establish(
-isa_chipset_tag_t ic,
-int irq,
-int type,
-int level,
-int (*ih_fun)(void *),
-void *ih_arg
-)
+isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level,
+int (*ih_fun)(void *), void *ih_arg)
{
struct pic *pic;
int pin;
@@ -239,12 +229,11 @@ isa_intr_establish(
printf("isa_intr_establish: no MP mapping found\n");
}
#endif
- return intr_establish(irq, pic, pin, type, level, ih_fun, ih_arg, false);
+ return intr_establish(irq, pic, pin, type, level, ih_fun, ih_arg,
+ false);
}
-/*
- * Deregister an interrupt handler.
- */
+/* Deregister an interrupt handler. */
void
isa_intr_disestablish(isa_chipset_tag_t ic, void *arg)
{
@@ -257,8 +246,7 @@ isa_intr_disestablish(isa_chipset_tag_t
}
void
-isa_attach_hook(device_t parent, device_t self,
-struct isabus_attach_args *iba)
+isa_attach_hook(device_t parent, device_t self, struct isabus_attach_args *iba)
{
extern struct x86_isa_chipset x86_isa_chipset;
extern int isa_has_been_seen;
@@ -289,20 +277,16 @@ isa_detach_hook(isa_chipset_tag_t ic, de
int
isa_mem_alloc(bus_space_tag_t t, bus_size_t size, bus_size_t align,
- bus_addr_t boundary, int flags, bus_addr_t *addrp, bus_space_handle_t *bshp)
+bus_addr_t boundary, int flags, bus_addr_t *addrp, bus_space_handle_t *bshp)
{
-
- /*
- * Allocate physical address space in the ISA hole.
- */
- return (bus_space_alloc(t, IOM_BEGIN, IOM_END - 1, size, align,
- boundary, flags, addrp, bshp));
+ /* Allocate physical address space in the ISA hole. */
+ return bus_space_alloc(t, IOM_BEGIN, IOM_END - 1, size, align,
+ boundary, flags, addrp, bshp);
}
void
isa_mem_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
{
-
bus_space_free(t, bsh, size);
}
@@ -343,7 +327,6 @@ _isa_dma_may_bounce(bus_dma_tag_t t, bus
device_t
device_isa_register(device_t dev, void *aux)
{
-
/*
* Handle network interfaces here, the attachment information is
* not available driver-independently later.
@@ -360,7 +343,7 @@ device_isa_register(device_t dev, void *
* passed by the boot ROM. The ROM should stay usable if
* the driver becomes obsolete. The physical attachment
* information (checked below) must be sufficient to
- * idenfity the device.
+ * identify the device.
*/
if (bin->bus == BI_BUS_ISA &&
device_is_a(device_parent(dev), "isa")) {
CVS commit: src/external/gpl3/gcc/lib/crtstuff
Module Name:src Committed By: joerg Date: Tue Feb 28 20:26:07 UTC 2012 Modified Files: src/external/gpl3/gcc/lib/crtstuff: Makefile Log Message: Don't use clang here. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/crtstuff/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/gpl3/gcc/lib/crtstuff/Makefile diff -u src/external/gpl3/gcc/lib/crtstuff/Makefile:1.6 src/external/gpl3/gcc/lib/crtstuff/Makefile:1.7 --- src/external/gpl3/gcc/lib/crtstuff/Makefile:1.6 Fri Dec 2 22:28:47 2011 +++ src/external/gpl3/gcc/lib/crtstuff/Makefile Tue Feb 28 20:26:07 2012 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2011/12/02 22:28:47 macallan Exp $ +# $NetBSD: Makefile,v 1.7 2012/02/28 20:26:07 joerg Exp $ REQUIRETOOLS= yes NOLINT= # defined +UNSUPPORTED_COMPILER.clang= # defined .include
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue Feb 28 20:23:51 UTC 2012
Modified Files:
src/sys/dev/pci: radeonfb.c
Log Message:
add methods to map/unmap video memory and registers when entering/leaving X
so DRI has a fighting chance of working
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/radeonfb.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/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.55 src/sys/dev/pci/radeonfb.c:1.56
--- src/sys/dev/pci/radeonfb.c:1.55 Tue Feb 28 20:21:16 2012
+++ src/sys/dev/pci/radeonfb.c Tue Feb 28 20:23:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.55 2012/02/28 20:21:16 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.56 2012/02/28 20:23:51 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.55 2012/02/28 20:21:16 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.56 2012/02/28 20:23:51 macallan Exp $");
#include
#include
@@ -947,6 +947,29 @@ error:
bus_space_unmap(sc->sc_memt, sc->sc_memh, sc->sc_memsz);
}
+static void
+radeonfb_map(struct radeonfb_softc *sc)
+{
+ if (bus_space_map(sc->sc_regt, sc->sc_regaddr, sc->sc_regsz, 0,
+ &sc->sc_regh) != 0) {
+ aprint_error("%s: unable to map registers!\n", XNAME(sc));
+ return;
+ }
+ if (bus_space_map(sc->sc_memt, sc->sc_memaddr, sc->sc_memsz,
+ BUS_SPACE_MAP_LINEAR, &sc->sc_memh) != 0) {
+ sc->sc_memsz = 0;
+ aprint_error("%s: Unable to map frame buffer\n", XNAME(sc));
+ return;
+ }
+}
+
+static void
+radeonfb_unmap(struct radeonfb_softc *sc)
+{
+ bus_space_unmap(sc->sc_regt, sc->sc_regh, sc->sc_regsz);
+ bus_space_unmap(sc->sc_memt, sc->sc_memh, sc->sc_memsz);
+}
+
static int
radeonfb_drm_print(void *aux, const char *pnp)
{
@@ -1021,11 +1044,14 @@ radeonfb_ioctl(void *v, void *vs,
dp->rd_wsmode = *(int *)d;
if ((dp->rd_wsmode == WSDISPLAYIO_MODE_EMUL) &&
(dp->rd_vd.active)) {
+ radeonfb_map(sc);
radeonfb_engine_init(dp);
glyphcache_wipe(&dp->rd_gc);
radeonfb_init_palette(sc, dp == &sc->sc_displays[0] ? 0 : 1);
radeonfb_modeswitch(dp);
vcons_redraw_screen(dp->rd_vd.active);
+ } else {
+radeonfb_unmap(sc);
}
}
return 0;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue Feb 28 20:21:17 UTC 2012
Modified Files:
src/sys/dev/pci: radeonfb.c radeonfbvar.h
Log Message:
support anti-aliased fonts in 8 bit as well
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/radeonfbvar.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/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.54 src/sys/dev/pci/radeonfb.c:1.55
--- src/sys/dev/pci/radeonfb.c:1.54 Thu Feb 16 17:33:28 2012
+++ src/sys/dev/pci/radeonfb.c Tue Feb 28 20:21:16 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.54 2012/02/16 17:33:28 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.55 2012/02/28 20:21:16 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.54 2012/02/16 17:33:28 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.55 2012/02/28 20:21:16 macallan Exp $");
#include
#include
@@ -168,6 +168,7 @@ static void radeonfb_copycols(void *, in
static void radeonfb_cursor(void *, int, int, int);
static void radeonfb_putchar(void *, int, int, unsigned, long);
static void radeonfb_putchar_aa32(void *, int, int, unsigned, long);
+static void radeonfb_putchar_aa8(void *, int, int, unsigned, long);
static void radeonfb_putchar_wrapper(void *, int, int, unsigned, long);
static int radeonfb_get_backlight(struct radeonfb_display *);
@@ -1219,6 +1220,13 @@ radeonfb_put32(struct radeonfb_softc *sc
}
void
+radeonfb_put32s(struct radeonfb_softc *sc, uint32_t reg, uint32_t val)
+{
+
+ bus_space_write_stream_4(sc->sc_regt, sc->sc_regh, reg, val);
+}
+
+void
radeonfb_mask32(struct radeonfb_softc *sc, uint32_t reg,
uint32_t andmask, uint32_t ormask)
{
@@ -2172,6 +2180,9 @@ radeonfb_init_screen(void *cookie, struc
if (ri->ri_depth == 32) {
ri->ri_flg |= RI_ENABLE_ALPHA;
}
+ if (ri->ri_depth == 8) {
+ ri->ri_flg |= RI_ENABLE_ALPHA | RI_8BIT_IS_RGB;
+ }
ri->ri_bits = (void *)dp->rd_fbptr;
#ifdef VCONS_DRAW_INTR
@@ -2227,7 +2238,18 @@ radeonfb_init_screen(void *cookie, struc
}
} else {
/* got an alpha font */
- ri->ri_ops.putchar = radeonfb_putchar_aa32;
+ switch(ri->ri_depth) {
+ case 32:
+ri->ri_ops.putchar = radeonfb_putchar_aa32;
+break;
+ case 8:
+ri->ri_ops.putchar = radeonfb_putchar_aa8;
+break;
+ default:
+/* XXX this should never happen */
+panic("%s: depth is not 8 or 32 but we got an alpha font?!",
+__func__);
+ }
}
ri->ri_ops.cursor = radeonfb_cursor;
}
@@ -2360,12 +2382,29 @@ radeonfb_init_palette(struct radeonfb_so
if (sc->sc_displays[crtc].rd_bpp == 8) {
/* ANSI palette */
int j = 0;
+ uint32_t tmp, r, g, b;
for (i = 0; i <= CLUT_WIDTH; ++i) {
- PUT32(sc, RADEON_PALETTE_30_DATA,
-(rasops_cmap[j] << 22) |
-(rasops_cmap[j + 1] << 12) |
-(rasops_cmap[j + 2] << 2));
+ tmp = i & 0xe0;
+ /*
+ * replicate bits so 0xe0 maps to a red value of 0xff
+ * in order to make white look actually white
+ */
+ tmp |= (tmp >> 3) | (tmp >> 6);
+ r = tmp;
+
+ tmp = (i & 0x1c) << 3;
+ tmp |= (tmp >> 3) | (tmp >> 6);
+ g = tmp;
+
+ tmp = (i & 0x03) << 6;
+ tmp |= tmp >> 2;
+ tmp |= tmp >> 4;
+ b = tmp;
+ PUT32(sc, RADEON_PALETTE_30_DATA,
+(r << 22) |
+(g << 12) |
+(b << 2));
j += 3;
}
} else {
@@ -2595,6 +2634,116 @@ radeonfb_putchar_aa32(void *cookie, int
glyphcache_add(&dp->rd_gc, c, xd, yd);
}
+static void
+radeonfb_putchar_aa8(void *cookie, int row, int col, u_int c, long attr)
+{
+ struct rasops_info *ri = cookie;
+ struct vcons_screen *scr = ri->ri_hw;
+ struct radeonfb_display *dp = scr->scr_cookie;
+ struct radeonfb_softc *sc = dp->rd_softc;
+ struct wsdisplay_font *font = PICK_FONT(ri, c);
+ uint32_t bg, latch = 0, bg8, fg8, pixel, gmc;
+ int i, x, y, wi, he, r, g, b, aval;
+ int r1, g1, b1, r0, g0, b0, fgo, bgo;
+ uint8_t *data8;
+ int rv;
+
+ if (dp->rd_wsmode != WSDISPLAYIO_MODE_EMUL)
+ return;
+
+ if (!CHAR_IN_FONT(c, font))
+ return;
+
+ wi = font->fontwidth;
+ he = font->fontheight;
+
+ bg = ri->ri_devcmap[(attr >> 16) & 0xf];
+
+ x = ri->ri_xorigin + col * wi;
+ y = ri->ri_yorigin + row * he;
+
+ if (c == 0x20) {
+ radeonfb_rectfill(dp, x, y, wi, he, bg);
+ return;
+ }
+ rv = glyphcache_try(&dp->rd_gc, c, x, y, attr);
+ if (rv == GC_OK)
+ return;
+
+ data8 = WSFONT_GLYPH(c, font);
+
+ gmc = dp->rd_format << RADEON_GMC_DST_DATATYPE_SHIFT;
+
+ radeonfb_wait_fifo(sc, 5);
+
+ PUT32(sc, RADEON_DP_GUI_MASTER_CNTL,
+ RADEON_GMC_BRUSH_NONE |
+ RADEON_GMC_SRC_DATATYPE_COLOR |
+ RADEON_ROP3_S |
+ RADEON_DP_SRC_SOURCE_HOST_DATA |
+ RADEON_GMC_CLR_CMP_CNTL_DIS |
+ RADEON_GMC_WR_MSK_DIS |
+ gmc);
+
+ PUT32(sc, RADEON_DP_CNTL,
+ RADEON_DST_X_L
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: jakllsch
Date: Tue Feb 28 18:14:47 UTC 2012
Modified Files:
src/sys/arch/x86/pci: pci_machdep.c
Log Message:
cosmetic, spelling, and grammar adjustments
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/x86/pci/pci_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/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.54 src/sys/arch/x86/pci/pci_machdep.c:1.55
--- src/sys/arch/x86/pci/pci_machdep.c:1.54 Wed Feb 15 16:30:29 2012
+++ src/sys/arch/x86/pci/pci_machdep.c Tue Feb 28 18:14:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.55 2012/02/28 18:14:47 jakllsch Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -69,11 +69,11 @@
*
* The configuration method can be hard-coded in the config file by
* using `options PCI_CONF_MODE=N', where `N' is the configuration mode
- * as defined section 3.6.4.1, `Generating Configuration Cycles'.
+ * as defined in section 3.6.4.1, `Generating Configuration Cycles'.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.54 2012/02/15 16:30:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.55 2012/02/28 18:14:47 jakllsch Exp $");
#include
#include
@@ -163,9 +163,9 @@ static void pci_conf_select(uint32_t);
static void pci_conf_lock(struct pci_conf_lock *, uint32_t);
static void pci_bridge_hook(pci_chipset_tag_t, pcitag_t, void *);
struct pci_bridge_hook_arg {
- void (*func)(pci_chipset_tag_t, pcitag_t, void *);
- void *arg;
-};
+ void (*func)(pci_chipset_tag_t, pcitag_t, void *);
+ void *arg;
+};
#define PCI_MODE1_ENABLE 0x8000UL
#define PCI_MODE1_ADDRESS_REG 0x0cf8
@@ -676,7 +676,7 @@ pci_device_foreach_min(pci_chipset_tag_t
bhlcr = pci_conf_read(pc, tag, PCI_BHLC_REG);
if (PCI_HDRTYPE_MULTIFN(bhlcr) ||
(qd != NULL &&
- (qd->quirks & PCI_QUIRK_MULTIFUNCTION) != 0))
+ (qd->quirks & PCI_QUIRK_MULTIFUNCTION) != 0))
nfuncs = 8;
else
nfuncs = 1;
@@ -707,10 +707,10 @@ pci_bridge_foreach(pci_chipset_tag_t pc,
struct pci_bridge_hook_arg bridge_hook;
bridge_hook.func = func;
- bridge_hook.arg = ctx;
+ bridge_hook.arg = ctx;
pci_device_foreach_min(pc, minbus, maxbus, pci_bridge_hook,
- &bridge_hook);
+ &bridge_hook);
}
static void
@@ -721,7 +721,7 @@ pci_bridge_hook(pci_chipset_tag_t pc, pc
reg = pci_conf_read(pc, tag, PCI_CLASS_REG);
if (PCI_CLASS(reg) == PCI_CLASS_BRIDGE &&
- (PCI_SUBCLASS(reg) == PCI_SUBCLASS_BRIDGE_PCI ||
+ (PCI_SUBCLASS(reg) == PCI_SUBCLASS_BRIDGE_PCI ||
PCI_SUBCLASS(reg) == PCI_SUBCLASS_BRIDGE_CARDBUS)) {
(*bridge_hook->func)(pc, tag, bridge_hook->arg);
}
@@ -884,7 +884,7 @@ device_pci_register(device_t dev, void *
* passed by the boot ROM. The ROM should stay usable if
* the driver becomes obsolete. The physical attachment
* information (checked below) must be sufficient to
- * idenfity the device.
+ * identify the device.
*/
if (bin->bus == BI_BUS_PCI &&
device_is_a(device_parent(dev), "pci")) {
@@ -951,7 +951,7 @@ device_pci_register(device_t dev, void *
#endif
if (fbinfo->depth == 8) {
gfb_cb.gcc_cookie = NULL;
- gfb_cb.gcc_set_mapreg =
+ gfb_cb.gcc_set_mapreg =
x86_genfb_set_mapreg;
prop_dictionary_set_uint64(dict,
"cmap_callback",
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/asn1
Module Name:src
Committed By: drochner
Date: Tue Feb 28 17:23:58 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/asn1: asn_mime.c
Log Message:
apply upstream rev.22146: Tolerate bad MIME headers in parser.
avoids possible NULL dereference (CVE-2006-7248)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.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/openssl/dist/crypto/asn1/asn_mime.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.1.1.1 Sun Jul 19 23:02:52 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c Tue Feb 28 17:23:58 2012
@@ -858,6 +858,10 @@ static int mime_hdr_addparam(MIME_HEADER
static int mime_hdr_cmp(const MIME_HEADER * const *a,
const MIME_HEADER * const *b)
{
+ if ((*a)->name == NULL || (*b)->name == NULL)
+ return (*a)->name - (*b)->name < 0 ? -1 :
+ (*a)->name - (*b)->name > 0 ? 1 : 0;
+
return(strcmp((*a)->name, (*b)->name));
}
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Feb 28 17:09:32 UTC 2012
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/bin/clang: Makefile
src/external/bsd/llvm/config/llvm/Config: AsmParsers.def
Disassemblers.def config.h llvm-config.h
src/external/bsd/llvm/config/llvm/Support: DataTypes.h
src/external/bsd/llvm/include: Makefile
src/external/bsd/llvm/lib: Makefile
src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMInstrumentation: Makefile
src/external/bsd/llvm/lib/libLLVMMipsCodeGen: Makefile
src/external/bsd/llvm/lib/libLLVMSelectionDAG: Makefile
src/external/bsd/llvm/lib/libLLVMSupport: Makefile
src/external/bsd/llvm/lib/libclangAST: Makefile
src/external/bsd/llvm/lib/libclangDriver: Makefile
src/external/bsd/llvm/lib/libclangFrontend: Makefile
src/external/bsd/llvm/lib/libclangRewrite: Makefile
src/external/bsd/llvm/lib/libclangSema: Makefile
src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers: Makefile
src/tools/llvm: Makefile
Added Files:
src/external/bsd/llvm/config/clang/Config: config.h
src/external/bsd/llvm/lib/libLLVMVectorize: Makefile
src/tools/llvm-lib/libLLVMVectorize: Makefile
Log Message:
Update LLVM/Clang snapshot to r151411. This brings in Lambda support for
C++11 and a new literal format string check to catch variadic argument
functions.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/llvm/bin/clang/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/config/clang/Config/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/llvm/config/llvm/Config/AsmParsers.def \
src/external/bsd/llvm/config/llvm/Config/Disassemblers.def
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/config/llvm/Config/config.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/llvm/config/llvm/Config/llvm-config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/llvm/config/llvm/Support/DataTypes.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/llvm/lib/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/llvm/lib/libLLVMSelectionDAG/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/lib/libLLVMSupport/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMVectorize/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libclangAST/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libclangDriver/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/llvm/lib/libclangFrontend/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libclangRewrite/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libclangSema/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile
cvs rdiff -u -r1.11 -r1.12 src/tools/llvm/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/llvm-lib/libLLVMVectorize/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/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.29 src/external/bsd/llvm/Makefile.inc:1.30
--- src/external/bsd/llvm/Makefile.inc:1.29 Tue Jan 17 15:51:55 2012
+++ src/external/bsd/llvm/Makefile.inc Tue Feb 28 17:09:29 2012
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.29 2012/01/17 15:51:55 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.30 2012/02/28 17:09:29 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include
-LLVM_REVISION= 148262
-CLANG_REVISION= 148262
+LLVM_REVISION= 151411
+CLANG_REVISION= 151411
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
@@ -18,15 +18,23 @@ CPPFLAGS+= -I. -I${LLVM_SRCDIR}/include
.if defined(HOSTLIB) || defined(HOSTPROG)
LLVM_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OBJDIR}/config/include
+CLANG_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OBJDIR}/config/tools/clang/include
LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR}
LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR}
HOST_CPPFLAGS+= ${CPPFLAGS}
HOST_CXXFLAGS+= -O2 -g
.else
LLVM_INCLUDE_CONFIG= ${LLVM_TOPLEVEL}/config
+CLANG_INCLUDE_CONFIG= ${LLVM_TOPLEVEL}/config
LLVM_INCLUDE_OBJDIR!= cd ${LLVM_TOPLEVEL}/include && ${PRINTOBJDIR}
CPPFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE="\"${MACHINE_GNU_PLATFORM}\""
.endif
-CPPFLAGS+= -I${LLVM_INCLUDE_OBJDIR} -I${LLVM_INCLUDE_CONFIG}
+CPPFLAGS+= -I${LLVM_INCLUDE_OBJDIR} -I${LLVM_INCLUDE_CONFIG} \
+ -I${
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Feb 28 14:22:23 UTC 2012 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/external/public-domain/xz: prepare-import.sh src/external/public-domain/xz/dist: configure.ac src/external/public-domain/xz/lib: shlib_version Log Message: Merge XZ 5.0.3. To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.157 -r1.158 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.148 -r1.149 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.617 -r1.618 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.156 -r1.157 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.139 -r1.140 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.210 -r1.211 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/prepare-import.sh cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/dist/configure.ac cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.83 src/distrib/sets/lists/base/ad.mips64eb:1.84 --- src/distrib/sets/lists/base/ad.mips64eb:1.83 Thu Feb 16 23:00:38 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Tue Feb 28 14:22:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.83 2012/02/16 23:00:38 joerg Exp $ +# $NetBSD: ad.mips64eb,v 1.84 2012/02/28 14:22:22 joerg Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -154,7 +154,7 @@ ./usr/lib/64/liblzf.so.0 base-compat-shlib compat,pic ./usr/lib/64/liblzf.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/liblzma.so.1 base-compat-shlib compat,pic -./usr/lib/64/liblzma.so.1.0 base-compat-shlib compat,pic +./usr/lib/64/liblzma.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libm.so.0base-compat-shlib compat,pic ./usr/lib/64/libm.so.0.10 base-compat-shlib compat,pic ./usr/lib/64/libmagic.so.3 base-compat-shlib compat,pic @@ -450,7 +450,7 @@ ./usr/lib/o32/liblzf.so.0 base-compat-shlib compat,pic ./usr/lib/o32/liblzf.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/liblzma.so.1 base-compat-shlib compat,pic -./usr/lib/o32/liblzma.so.1.0 base-compat-shlib compat,pic +./usr/lib/o32/liblzma.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libm.so.0base-compat-shlib compat,pic ./usr/lib/o32/libm.so.0.10 base-compat-shlib compat,pic ./usr/lib/o32/libmagic.so.3 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.82 src/distrib/sets/lists/base/ad.mips64el:1.83 --- src/distrib/sets/lists/base/ad.mips64el:1.82 Thu Feb 16 23:00:38 2012 +++ src/distrib/sets/lists/base/ad.mips64el Tue Feb 28 14:22:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.82 2012/02/16 23:00:38 joerg Exp $ +# $NetBSD: ad.mips64el,v 1.83 2012/02/28 14:22:22 joerg Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -154,7 +154,7 @@ ./usr/lib/64/liblzf.so.0 base-compat-shlib compat,pic ./usr/lib/64/liblzf.so.0.0 base-compat-shlib compat,pic ./usr/lib/64/liblzma.so.1 base-compat-shlib compat,pic -./usr/lib/64/liblzma.so.1.0 base-compat-shlib compat,pic +./usr/lib/64/liblzma.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libm.so.0base-compat-shlib compat,pic ./usr/lib/64/libm.so.0.10 base-compat-shlib compat,pic ./usr/lib/64/libmagic.so.3 base-compat-shlib compat,pic @@ -450,7 +450,7 @@ ./usr/lib/o32/liblzf.so.0 base-compat-shlib compat,pic ./usr/lib/o32/liblzf.so.0.0 base-compat-shlib compat,pic ./usr/lib/o32/liblzma.so.1 base-compat-shlib compat,pic -./usr/lib/o32/liblzma.so.1.0 base-compat-shlib compat,pic +./usr/lib/o32/liblzma.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libm.so.0base-compat-shlib compat,pic ./usr/lib/o32/libm.so.0.10 base-compat-shlib compat,pic ./usr/lib/o32/libmagic.so.3 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.157 src/distrib/sets/lists/base/md.amd64:1.158 --- src/distrib/sets/lists/base/md.amd64:1.157 Thu Feb 16 23:00:38 2012 +++ src/distrib/sets/lists/base/md.amd64 Tue Feb 28 14:22:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.157 2012/02/16 23:00:38 joerg
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mbalmer
Date: Tue Feb 28 14:04:19 UTC 2012
Modified Files:
src/sys/dev/scsipi: ss.c
Log Message:
one line comments on one line.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/scsipi/ss.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/scsipi/ss.c
diff -u src/sys/dev/scsipi/ss.c:1.83 src/sys/dev/scsipi/ss.c:1.84
--- src/sys/dev/scsipi/ss.c:1.83 Tue Feb 28 14:01:03 2012
+++ src/sys/dev/scsipi/ss.c Tue Feb 28 14:04:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.83 2012/02/28 14:01:03 mbalmer Exp $ */
+/* $NetBSD: ss.c,v 1.84 2012/02/28 14:04:19 mbalmer Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.83 2012/02/28 14:01:03 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.84 2012/02/28 14:04:19 mbalmer Exp $");
#include
#include
@@ -216,9 +216,7 @@ ssdetach(device_t self, int flags)
return 0;
}
-/*
- * open the device.
- */
+/* open the device. */
static int
ssopen(dev_t dev, int flag, int mode, struct lwp *l)
{
@@ -322,10 +320,8 @@ ssclose(dev_t dev, int flag, int mode, s
}
/*
- * trim the size of the transfer if needed,
- * called by physio
- * basically the smaller of our min and the scsi driver's
- * minphys
+ * trim the size of the transfer if needed, called by physio
+ * basically the smaller of our min and the scsi driver's minphys
*/
static void
ssminphys(struct buf *bp)
@@ -455,10 +451,8 @@ ssstart(struct scsipi_periph *periph)
struct buf *bp;
SC_DEBUG(periph, SCSIPI_DB2, ("ssstart "));
- /*
- * See if there is a buf to do and we are not already
- * doing one
- */
+
+ /* See if there is a buf to do and we are not already doing one */
while (periph->periph_active < periph->periph_openings) {
/* if a special awaits, let it proceed first */
if (periph->periph_flags & PERIPH_WAITING) {
@@ -467,9 +461,7 @@ ssstart(struct scsipi_periph *periph)
return;
}
- /*
- * See if there is a buf with work for us to do..
- */
+ /* See if there is a buf with work for us to do.. */
if ((bp = bufq_peek(ss->buf_queue)) == NULL)
return;
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mbalmer
Date: Tue Feb 28 14:01:03 UTC 2012
Modified Files:
src/sys/dev/scsipi: ss.c
Log Message:
Unbreak the build.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/scsipi/ss.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/scsipi/ss.c
diff -u src/sys/dev/scsipi/ss.c:1.82 src/sys/dev/scsipi/ss.c:1.83
--- src/sys/dev/scsipi/ss.c:1.82 Tue Feb 28 11:59:37 2012
+++ src/sys/dev/scsipi/ss.c Tue Feb 28 14:01:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.82 2012/02/28 11:59:37 mbalmer Exp $ */
+/* $NetBSD: ss.c,v 1.83 2012/02/28 14:01:03 mbalmer Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.82 2012/02/28 11:59:37 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.83 2012/02/28 14:01:03 mbalmer Exp $");
#include
#include
@@ -475,7 +475,7 @@ ssstart(struct scsipi_periph *periph)
if (ss->special && ss->special->read)
(ss->special->read)(ss, bp);
- } else {
+ else {
/* generic scsi2 scanner read */
/* XXX add code for SCSI2 scanner read */
}
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Feb 28 13:47:14 UTC 2012 Update of /cvsroot/src/external/public-domain/xz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6336 Log Message: Import XZ 5.0.3: - memory leak in liblzma fixed - better validation - correct behavior for suid/sgid/sticky bit and hard links with xz --force - cleanup and new translations Status: Vendor Tag: XZ Release Tags: xz-5-0-3 U src/external/public-domain/xz/dist/README U src/external/public-domain/xz/dist/COPYING U src/external/public-domain/xz/dist/INSTALL U src/external/public-domain/xz/dist/config.h.in U src/external/public-domain/xz/dist/THANKS C src/external/public-domain/xz/dist/configure.ac U src/external/public-domain/xz/dist/AUTHORS U src/external/public-domain/xz/dist/ChangeLog U src/external/public-domain/xz/dist/PACKAGERS U src/external/public-domain/xz/dist/TODO U src/external/public-domain/xz/dist/NEWS U src/external/public-domain/xz/dist/src/xzdec/xzdec.1 U src/external/public-domain/xz/dist/src/xzdec/xzdec_w32res.rc U src/external/public-domain/xz/dist/src/xzdec/xzdec.c U src/external/public-domain/xz/dist/src/xzdec/lzmadec_w32res.rc U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo_w32res.rc U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo.1 U src/external/public-domain/xz/dist/src/lzmainfo/lzmainfo.c U src/external/public-domain/xz/dist/src/xz/coder.c U src/external/public-domain/xz/dist/src/xz/util.c U src/external/public-domain/xz/dist/src/xz/xz.1 U src/external/public-domain/xz/dist/src/xz/options.h U src/external/public-domain/xz/dist/src/xz/suffix.h U src/external/public-domain/xz/dist/src/xz/args.h U src/external/public-domain/xz/dist/src/xz/file_io.c U src/external/public-domain/xz/dist/src/xz/file_io.h U src/external/public-domain/xz/dist/src/xz/main.h U src/external/public-domain/xz/dist/src/xz/list.h U src/external/public-domain/xz/dist/src/xz/xz_w32res.rc U src/external/public-domain/xz/dist/src/xz/hardware.h U src/external/public-domain/xz/dist/src/xz/list.c U src/external/public-domain/xz/dist/src/xz/args.c U src/external/public-domain/xz/dist/src/xz/private.h U src/external/public-domain/xz/dist/src/xz/suffix.c U src/external/public-domain/xz/dist/src/xz/message.h U src/external/public-domain/xz/dist/src/xz/util.h U src/external/public-domain/xz/dist/src/xz/signals.c U src/external/public-domain/xz/dist/src/xz/hardware.c U src/external/public-domain/xz/dist/src/xz/main.c U src/external/public-domain/xz/dist/src/xz/options.c U src/external/public-domain/xz/dist/src/xz/message.c U src/external/public-domain/xz/dist/src/xz/signals.h U src/external/public-domain/xz/dist/src/xz/coder.h U src/external/public-domain/xz/dist/src/common/tuklib_open_stdxxx.h U src/external/public-domain/xz/dist/src/common/tuklib_physmem.c U src/external/public-domain/xz/dist/src/common/tuklib_config.h U src/external/public-domain/xz/dist/src/common/tuklib_integer.h U src/external/public-domain/xz/dist/src/common/tuklib_common.h U src/external/public-domain/xz/dist/src/common/tuklib_cpucores.h U src/external/public-domain/xz/dist/src/common/sysdefs.h U src/external/public-domain/xz/dist/src/common/common_w32res.rc U src/external/public-domain/xz/dist/src/common/tuklib_mbstr.h U src/external/public-domain/xz/dist/src/common/tuklib_progname.h U src/external/public-domain/xz/dist/src/common/tuklib_open_stdxxx.c U src/external/public-domain/xz/dist/src/common/tuklib_exit.c U src/external/public-domain/xz/dist/src/common/tuklib_mbstr_fw.c U src/external/public-domain/xz/dist/src/common/tuklib_progname.c U src/external/public-domain/xz/dist/src/common/tuklib_gettext.h U src/external/public-domain/xz/dist/src/common/tuklib_exit.h U src/external/public-domain/xz/dist/src/common/mythread.h U src/external/public-domain/xz/dist/src/common/tuklib_physmem.h U src/external/public-domain/xz/dist/src/common/tuklib_mbstr_width.c U src/external/public-domain/xz/dist/src/common/tuklib_cpucores.c U src/external/public-domain/xz/dist/src/liblzma/liblzma.pc.in U src/external/public-domain/xz/dist/src/liblzma/liblzma_w32res.rc U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma2_decoder.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_encoder_presets.c U src/external/public-domain/xz/dist/src/liblzma/lzma/fastpos_tablegen.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_fast.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_common.h U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma2_encoder.h U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_decoder.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_encoder.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma_encoder_optimum_normal.c U src/external/public-domain/xz/dist/src/liblzma/lzma/fastpos.h U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma2_encoder.c U src/external/public-domain/xz/dist/src/liblzma/lzma/lzma2_decoder.h U src/e
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: mbalmer Date: Tue Feb 28 12:08:37 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Add commented out DDB_COMMANDONENTER example, enable pwdog(4). To generate a diff of this commit: cvs rdiff -u -r1.348 -r1.349 src/sys/arch/amd64/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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.348 src/sys/arch/amd64/conf/GENERIC:1.349 --- src/sys/arch/amd64/conf/GENERIC:1.348 Sun Jan 22 06:44:29 2012 +++ src/sys/arch/amd64/conf/GENERIC Tue Feb 28 12:08:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.348 2012/01/22 06:44:29 christos Exp $ +# $NetBSD: GENERIC,v 1.349 2012/02/28 12:08:37 mbalmer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.348 $" +#ident "GENERIC-$Revision: 1.349 $" maxusers 64 # estimated number of users @@ -98,6 +98,7 @@ options DIAGNOSTIC # expensive kernel c # makeoptions COPTS="-O2 -fno-omit-frame-pointer" options DDB # in-kernel debugger +#options DDB_COMMANDONENTER="bt" # execute command when ddb is entered #options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic' options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger @@ -337,7 +338,7 @@ puc* at pci? dev ? function ? # PCI "uni #amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET #hpet* at amdpcib? -#pwdog* at pci? dev ? function ? # QUANCOM PWDOG1 +pwdog* at pci? dev ? function ? # QUANCOM PWDOG1 ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter, # watchdog and Speedstep and HPET
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mbalmer
Date: Tue Feb 28 11:59:37 UTC 2012
Modified Files:
src/sys/dev/scsipi: ss.c
Log Message:
Remove a pointless #if 0, compiler will eliminate the code anways.
Noticed by skrll.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/scsipi/ss.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/scsipi/ss.c
diff -u src/sys/dev/scsipi/ss.c:1.81 src/sys/dev/scsipi/ss.c:1.82
--- src/sys/dev/scsipi/ss.c:1.81 Tue Feb 28 11:41:00 2012
+++ src/sys/dev/scsipi/ss.c Tue Feb 28 11:59:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.81 2012/02/28 11:41:00 mbalmer Exp $ */
+/* $NetBSD: ss.c,v 1.82 2012/02/28 11:59:37 mbalmer Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.81 2012/02/28 11:41:00 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.82 2012/02/28 11:59:37 mbalmer Exp $");
#include
#include
@@ -178,11 +178,10 @@ ssattach(device_t parent, device_t self,
if (memcmp(sa->sa_inqbuf.vendor, "HP ", 8) == 0 &&
memcmp(sa->sa_inqbuf.product, "ScanJet 5300C", 13) != 0)
scanjet_attach(ss, sa);
-#if 0
+
if (ss->special == NULL) {
/* XXX add code to restart a SCSI2 scanner, if any */
}
-#endif
ss->flags &= ~SSF_AUTOCONF;
}
@@ -307,12 +306,9 @@ ssclose(dev_t dev, int flag, int mode, s
error = (ss->special->rewind_scanner)(ss);
if (error)
return error;
- }
-#if 0
- else {
+ } else {
/* XXX add code to restart a SCSI2 scanner, if any */
}
-#endif
ss->sio.scan_window_size = 0;
ss->flags &= ~SSF_TRIGGERED;
}
@@ -479,12 +475,10 @@ ssstart(struct scsipi_periph *periph)
if (ss->special && ss->special->read)
(ss->special->read)(ss, bp);
-#if 0
} else {
/* generic scsi2 scanner read */
/* XXX add code for SCSI2 scanner read */
}
-#endif
}
}
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mbalmer
Date: Tue Feb 28 11:41:00 UTC 2012
Modified Files:
src/sys/dev/scsipi: ss.c ss_mustek.c ss_scanjet.c ssvar.h
Log Message:
Convert to device_t, aka softc/device_t split, and clean up a bit the code.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/scsipi/ss.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/scsipi/ss_mustek.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/scsipi/ss_scanjet.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/scsipi/ssvar.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/scsipi/ss.c
diff -u src/sys/dev/scsipi/ss.c:1.80 src/sys/dev/scsipi/ss.c:1.81
--- src/sys/dev/scsipi/ss.c:1.80 Sun Dec 6 22:48:17 2009
+++ src/sys/dev/scsipi/ss.c Tue Feb 28 11:41:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.80 2009/12/06 22:48:17 dyoung Exp $ */
+/* $NetBSD: ss.c,v 1.81 2012/02/28 11:41:00 mbalmer Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.80 2009/12/06 22:48:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.81 2012/02/28 11:41:00 mbalmer Exp $");
#include
#include
@@ -72,8 +72,14 @@ static int ssmatch(device_t, cfdata_t, v
static void ssattach(device_t, device_t, void *);
static int ssdetach(device_t self, int flags);
-CFATTACH_DECL(ss, sizeof(struct ss_softc),
-ssmatch, ssattach, ssdetach, NULL);
+CFATTACH_DECL_NEW(
+ ss,
+ sizeof(struct ss_softc),
+ ssmatch,
+ ssattach,
+ ssdetach,
+ NULL
+);
extern struct cfdriver ss_cd;
@@ -121,8 +127,7 @@ static const struct scsipi_inquiry_patte
};
static int
-ssmatch(device_t parent, cfdata_t match,
-void *aux)
+ssmatch(device_t parent, cfdata_t match, void *aux)
{
struct scsipibus_attach_args *sa = aux;
int priority;
@@ -130,7 +135,7 @@ ssmatch(device_t parent, cfdata_t match,
(void)scsipi_inqmatch(&sa->sa_inqbuf,
ss_patterns, sizeof(ss_patterns) / sizeof(ss_patterns[0]),
sizeof(ss_patterns[0]), &priority);
- return (priority);
+ return priority;
}
/*
@@ -147,21 +152,18 @@ ssattach(device_t parent, device_t self,
struct scsipi_periph *periph = sa->sa_periph;
SC_DEBUG(periph, SCSIPI_DB2, ("ssattach: "));
+ ss->sc_dev = self;
ss->flags |= SSF_AUTOCONF;
- /*
- * Store information needed to contact our base driver
- */
+ /* Store information needed to contact our base driver */
ss->sc_periph = periph;
- periph->periph_dev = &ss->sc_dev;
+ periph->periph_dev = ss->sc_dev;
periph->periph_switch = &ss_switch;
printf("\n");
- /*
- * Set up the buf queue for this device
- */
+ /* Set up the buf queue for this device */
bufq_alloc(&ss->buf_queue, "fcfs", 0);
callout_init(&ss->sc_callout, 0);
@@ -176,10 +178,11 @@ ssattach(device_t parent, device_t self,
if (memcmp(sa->sa_inqbuf.vendor, "HP ", 8) == 0 &&
memcmp(sa->sa_inqbuf.product, "ScanJet 5300C", 13) != 0)
scanjet_attach(ss, sa);
+#if 0
if (ss->special == NULL) {
/* XXX add code to restart a SCSI2 scanner, if any */
}
-
+#endif
ss->flags &= ~SSF_AUTOCONF;
}
@@ -211,7 +214,7 @@ ssdetach(device_t self, int flags)
mn = SSUNIT(device_unit(self));
vdevgone(cmaj, mn, mn+SSNMINOR-1, VCHR);
- return (0);
+ return 0;
}
/*
@@ -230,26 +233,27 @@ ssopen(dev_t dev, int flag, int mode, st
unit = SSUNIT(dev);
ss = device_lookup_private(&ss_cd, unit);
if (ss == NULL)
- return (ENXIO);
+ return ENXIO;
- if (!device_is_active(&ss->sc_dev))
- return (ENODEV);
+ if (!device_is_active(ss->sc_dev))
+ return ENODEV;
ssmode = SSMODE(dev);
periph = ss->sc_periph;
adapt = periph->periph_channel->chan_adapter;
- SC_DEBUG(periph, SCSIPI_DB1, ("open: dev=0x%"PRIx64" (unit %d (of %d))\n", dev,
- unit, ss_cd.cd_ndevs));
+ SC_DEBUG(periph, SCSIPI_DB1,
+ ("open: dev=0x%"PRIx64" (unit %d (of %d))\n", dev, unit,
+ ss_cd.cd_ndevs));
if (periph->periph_flags & PERIPH_OPEN) {
- aprint_error_dev(&ss->sc_dev, "already open\n");
- return (EBUSY);
+ aprint_error_dev(ss->sc_dev, "already open\n");
+ return EBUSY;
}
if ((error = scsipi_adapter_addref(adapt)) != 0)
- return (error);
+ return error;
/*
* Catch any unit attention errors.
@@ -272,15 +276,15 @@ ssopen(dev_t dev, int flag, int mode, st
* This mode does NOT ALLOW I/O, only ioctls
*/
if (ssmode == MODE_CONTROL)
- return (0);
+ return 0;
SC_DEBUG(periph, SCSIPI_DB2, ("open complete\n"));
- return (0);
+ return 0;
bad:
scsipi_adapter_delref(adapt);
periph->periph_flags &= ~PERIPH_OPEN;
- return (error);
+ return error;
}
/*
@@ -302,10 +306,13 @@ ssclose(dev_t dev, int flag, int mode, s
/* call special handler to rewind/abort scan */
error = (ss->special->rewind_scanner)(ss);
if (error)
-return (error);
- } else {
+return error;
+ }
+#if 0
+ else {
/* XXX add code to restart a SCSI2 scanner, i
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mbalmer
Date: Tue Feb 28 10:58:11 UTC 2012
Modified Files:
src/sys/dev/scsipi: st.c st_atapi.c st_scsi.c stvar.h
Log Message:
Convert st(4) to device_t, while here clean up the code and use uintXX_t
instead of u_intXX_t.
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/sys/dev/scsipi/st.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/scsipi/st_atapi.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/scsipi/st_scsi.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/scsipi/stvar.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/scsipi/st.c
diff -u src/sys/dev/scsipi/st.c:1.219 src/sys/dev/scsipi/st.c:1.220
--- src/sys/dev/scsipi/st.c:1.219 Sat Feb 25 10:15:50 2012
+++ src/sys/dev/scsipi/st.c Tue Feb 28 10:58:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.219 2012/02/25 10:15:50 shattered Exp $ */
+/* $NetBSD: st.c,v 1.220 2012/02/28 10:58:10 mbalmer Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.219 2012/02/25 10:15:50 shattered Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.220 2012/02/28 10:58:10 mbalmer Exp $");
#include "opt_scsi.h"
@@ -335,8 +335,8 @@ static int st_rewind(struct st_softc *,
static int st_interpret_sense(struct scsipi_xfer *);
static int st_touch_tape(struct st_softc *);
static int st_erase(struct st_softc *, int full, int flags);
-static int st_rdpos(struct st_softc *, int, u_int32_t *);
-static int st_setpos(struct st_softc *, int, u_int32_t *);
+static int st_rdpos(struct st_softc *, int, uint32_t *);
+static int st_setpos(struct st_softc *, int, uint32_t *);
static const struct scsipi_periphsw st_switch = {
st_interpret_sense,
@@ -345,7 +345,7 @@ static const struct scsipi_periphsw st_s
stdone
};
-#if defined(ST_ENABLE_EARLYWARN)
+#if defined(ST_ENABLE_EARLYWARN)
#define ST_INIT_FLAGS ST_EARLYWARN
#else
#define ST_INIT_FLAGS 0
@@ -356,31 +356,25 @@ static const struct scsipi_periphsw st_s
* A device suitable for this driver
*/
void
-stattach(device_t parent, struct st_softc *st, void *aux)
+stattach(device_t parent, device_t self, void *aux)
{
+ struct st_softc *st = device_private(self);
struct scsipibus_attach_args *sa = aux;
struct scsipi_periph *periph = sa->sa_periph;
SC_DEBUG(periph, SCSIPI_DB2, ("stattach: "));
+ st->sc_dev = self;
- /*
- * Store information needed to contact our base driver
- */
+ /* Store information needed to contact our base driver */
st->sc_periph = periph;
- periph->periph_dev = &st->sc_dev;
+ periph->periph_dev = st->sc_dev;
periph->periph_switch = &st_switch;
- /*
- * Set initial flags
- */
-
+ /* Set initial flags */
st->flags = ST_INIT_FLAGS;
- /*
- * Set up the buf queue for this device
- */
+ /* Set up the buf queue for this device */
bufq_alloc(&st->buf_queue, "fcfs", 0);
-
callout_init(&st->sc_callout, 0);
/*
@@ -388,11 +382,10 @@ stattach(device_t parent, struct st_soft
* Any steps needed to bring it into line
*/
st_identify_drive(st, &sa->sa_inqbuf);
- /*
- * Use the subdriver to request information regarding the drive.
- */
printf("\n");
- printf("%s: %s", device_xname(&st->sc_dev), st->quirkdata ? "quirks apply, " : "");
+ /* Use the subdriver to request information regarding the drive. */
+ printf("%s : %s", device_xname(st->sc_dev), st->quirkdata
+ ? "quirks apply, " : "");
if (scsipi_test_unit_ready(periph,
XS_CTL_DISCOVERY | XS_CTL_SILENT | XS_CTL_IGNORE_MEDIA_CHANGE) ||
st->ops(st, ST_OPS_MODESENSE,
@@ -408,10 +401,11 @@ stattach(device_t parent, struct st_soft
(st->flags & ST_READONLY) ? "protected" : "enabled");
}
- st->stats = iostat_alloc(IOSTAT_TAPE, parent, device_xname(&st->sc_dev));
+ st->stats = iostat_alloc(IOSTAT_TAPE, parent,
+ device_xname(st->sc_dev));
- rnd_attach_source(&st->rnd_source, device_xname(&st->sc_dev),
- RND_TYPE_TAPE, 0);
+ rnd_attach_source(&st->rnd_source, device_xname(st->sc_dev),
+ RND_TYPE_TAPE, 0);
}
int
@@ -449,7 +443,7 @@ stdetach(device_t self, int flags)
/* Unhook the entropy source. */
rnd_detach_source(&st->rnd_source);
- return (0);
+ return 0;
}
/*
@@ -484,9 +478,9 @@ st_identify_drive(struct st_softc *st, s
static void
st_loadquirks(struct st_softc *st)
{
- int i;
const struct modes *mode;
struct modes *mode2;
+ int i;
mode = st->quirkdata->modes;
mode2 = st->modes;
@@ -509,9 +503,7 @@ st_loadquirks(struct st_softc *st)
}
}
-/*
- * open the device.
- */
+/* open the device. */
static int
stopen(dev_t dev, int flags, int mode, struct lwp *l)
{
@@ -524,7 +516,7 @@ stopen(dev_t dev, int flags, int mode, s
unit = STUNIT(dev);
st = device_lookup_private(&st_cd, unit);
if (st == NULL)
- return (ENXIO);
+ return ENXIO;
stmode = STMODE(dev);
dsty = STDSTY(dev);
@@ -532,24 +524,20 @@ stopen(dev
CVS commit: src/tests/lib/libm
Module Name:src Committed By: pgoyette Date: Tue Feb 28 08:58:39 UTC 2012 Modified Files: src/tests/lib/libm: t_atan.c Log Message: Remove an escape sequence that was introduced by accident. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libm/t_atan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libm/t_atan.c diff -u src/tests/lib/libm/t_atan.c:1.2 src/tests/lib/libm/t_atan.c:1.3 --- src/tests/lib/libm/t_atan.c:1.2 Tue Feb 28 06:09:48 2012 +++ src/tests/lib/libm/t_atan.c Tue Feb 28 08:58:39 2012 @@ -1,4 +1,4 @@ -B0;259;0c/* $NetBSD: t_atan.c,v 1.2 2012/02/28 06:09:48 jruoho Exp $ */ +/* $NetBSD: t_atan.c,v 1.3 2012/02/28 08:58:39 pgoyette Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc.
