CVS commit: src/tools/gdb
Module Name:src
Committed By: christos
Date: Sun Aug 16 09:14:53 UTC 2015
Modified Files:
src/tools/gdb: Makefile
Log Message:
handle gdb-7.9.1
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tools/gdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.23 src/tools/gdb/Makefile:1.24
--- src/tools/gdb/Makefile:1.23 Sat Aug 15 17:12:28 2015
+++ src/tools/gdb/Makefile Sun Aug 16 05:14:53 2015
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.23 2015/08/15 21:12:28 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2015/08/16 09:14:53 christos Exp $
.include bsd.own.mk
MODULE= gdb
+.if ${HAVE_GDB} == 79
+GNUHOSTDIST=${.CURDIR}/../../external/gpl3/gdb/dist
+.else
GNUHOSTDIST=${.CURDIR}/../../external/gpl3/gdb.old/dist
+.endif
FIND_ARGS= \! \( -type d -name sim -prune \)
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Aug 16 09:13:31 UTC 2015
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch amd64 to gdb 7.9.1
To generate a diff of this commit:
cvs rdiff -u -r1.862 -r1.863 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.862 src/share/mk/bsd.own.mk:1.863
--- src/share/mk/bsd.own.mk:1.862 Thu Jul 23 04:03:26 2015
+++ src/share/mk/bsd.own.mk Sun Aug 16 05:13:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.862 2015/07/23 08:03:26 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.863 2015/08/16 09:13:30 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -111,7 +111,11 @@ HAVE_LIBGCC_EH?= no
HAVE_LIBGCC_EH?= yes
.endif
+.if (${MACHINE_ARCH} == x86_64)
+HAVE_GDB?= 79
+.else
HAVE_GDB?= 7
+.endif
.if (${MACHINE_ARCH} == alpha) || \
(${MACHINE_ARCH} == hppa) || \
CVS commit: src/external/gpl3
Module Name:src
Committed By: christos
Date: Sun Aug 16 09:17:18 UTC 2015
Modified Files:
src/external/gpl3: Makefile
Log Message:
handle gdb-7.9.1
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/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/Makefile
diff -u src/external/gpl3/Makefile:1.12 src/external/gpl3/Makefile:1.13
--- src/external/gpl3/Makefile:1.12 Sat Aug 15 05:34:17 2015
+++ src/external/gpl3/Makefile Sun Aug 16 05:17:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/08/15 09:34:17 christos Exp $
+# $NetBSD: Makefile,v 1.13 2015/08/16 09:17:18 christos Exp $
.include bsd.own.mk
@@ -11,9 +11,11 @@ SUBDIR+= ${EXTERNAL_GCC_SUBDIR}
.endif
.if ${MKGDB} != no
-.if ${HAVE_GDB} == 7
-SUBDIR+=gdb.old
-.endif
+. if ${HAVE_GDB} == 79
+SUBDIR+=gdb
+. elif ${HAVE_GDB} == 7
+SUBDIR+=gdb
+. endif
.endif
.include bsd.subdir.mk
CVS commit: src/tools/gdb
Module Name:src
Committed By: christos
Date: Sun Aug 16 09:17:49 UTC 2015
Modified Files:
src/tools/gdb: Makefile
Log Message:
add double quotes for consistency
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tools/gdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.24 src/tools/gdb/Makefile:1.25
--- src/tools/gdb/Makefile:1.24 Sun Aug 16 05:14:53 2015
+++ src/tools/gdb/Makefile Sun Aug 16 05:17:49 2015
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2015/08/16 09:14:53 christos Exp $
+# $NetBSD: Makefile,v 1.25 2015/08/16 09:17:49 christos Exp $
.include bsd.own.mk
MODULE= gdb
-.if ${HAVE_GDB} == 79
+.if ${HAVE_GDB} == 79
GNUHOSTDIST=${.CURDIR}/../../external/gpl3/gdb/dist
.else
GNUHOSTDIST=${.CURDIR}/../../external/gpl3/gdb.old/dist
CVS commit: src/external/gpl3/gdb/dist/sim
Module Name:src
Committed By: christos
Date: Sun Aug 16 10:00:19 UTC 2015
Modified Files:
src/external/gpl3/gdb/dist/sim: configure
src/external/gpl3/gdb/dist/sim/common: callback.c
src/external/gpl3/gdb/dist/sim/mn10300: Makefile.in
src/external/gpl3/gdb/dist/sim/ppc: hw_memory.c
src/external/gpl3/gdb/dist/sim/v850: Makefile.in
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/configure
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/common/callback.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/mn10300/Makefile.in
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/sim/ppc/hw_memory.c
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/sim/v850/Makefile.in
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/dist/sim/configure
diff -u src/external/gpl3/gdb/dist/sim/configure:1.4 src/external/gpl3/gdb/dist/sim/configure:1.5
--- src/external/gpl3/gdb/dist/sim/configure:1.4 Sun Jun 22 19:52:59 2014
+++ src/external/gpl3/gdb/dist/sim/configure Sun Aug 16 06:00:19 2015
@@ -3775,6 +3775,7 @@ subdirs=$subdirs arm
subdirs=$subdirs msp430
+ sim_testsuite=yes
;;
rl78-*-*)
Index: src/external/gpl3/gdb/dist/sim/common/callback.c
diff -u src/external/gpl3/gdb/dist/sim/common/callback.c:1.4 src/external/gpl3/gdb/dist/sim/common/callback.c:1.5
--- src/external/gpl3/gdb/dist/sim/common/callback.c:1.4 Sun Jun 22 19:52:59 2014
+++ src/external/gpl3/gdb/dist/sim/common/callback.c Sun Aug 16 06:00:19 2015
@@ -1,5 +1,5 @@
/* Remote target callback routines.
- Copyright 1995-2014 Free Software Foundation, Inc.
+ Copyright 1995-2015 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of GDB.
@@ -69,43 +69,10 @@ extern CB_TARGET_DEFS_MAP cb_init_syscal
extern CB_TARGET_DEFS_MAP cb_init_errno_map[];
extern CB_TARGET_DEFS_MAP cb_init_open_map[];
-extern int system (const char *);
-
-static int os_init (host_callback *);
-static int os_shutdown (host_callback *);
-static int os_unlink (host_callback *, const char *);
-static long os_time (host_callback *, long *);
-static int os_system (host_callback *, const char *);
-static int os_rename (host_callback *, const char *, const char *);
-static int os_write_stdout (host_callback *, const char *, int);
-static void os_flush_stdout (host_callback *);
-static int os_write_stderr (host_callback *, const char *, int);
-static void os_flush_stderr (host_callback *);
-static int os_write (host_callback *, int, const char *, int);
-static int os_read_stdin (host_callback *, char *, int);
-static int os_read (host_callback *, int, char *, int);
-static int os_open (host_callback *, const char *, int);
-static int os_lseek (host_callback *, int, long, int);
-static int os_isatty (host_callback *, int);
-static int os_get_errno (host_callback *);
-static int os_close (host_callback *, int);
-static void os_vprintf_filtered (host_callback *, const char *, va_list);
-static void os_evprintf_filtered (host_callback *, const char *, va_list);
-static void os_error (host_callback *, const char *, ...)
-#ifdef __GNUC__
- __attribute__ ((__noreturn__))
-#endif
- ;
-static int fdmap (host_callback *, int);
-static int fdbad (host_callback *, int);
-static int wrap (host_callback *, int);
-
/* Set the callback copy of errno from what we see now. */
static int
-wrap (p, val)
- host_callback *p;
- int val;
+wrap (host_callback *p, int val)
{
p-last_errno = errno;
return val;
@@ -115,9 +82,7 @@ wrap (p, val)
and set errno. */
static int
-fdbad (p, fd)
- host_callback *p;
- int fd;
+fdbad (host_callback *p, int fd)
{
if (fd 0 || fd MAX_CALLBACK_FDS || p-fd_buddy[fd] 0)
{
@@ -128,17 +93,13 @@ fdbad (p, fd)
}
static int
-fdmap (p, fd)
- host_callback *p;
- int fd;
+fdmap (host_callback *p, int fd)
{
return p-fdmap[fd];
}
static int
-os_close (p, fd)
- host_callback *p;
- int fd;
+os_close (host_callback *p, int fd)
{
int result;
int i, next;
@@ -206,8 +167,7 @@ os_close (p, fd)
#if defined(__GO32__) || defined (_MSC_VER)
static int
-os_poll_quit (p)
- host_callback *p;
+os_poll_quit (host_callback *p)
{
#if defined(__GO32__)
int kbhit ();
@@ -244,17 +204,14 @@ os_poll_quit (p)
#endif /* defined(__GO32__) || defined(_MSC_VER) */
static int
-os_get_errno (p)
- host_callback *p;
+os_get_errno (host_callback *p)
{
return cb_host_to_target_errno (p, p-last_errno);
}
static int
-os_isatty (p, fd)
- host_callback *p;
- int fd;
+os_isatty (host_callback *p, int fd)
{
int result;
@@ -267,11 +224,7 @@ os_isatty (p, fd)
}
static int
-os_lseek (p, fd, off, way)
- host_callback *p;
- int fd;
- long off;
- int way;
+os_lseek (host_callback *p, int
CVS commit: src/external/gpl3/gdb/dist/opcodes
Module Name:src
Committed By: christos
Date: Sun Aug 16 10:00:39 UTC 2015
Modified Files:
src/external/gpl3/gdb/dist/opcodes: cgen.sh configure
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/opcodes/cgen.sh
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/opcodes/configure
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/dist/opcodes/cgen.sh
diff -u src/external/gpl3/gdb/dist/opcodes/cgen.sh:1.2 src/external/gpl3/gdb/dist/opcodes/cgen.sh:1.3
--- src/external/gpl3/gdb/dist/opcodes/cgen.sh:1.2 Sun Sep 25 12:30:26 2011
+++ src/external/gpl3/gdb/dist/opcodes/cgen.sh Sun Aug 16 06:00:39 2015
@@ -1,7 +1,7 @@
#! /bin/sh
# CGEN generic assembler support code.
#
-# Copyright 2000, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2000-2015 Free Software Foundation, Inc.
#
# This file is part of the GNU opcodes library.
#
Index: src/external/gpl3/gdb/dist/opcodes/configure
diff -u src/external/gpl3/gdb/dist/opcodes/configure:1.5 src/external/gpl3/gdb/dist/opcodes/configure:1.6
--- src/external/gpl3/gdb/dist/opcodes/configure:1.5 Sun Jun 22 19:52:59 2014
+++ src/external/gpl3/gdb/dist/opcodes/configure Sun Aug 16 06:00:39 2015
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64.
+# Generated by GNU Autoconf 2.64 for opcodes 2.25.51.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
@@ -554,12 +554,12 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
+PACKAGE_NAME='opcodes'
+PACKAGE_TARNAME='opcodes'
+PACKAGE_VERSION='2.25.51'
+PACKAGE_STRING='opcodes 2.25.51'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
ac_unique_file=z8k-dis.c
# Factoring default headers for most tests.
@@ -818,7 +818,7 @@ sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
@@ -1319,7 +1319,7 @@ if test $ac_init_help = long; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat _ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures opcodes 2.25.51 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1367,7 +1367,7 @@ Fine tuning of the installation director
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIRman documentation [DATAROOTDIR/man]
- --docdir=DIRdocumentation root [DATAROOTDIR/doc/PACKAGE]
+ --docdir=DIRdocumentation root [DATAROOTDIR/doc/opcodes]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIRdvi documentation [DOCDIR]
--pdfdir=DIRpdf documentation [DOCDIR]
@@ -1389,7 +1389,9 @@ _ACEOF
fi
if test -n $ac_init_help; then
-
+ case $ac_init_help in
+ short | recursive ) echo Configuration of opcodes 2.25.51:;;
+ esac
cat \_ACEOF
Optional Features:
@@ -1495,7 +1497,7 @@ fi
test -n $ac_init_help exit $ac_status
if $ac_init_version; then
cat \_ACEOF
-configure
+opcodes configure 2.25.51
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1905,7 +1907,7 @@ cat config.log _ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by opcodes $as_me 2.25.51, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -3213,11 +3215,6 @@ if test $ac_res != no; then :
fi
-# We currently only use the version number for the name of any shared
-# library. For user convenience, we always use the same version
-# number that BFD is using.
-BFD_VERSION=`${CONFIG_SHELL} ${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
-
am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
@@ -3717,8 +3714,8 @@ fi
# Define the identity of the package.
- PACKAGE=opcodes
- VERSION=${BFD_VERSION}
+ PACKAGE='opcodes'
+ VERSION='2.25.51'
cat confdefs.h _ACEOF
@@ -7665,7 +7662,7 @@ $as_echo $lt_cv_ld_force_load 6; }
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[012]*)
+ 10.[012][,.]*)
CVS commit: src/external/gpl3/gdb/dist/libiberty
Module Name:src
Committed By: christos
Date: Sun Aug 16 09:58:18 UTC 2015
Modified Files:
src/external/gpl3/gdb/dist/libiberty: make-temp-file.c strerror.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/dist/libiberty/make-temp-file.c \
src/external/gpl3/gdb/dist/libiberty/strerror.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/gpl3/gdb/dist/libiberty/make-temp-file.c
diff -u src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.2 src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.3
--- src/external/gpl3/gdb/dist/libiberty/make-temp-file.c:1.2 Mon Aug 10 11:45:40 2015
+++ src/external/gpl3/gdb/dist/libiberty/make-temp-file.c Sun Aug 16 05:58:18 2015
@@ -93,7 +93,7 @@ static char *memoized_tmpdir;
/*
-@deftypefn Replacement char* choose_tmpdir ()
+@deftypefn Replacement const char* choose_tmpdir ()
Returns a pointer to a directory path suitable for creating temporary
files in.
@@ -102,7 +102,7 @@ files in.
*/
-char *
+const char *
choose_tmpdir (void)
{
if (!memoized_tmpdir)
Index: src/external/gpl3/gdb/dist/libiberty/strerror.c
diff -u src/external/gpl3/gdb/dist/libiberty/strerror.c:1.2 src/external/gpl3/gdb/dist/libiberty/strerror.c:1.3
--- src/external/gpl3/gdb/dist/libiberty/strerror.c:1.2 Sun Sep 25 12:30:26 2011
+++ src/external/gpl3/gdb/dist/libiberty/strerror.c Sun Aug 16 05:58:18 2015
@@ -469,8 +469,13 @@ static const char **sys_errlist;
#else
+
+#ifndef sys_nerr
extern int sys_nerr;
+#endif
+#ifndef sys_errlist
extern char *sys_errlist[];
+#endif
#endif
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Sun Aug 16 11:37:39 UTC 2015 Modified Files: src/lib/librumpuser: rumpuser_port.h rumpuser_sp.c Log Message: Hurd support, part 1 from Robert Millan r...@gnu.org via rumpkernel-users To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/lib/librumpuser/rumpuser_port.h cvs rdiff -u -r1.69 -r1.70 src/lib/librumpuser/rumpuser_sp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/rumpuser_port.h diff -u src/lib/librumpuser/rumpuser_port.h:1.44 src/lib/librumpuser/rumpuser_port.h:1.45 --- src/lib/librumpuser/rumpuser_port.h:1.44 Thu Mar 5 00:25:39 2015 +++ src/lib/librumpuser/rumpuser_port.h Sun Aug 16 11:37:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_port.h,v 1.44 2015/03/05 00:25:39 pooka Exp $ */ +/* $NetBSD: rumpuser_port.h,v 1.45 2015/08/16 11:37:39 pooka Exp $ */ #ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ #define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ @@ -63,7 +63,7 @@ #include rumpuser_config.h #endif -#ifdef __linux__ +#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) #define _GNU_SOURCE #endif Index: src/lib/librumpuser/rumpuser_sp.c diff -u src/lib/librumpuser/rumpuser_sp.c:1.69 src/lib/librumpuser/rumpuser_sp.c:1.70 --- src/lib/librumpuser/rumpuser_sp.c:1.69 Wed Feb 4 12:55:47 2015 +++ src/lib/librumpuser/rumpuser_sp.c Sun Aug 16 11:37:39 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_sp.c,v 1.69 2015/02/04 12:55:47 pooka Exp $ */ +/* $NetBSD: rumpuser_sp.c,v 1.70 2015/08/16 11:37:39 pooka Exp $ */ /* * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -37,7 +37,7 @@ #include rumpuser_port.h #if !defined(lint) -__RCSID($NetBSD: rumpuser_sp.c,v 1.69 2015/02/04 12:55:47 pooka Exp $); +__RCSID($NetBSD: rumpuser_sp.c,v 1.70 2015/08/16 11:37:39 pooka Exp $); #endif /* !lint */ #include sys/types.h @@ -89,8 +89,8 @@ static char banner[MAXBANNER]; #define PROTOMINOR 4 -/* how to use atomic ops on Linux? */ -#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__OpenBSD__) +/* either no atomic ops, or we haven't figured out how to use them */ +#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__GNU__) || defined(__GLIBC__) static pthread_mutex_t discomtx = PTHREAD_MUTEX_INITIALIZER; static void
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Sun Aug 16 11:05:06 UTC 2015
Modified Files:
src/lib/librumpuser: rumpuser.c
Log Message:
Fix return value inspection for clock_nanosleep() (not displayed in the
diff, need to look at the entire file for context).
from Robert Millan r...@freebsd.org via rumpkernel-users
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/lib/librumpuser/rumpuser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.66 src/lib/librumpuser/rumpuser.c:1.67
--- src/lib/librumpuser/rumpuser.c:1.66 Mon Jul 27 07:31:00 2015
+++ src/lib/librumpuser/rumpuser.c Sun Aug 16 11:05:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.66 2015/07/27 07:31:00 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.67 2015/08/16 11:05:06 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.66 2015/07/27 07:31:00 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.67 2015/08/16 11:05:06 pooka Exp $);
#endif /* !lint */
#include sys/stat.h
@@ -156,12 +156,11 @@ rumpuser_clock_sleep(int enum_rumpclock,
tsr.tv_nsec += 1000*1000*1000;
}
rv = nanosleep(tsr, NULL);
+if (rv == -1)
+ rv = errno;
}
#endif
- } while (rv == -1 errno == EINTR);
- if (rv == -1) {
- rv = errno;
- }
+ } while (rv == EINTR);
break;
default:
abort();
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sun Aug 16 11:06:54 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: intr.c
Log Message:
Don't use KASSERT() to test for external return values, use panic()
from Robert Millan r...@freebsd.org
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/rump/librump/rumpkern/intr.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/rump/librump/rumpkern/intr.c
diff -u src/sys/rump/librump/rumpkern/intr.c:1.52 src/sys/rump/librump/rumpkern/intr.c:1.53
--- src/sys/rump/librump/rumpkern/intr.c:1.52 Wed Apr 22 17:38:33 2015
+++ src/sys/rump/librump/rumpkern/intr.c Sun Aug 16 11:06:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.52 2015/04/22 17:38:33 pooka Exp $ */
+/* $NetBSD: intr.c,v 1.53 2015/08/16 11:06:54 pooka Exp $ */
/*
* Copyright (c) 2008-2010, 2015 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.52 2015/04/22 17:38:33 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.53 2015/08/16 11:06:54 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -127,7 +127,10 @@ doclock(void *noarg)
error = rumpuser_clock_sleep(RUMPUSER_CLOCK_ABSMONO,
curclock.tv_sec, curclock.tv_nsec);
- KASSERT(!error);
+ if (error) {
+ panic(rumpuser_clock_sleep failed with error %d,
+ error);
+ }
timespecadd(curclock, thetick, curclock);
}
}
CVS commit: src/sys/dev
Module Name:src
Committed By: mlelstv
Date: Sun Aug 16 14:02:52 UTC 2015
Modified Files:
src/sys/dev: ld.c ldvar.h
Log Message:
replace spl and tsleep with mutex and condvar.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/ld.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ldvar.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/ld.c
diff -u src/sys/dev/ld.c:1.84 src/sys/dev/ld.c:1.85
--- src/sys/dev/ld.c:1.84 Wed Jul 22 10:32:16 2015
+++ src/sys/dev/ld.c Sun Aug 16 14:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.84 2015/07/22 10:32:16 skrll Exp $ */
+/* $NetBSD: ld.c,v 1.85 2015/08/16 14:02:52 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ld.c,v 1.84 2015/07/22 10:32:16 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ld.c,v 1.85 2015/08/16 14:02:52 mlelstv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -126,6 +126,7 @@ ldattach(struct ld_softc *sc)
struct dk_softc *dksc = sc-sc_dksc;
mutex_init(sc-sc_mutex, MUTEX_DEFAULT, IPL_VM);
+ cv_init(sc-sc_drain, lddrain);
if ((sc-sc_flags LDF_ENABLED) == 0) {
return;
@@ -168,11 +169,10 @@ ldattach(struct ld_softc *sc)
int
ldadjqparam(struct ld_softc *sc, int xmax)
{
- int s;
- s = splbio();
+ mutex_enter(sc-sc_mutex);
sc-sc_maxqueuecnt = xmax;
- splx(s);
+ mutex_exit(sc-sc_mutex);
return (0);
}
@@ -181,7 +181,7 @@ int
ldbegindetach(struct ld_softc *sc, int flags)
{
struct dk_softc *dksc = sc-sc_dksc;
- int s, rv = 0;
+ int rv = 0;
if ((sc-sc_flags LDF_ENABLED) == 0)
return (0);
@@ -191,18 +191,16 @@ ldbegindetach(struct ld_softc *sc, int f
if (rv != 0)
return rv;
- s = splbio();
+ mutex_enter(sc-sc_mutex);
sc-sc_maxqueuecnt = 0;
dk_detach(dksc);
while (sc-sc_queuecnt 0) {
sc-sc_flags |= LDF_DRAIN;
- rv = tsleep(sc-sc_queuecnt, PRIBIO, lddrn, 0);
- if (rv)
- break;
+ cv_wait(sc-sc_drain, sc-sc_mutex);
}
- splx(s);
+ mutex_exit(sc-sc_mutex);
return (rv);
}
@@ -211,27 +209,28 @@ void
ldenddetach(struct ld_softc *sc)
{
struct dk_softc *dksc = sc-sc_dksc;
- int s, bmaj, cmaj, i, mn;
+ int bmaj, cmaj, i, mn;
if ((sc-sc_flags LDF_ENABLED) == 0)
return;
+ mutex_enter(sc-sc_mutex);
+
/* Wait for commands queued with the hardware to complete. */
if (sc-sc_queuecnt != 0)
if (tsleep(sc-sc_queuecnt, PRIBIO, lddtch, 30 * hz))
printf(%s: not drained\n, dksc-sc_xname);
- /* Locate the major numbers. */
- bmaj = bdevsw_lookup_major(ld_bdevsw);
- cmaj = cdevsw_lookup_major(ld_cdevsw);
-
/* Kill off any queued buffers. */
- s = splbio();
bufq_drain(dksc-sc_bufq);
- splx(s);
+ mutex_exit(sc-sc_mutex);
bufq_free(dksc-sc_bufq);
+ /* Locate the major numbers. */
+ bmaj = bdevsw_lookup_major(ld_bdevsw);
+ cmaj = cdevsw_lookup_major(ld_cdevsw);
+
/* Nuke the vnodes for any open instances. */
for (i = 0; i MAXPARTITIONS; i++) {
mn = DISKMINOR(device_unit(dksc-sc_dev), i);
@@ -263,6 +262,7 @@ ldenddetach(struct ld_softc *sc)
if ((*sc-sc_flush)(sc, 0) != 0)
aprint_error_dev(dksc-sc_dev, unable to flush cache\n);
#endif
+ cv_destroy(sc-sc_drain);
mutex_destroy(sc-sc_mutex);
}
Index: src/sys/dev/ldvar.h
diff -u src/sys/dev/ldvar.h:1.24 src/sys/dev/ldvar.h:1.25
--- src/sys/dev/ldvar.h:1.24 Sun Jul 26 07:23:10 2015
+++ src/sys/dev/ldvar.h Sun Aug 16 14:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldvar.h,v 1.24 2015/07/26 07:23:10 skrll Exp $ */
+/* $NetBSD: ldvar.h,v 1.25 2015/08/16 14:02:52 mlelstv Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -40,6 +40,7 @@
struct ld_softc {
struct dk_softc sc_dksc;
kmutex_t sc_mutex;
+ kcondvar_t sc_drain;
krndsource_t sc_rnd_source;
int sc_queuecnt; /* current h/w queue depth */
CVS commit: src/sys/dev
Module Name:src
Committed By: mlelstv
Date: Sun Aug 16 14:07:19 UTC 2015
Modified Files:
src/sys/dev: ld.c
Log Message:
replace tsleep with condvar
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/ld.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/ld.c
diff -u src/sys/dev/ld.c:1.85 src/sys/dev/ld.c:1.86
--- src/sys/dev/ld.c:1.85 Sun Aug 16 14:02:52 2015
+++ src/sys/dev/ld.c Sun Aug 16 14:07:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.85 2015/08/16 14:02:52 mlelstv Exp $ */
+/* $NetBSD: ld.c,v 1.86 2015/08/16 14:07:19 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ld.c,v 1.85 2015/08/16 14:02:52 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: ld.c,v 1.86 2015/08/16 14:07:19 mlelstv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -217,9 +217,10 @@ ldenddetach(struct ld_softc *sc)
mutex_enter(sc-sc_mutex);
/* Wait for commands queued with the hardware to complete. */
- if (sc-sc_queuecnt != 0)
- if (tsleep(sc-sc_queuecnt, PRIBIO, lddtch, 30 * hz))
+ if (sc-sc_queuecnt != 0) {
+ if (cv_timedwait(sc-sc_drain, sc-sc_mutex, 30 * hz))
printf(%s: not drained\n, dksc-sc_xname);
+ }
/* Kill off any queued buffers. */
bufq_drain(dksc-sc_bufq);
CVS commit: src/sys/dev
Module Name:src Committed By: mlelstv Date: Sun Aug 16 17:28:28 UTC 2015 Modified Files: src/sys/dev: dksubr.c Log Message: require write access to delete a wedge To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/dev/dksubr.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/dksubr.c diff -u src/sys/dev/dksubr.c:1.69 src/sys/dev/dksubr.c:1.70 --- src/sys/dev/dksubr.c:1.69 Sun Aug 16 17:26:16 2015 +++ src/sys/dev/dksubr.c Sun Aug 16 17:28:28 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dksubr.c,v 1.69 2015/08/16 17:26:16 mlelstv Exp $ */ +/* $NetBSD: dksubr.c,v 1.70 2015/08/16 17:28:28 mlelstv Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.69 2015/08/16 17:26:16 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.70 2015/08/16 17:28:28 mlelstv Exp $); #include sys/param.h #include sys/systm.h @@ -360,6 +360,7 @@ dk_ioctl(struct dk_softc *dksc, dev_t de case DIOCKLABEL: case DIOCWLABEL: case DIOCAWEDGE: + case DIOCDWEDGE: case DIOCSSTRATEGY: if ((flag FWRITE) == 0) return EBADF;
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-sunffb
Module Name:src
Committed By: macallan
Date: Sun Aug 16 17:48:24 UTC 2015
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile
Log Message:
add ffb_accel_common.c
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.5 Tue Aug 11 03:58:18 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Sun Aug 16 17:48:24 2015
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/08/11 03:58:18 macallan Exp $
+# $NetBSD: Makefile,v 1.6 2015/08/16 17:48:24 macallan Exp $
DRIVER= xf86-video-sunffb
DRIVER_NAME= sunffb_drv
SRCS= ffb_accel.c ffb_dac.c ffb_driver.c ffb_wid.c ffb_attr.c \
ffb_ddc.c ffb_cursor.c ffb_dga.c ffb_exa.c \
+ ffb_accel_common.c \
VISmoveImage.s ffb_asm.s
.if ${MACHINE_ARCH} == sparc64
CVS commit: src/sys
Module Name:src
Committed By: mlelstv
Date: Sun Aug 16 18:00:03 UTC 2015
Modified Files:
src/sys/arch/xen/xen: xbd_xenbus.c
src/sys/dev: cgd.c dksubr.c dkvar.h ld.c
src/sys/sys: disk.h param.h
Log Message:
Two changes to the dksubr interface.
- d_diskstart callback now processes a single buffer only.
The new wrapper function dk_start processes the queue,
performs other buffer handling and also provides locking
for the the data structures.
- add d_discard callback to handle device specific function inside
the new dk_discard helper function.
Replace splbio with mutex to protect queue and disk structure.
Refactor common code in dk_strategy and dk_discard into dk_translate.
Adjust and simplify ld(4), cgd(4) and xbd(4) drivers accordingly.
ld(4) now becomes MP_SAFE.
Bump kernel version.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/cgd.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/dksubr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dkvar.h
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/ld.c
cvs rdiff -u -r1.64 -r1.65 src/sys/sys/disk.h
cvs rdiff -u -r1.482 -r1.483 src/sys/sys/param.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/xen/xen/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.71 src/sys/arch/xen/xen/xbd_xenbus.c:1.72
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.71 Sat May 2 08:00:08 2015
+++ src/sys/arch/xen/xen/xbd_xenbus.c Sun Aug 16 18:00:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd_xenbus.c,v 1.71 2015/05/02 08:00:08 mlelstv Exp $ */
+/* $NetBSD: xbd_xenbus.c,v 1.72 2015/08/16 18:00:03 mlelstv Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -40,7 +40,7 @@
* - initiate request: xbdread/write/open/ioctl/..
* - depending on operation, it is handled directly by disk(9) subsystem or
* goes through physio(9) first.
- * - the request is ultimately processed by xbdstart() that prepares the
+ * - the request is ultimately processed by xbd_diskstart() that prepares the
* xbd requests, post them in the ring I/O queue, then signal the backend.
*
* When a response is available in the queue, the backend signals the frontend
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xbd_xenbus.c,v 1.71 2015/05/02 08:00:08 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: xbd_xenbus.c,v 1.72 2015/08/16 18:00:03 mlelstv Exp $);
#include opt_xen.h
@@ -168,7 +168,7 @@ static bool xbd_xenbus_suspend(device_t,
static bool xbd_xenbus_resume(device_t, const pmf_qual_t *);
static int xbd_handler(void *);
-static void xbdstart(device_t);
+static int xbd_diskstart(device_t, struct buf *);
static void xbd_backend_changed(void *, XenbusState);
static void xbd_connect(struct xbd_xenbus_softc *);
@@ -223,7 +223,7 @@ static struct dkdriver xbddkdriver = {
.d_minphys = xbdminphys,
.d_open = xbdopen,
.d_close = xbdclose,
- .d_diskstart = xbdstart,
+ .d_diskstart = xbd_diskstart,
};
static int
@@ -697,7 +697,7 @@ again:
bp-b_resid = bp-b_bcount;
goto next;
}
- /* b_resid was set in xbdstart */
+ /* b_resid was set in dk_start */
next:
if (bp-b_data != xbdreq-req_data)
xbd_unmap_align(xbdreq);
@@ -720,7 +720,7 @@ done:
if (sc-sc_xbdreq_wait)
wakeup(sc-sc_xbdreq_wait);
else
- xbdstart(sc-sc_dksc.sc_dev);
+ dk_start(sc-sc_dksc, NULL);
return 1;
}
@@ -918,156 +918,111 @@ xbddump(dev_t dev, daddr_t blkno, void *
return dk_dump(sc-sc_dksc, dev, blkno, va, size);
}
-static void
-xbdstart(device_t self)
+static int
+xbd_diskstart(device_t self, struct buf *bp)
{
struct xbd_xenbus_softc *sc = device_private(self);
- struct dk_softc *dksc = sc-sc_dksc;
- struct buf *bp;
-#ifdef DIAGNOSTIC
- struct buf *qbp;
-#endif
struct xbd_req *xbdreq;
blkif_request_t *req;
size_t bcount, off;
paddr_t ma;
vaddr_t va;
int nsects, nbytes, seg;
- int notify;
-
- while ((bp = bufq_peek(dksc-sc_bufq)) != NULL) {
+ int notify, error = 0;
- DPRINTF((xbdstart(%p): b_bcount = %ld\n,
- bp, (long)bp-b_bcount));
+ DPRINTF((xbd_diskstart(%p): b_bcount = %ld\n,
+ bp, (long)bp-b_bcount));
- if (sc-sc_shutdown != BLKIF_SHUTDOWN_RUN) {
- bp-b_error = EIO;
- goto err;
- }
+ if (sc-sc_shutdown != BLKIF_SHUTDOWN_RUN) {
+ error = EIO;
+ goto err;
+ }
- if (bp-b_rawblkno 0 || bp-b_rawblkno sc-sc_xbdsize) {
- /* invalid block number */
- bp-b_error = EINVAL;
- goto err;
- }
+ if (bp-b_rawblkno 0 || bp-b_rawblkno sc-sc_xbdsize) {
+ /* invalid block number */
+ error = EINVAL;
+ goto err;
+ }
- if (bp-b_rawblkno == sc-sc_xbdsize) {
- /* at end of disk; return short read */
- bp-b_resid = bp-b_bcount;
-#ifdef DIAGNOSTIC
- qbp = bufq_get(dksc-sc_bufq);
- KASSERT(bp == qbp);
-#else
- (void)bufq_get(dksc-sc_bufq);
-#endif
- biodone(bp);
- continue;
- }
+ if
CVS commit: src/sys/dev
Module Name:src
Committed By: mlelstv
Date: Sun Aug 16 17:26:16 UTC 2015
Modified Files:
src/sys/dev: dksubr.c
Log Message:
move FWRITE checks to a common place
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.68 src/sys/dev/dksubr.c:1.69
--- src/sys/dev/dksubr.c:1.68 Sun Aug 2 07:25:40 2015
+++ src/sys/dev/dksubr.c Sun Aug 16 17:26:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.68 2015/08/02 07:25:40 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.69 2015/08/16 17:26:16 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.68 2015/08/02 07:25:40 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.69 2015/08/16 17:26:16 mlelstv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -357,9 +357,10 @@ dk_ioctl(struct dk_softc *dksc, dev_t de
case ODIOCSDINFO:
case ODIOCWDINFO:
#endif
+ case DIOCKLABEL:
case DIOCWLABEL:
case DIOCAWEDGE:
- case DIOCDWEDGE:
+ case DIOCSSTRATEGY:
if ((flag FWRITE) == 0)
return EBADF;
}
@@ -431,8 +432,6 @@ dk_ioctl(struct dk_softc *dksc, dev_t de
break;
case DIOCKLABEL:
- if ((flag FWRITE) == 0)
- return (EBADF);
if (*(int *)data != 0)
dksc-sc_flags |= DKF_KLABEL;
else
@@ -480,9 +479,6 @@ dk_ioctl(struct dk_softc *dksc, dev_t de
struct bufq_state *old;
int s;
- if ((flag FWRITE) == 0) {
- return EBADF;
- }
if (dks-dks_param != NULL) {
return EINVAL;
}
CVS commit: src/sys/dev
Module Name:src
Committed By: mlelstv
Date: Sun Aug 16 17:32:31 UTC 2015
Modified Files:
src/sys/dev: ld.c
Log Message:
missed wakeup - cv_broadcast conversion.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/ld.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/ld.c
diff -u src/sys/dev/ld.c:1.87 src/sys/dev/ld.c:1.88
--- src/sys/dev/ld.c:1.87 Sun Aug 16 17:22:00 2015
+++ src/sys/dev/ld.c Sun Aug 16 17:32:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.87 2015/08/16 17:22:00 mlelstv Exp $ */
+/* $NetBSD: ld.c,v 1.88 2015/08/16 17:32:31 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ld.c,v 1.87 2015/08/16 17:22:00 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: ld.c,v 1.88 2015/08/16 17:32:31 mlelstv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -466,7 +466,7 @@ lddone(struct ld_softc *sc, struct buf *
if (--sc-sc_queuecnt = sc-sc_maxqueuecnt) {
if ((sc-sc_flags LDF_DRAIN) != 0) {
sc-sc_flags = ~LDF_DRAIN;
- wakeup(sc-sc_queuecnt);
+ cv_broadcast(sc-sc_drain);
}
mutex_exit(sc-sc_mutex);
ld_start(dksc-sc_dev);
CVS commit: src/sys/dev
Module Name:src
Committed By: mlelstv
Date: Sun Aug 16 17:22:00 UTC 2015
Modified Files:
src/sys/dev: ld.c
Log Message:
use device_printf
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/ld.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/ld.c
diff -u src/sys/dev/ld.c:1.86 src/sys/dev/ld.c:1.87
--- src/sys/dev/ld.c:1.86 Sun Aug 16 14:07:19 2015
+++ src/sys/dev/ld.c Sun Aug 16 17:22:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.86 2015/08/16 14:07:19 mlelstv Exp $ */
+/* $NetBSD: ld.c,v 1.87 2015/08/16 17:22:00 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ld.c,v 1.86 2015/08/16 14:07:19 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: ld.c,v 1.87 2015/08/16 17:22:00 mlelstv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -261,7 +261,7 @@ ldenddetach(struct ld_softc *sc)
/* Flush the device's cache. */
if (sc-sc_flush != NULL)
if ((*sc-sc_flush)(sc, 0) != 0)
- aprint_error_dev(dksc-sc_dev, unable to flush cache\n);
+ device_printf(dksc-sc_dev, unable to flush cache\n);
#endif
cv_destroy(sc-sc_drain);
mutex_destroy(sc-sc_mutex);
@@ -282,7 +282,7 @@ ld_shutdown(device_t dev, int flags)
struct dk_softc *dksc = sc-sc_dksc;
if (sc-sc_flush != NULL (*sc-sc_flush)(sc, LDFL_POLL) != 0) {
- printf(%s: unable to flush cache\n, dksc-sc_xname);
+ device_printf(dksc-sc_dev, unable to flush cache\n);
return false;
}
@@ -311,7 +311,7 @@ ld_lastclose(device_t self)
struct ld_softc *sc = device_private(self);
if (sc-sc_flush != NULL (*sc-sc_flush)(sc, 0) != 0)
- aprint_error_dev(self, unable to flush cache\n);
+ device_printf(self, unable to flush cache\n);
return 0;
}
CVS commit: xsrc/external/mit/xf86-video-sunffb/dist/src
Module Name:xsrc
Committed By: macallan
Date: Sun Aug 16 17:47:39 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h ffb_accel.c
ffb_exa.c
Added Files:
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb_accel_common.c
Log Message:
- move some routines used by both XAA and EXA to their own file
- enable hardware prefetch when reading from video memory - now blits in EXA
are no longer slower than in XAA
- start fleshing out Xrender routines
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_exa.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-video-sunffb/dist/src/ffb.h
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.6 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.7
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.6 Tue Aug 11 03:57:36 2015
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h Sun Aug 16 17:47:39 2015
@@ -206,9 +206,13 @@ typedef struct {
/* EXA stuff */
ExaDriverPtr pExa;
- int srcpitch, srcoff;
int xdir, ydir, rop;
- CARD32 planemask, fbc, wid;
+ CARD32 planemask, fbc, wid, fillcolour;
+ Bool no_source_pixmap, source_is_solid;
+ int srcoff, srcpitch, mskoff, mskpitch;
+ CARD32 srcformat, dstformat, mskformat;
+ int op;
+
PixmapPtr pix32, pix8;
@@ -298,4 +302,9 @@ do { fprintf __x; \
#define FFBLOG(__x) do { } while(0)
#endif
+/* common acceleration routines */
+void FFB_SetupTextureAttrs(FFBPtr);
+void FFB_HardwareSetup(FFBPtr);
+void CreatorAlignTabInit(FFBPtr);
+
#endif /* FFB_H */
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.4 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.5
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.4 Tue Aug 11 03:57:36 2015
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c Sun Aug 16 17:47:39 2015
@@ -142,28 +142,6 @@ static CARD32 FFBAlphaTextureFormats[2]
static CARD32 FFBTextureFormats[2] = { PICT_a8b8g8r8, 0 };
static CARD32 FFBTextureDstFormats[3] = { PICT_a8b8g8r8, PICT_x8b8g8r8, 0 };
-static void FFB_SetupTextureAttrs(FFBPtr pFfb)
-{
- ffb_fbcPtr ffb = pFfb-regs;
- unsigned int ppc = FFB_PPC_APE_DISABLE | FFB_PPC_CS_VAR | FFB_PPC_XS_VAR;
- unsigned int ppc_mask = FFB_PPC_APE_MASK | FFB_PPC_CS_MASK | FFB_PPC_XS_MASK;
- unsigned int rop = FFB_ROP_NEW | (FFB_ROP_NEW 8);
- unsigned int fbc = pFfb-fbc;
- unsigned int wid = pFfb-wid;
-
- ppc |= FFB_PPC_ABE_ENABLE;
- ppc_mask |= FFB_PPC_ABE_MASK;
-
- if ((pFfb-ppc_cache ppc_mask) != ppc ||
- pFfb-fbc_cache != fbc ||
- pFfb-wid_cache != wid ||
- pFfb-rop_cache != rop ||
- pFfb-pmask_cache != 0x)
- __FFB_Attr_SFB_VAR(pFfb, ppc, ppc_mask, fbc,
- wid, rop, 0x);
- FFBWait(pFfb, ffb);
-}
-
static Bool FFB_SetupForCPUToScreenAlphaTexture(
ScrnInfoPtr pScrn,
int op,
@@ -808,21 +786,6 @@ static void FFB_Sync(ScrnInfoPtr pScrn)
FFBWait(pFfb, ffb);
}
-/* Multiplies and divides suck... */
-static void CreatorAlignTabInit(FFBPtr pFfb)
-{
- struct fastfill_parms *ffp = FFB_FFPARMS(pFfb);
- short *tab = pFfb-Pf_AlignTab;
- int i;
-
- for(i = 0; i 0x800; i++) {
- int alignval;
-
- alignval = (i / ffp-pagefill_width) * ffp-pagefill_width;
- *tab++ = alignval;
- }
-}
-
#endif
Bool FFBAccelInit(ScreenPtr pScreen, FFBPtr pFfb)
@@ -961,66 +924,7 @@ Bool FFBAccelInit(ScreenPtr pScreen, FFB
FFB: cfg0(%08x) cfg1(%08x) cfg2(%08x) cfg3(%08x) ppcfg(%08x)\n,
ffb-fbcfg0, ffb-fbcfg1, ffb-fbcfg2, ffb-fbcfg3, ffb-ppcfg));
- /* Determine the current screen resolution type. This is
- * needed to figure out the fastfill/pagefill parameters.
- */
- switch(ffb-fbcfg0 FFB_FBCFG0_RES_MASK) {
- default:
- case FFB_FBCFG0_RES_STD:
- pFfb-ffb_res = ffb_res_standard;
- break;
- case FFB_FBCFG0_RES_HIGH:
- pFfb-ffb_res = ffb_res_high;
- break;
- case FFB_FBCFG0_RES_STEREO:
- pFfb-ffb_res = ffb_res_stereo;
- break;
- case FFB_FBCFG0_RES_PRTRAIT:
- pFfb-ffb_res = ffb_res_portrait;
- break;
- };
- CreatorAlignTabInit(pFfb);
-
- /* Next, determine the hwbug workarounds and feature enables
- * we should be using on this board.
- */
- pFfb-disable_pagefill = 0;
- pFfb-disable_vscroll = 0;
- pFfb-has_brline_bug = 0;
- pFfb-use_blkread_prefetch = 0;
- if (pFfb-ffb_type == ffb1_prototype ||
- pFfb-ffb_type == ffb1_standard ||
- pFfb-ffb_type == ffb1_speedsort) {
-
CVS commit: src/sys/arch/sparc/stand/bootblk
Module Name:src Committed By: jdc Date: Sun Aug 16 10:58:54 UTC 2015 Modified Files: src/sys/arch/sparc/stand/bootblk: bootblk.fth genlfs.cf Log Message: Make these compile again after changes to LFS. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/stand/bootblk/bootblk.fth cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc/stand/bootblk/genlfs.cf 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/sparc/stand/bootblk/bootblk.fth diff -u src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.13 src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.14 --- src/sys/arch/sparc/stand/bootblk/bootblk.fth:1.13 Thu Jun 24 00:54:12 2010 +++ src/sys/arch/sparc/stand/bootblk/bootblk.fth Sun Aug 16 10:58:54 2015 @@ -1,4 +1,4 @@ -\ $NetBSD: bootblk.fth,v 1.13 2010/06/24 00:54:12 eeh Exp $ +\ $NetBSD: bootblk.fth,v 1.14 2015/08/16 10:58:54 jdc Exp $ \ \ IEEE 1275 Open Firmware Boot Block \ @@ -605,7 +605,7 @@ create cur-blockno -1 l, -1 l, \ Curren boot-debug? if . LFS v2 cr then init-lfs-common ' lfs_bsize to fs-bsize - ' ifile_SIZEOF to /ifile + ' ifile32_SIZEOF to /ifile ' if2_daddr to if_daddr ; @@ -890,7 +890,7 @@ create cur-blockno -1 l, -1 l, \ Curren : do-boot ( bootfile -- ) . NetBSD IEEE 1275 Multi-FS Bootblock cr - . Version $NetBSD: bootblk.fth,v 1.13 2010/06/24 00:54:12 eeh Exp $ cr + . Version $NetBSD: bootblk.fth,v 1.14 2015/08/16 10:58:54 jdc Exp $ cr boot-path load-file ( -- load-base ) dup 0 if init-program evaluate then ; Index: src/sys/arch/sparc/stand/bootblk/genlfs.cf diff -u src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.2 src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.3 --- src/sys/arch/sparc/stand/bootblk/genlfs.cf:1.2 Mon Jun 10 10:26:22 2013 +++ src/sys/arch/sparc/stand/bootblk/genlfs.cf Sun Aug 16 10:58:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: genlfs.cf,v 1.2 2013/06/10 10:26:22 hannken Exp $ +# $NetBSD: genlfs.cf,v 1.3 2015/08/16 10:58:54 jdc Exp $ # Copyright (c) 2010 Eduardo Horvath. # All rights reserved. @@ -63,16 +63,16 @@ member if1_version if_version member if1_daddr if_daddr # -# LFS v2 ifile +# LFS v2 ifile32 # -struct ifile +struct ifile32 member if2_version if_version member if2_daddr if_daddr # # LFS v1 dinode # -struct ulfs1_dinode +struct lfs32_dinode member di_inumber di_inumber define lfs_magic_value LFS_MAGIC
CVS commit: src/sys/dev/i2o
Module Name:src
Committed By: msaitoh
Date: Sun Aug 16 19:22:33 UTC 2015
Modified Files:
src/sys/dev/i2o: iopsp.c
Log Message:
Fix device_t/softc split bug.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/i2o/iopsp.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/i2o/iopsp.c
diff -u src/sys/dev/i2o/iopsp.c:1.36 src/sys/dev/i2o/iopsp.c:1.37
--- src/sys/dev/i2o/iopsp.c:1.36 Sat Oct 27 17:18:17 2012
+++ src/sys/dev/i2o/iopsp.c Sun Aug 16 19:22:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iopsp.c,v 1.36 2012/10/27 17:18:17 chs Exp $ */
+/* $NetBSD: iopsp.c,v 1.37 2015/08/16 19:22:33 msaitoh Exp $ */
/*-
* Copyright (c) 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: iopsp.c,v 1.36 2012/10/27 17:18:17 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: iopsp.c,v 1.37 2015/08/16 19:22:33 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -83,6 +83,7 @@ static int
iopsp_match(device_t parent, cfdata_t match, void *aux)
{
struct iop_attach_args *ia;
+ struct iop_softc *iop;
struct {
struct i2o_param_op_results pr;
struct i2o_param_read_results prr;
@@ -90,12 +91,13 @@ iopsp_match(device_t parent, cfdata_t ma
} __packed param;
ia = aux;
+ iop = device_private(parent);
if (ia-ia_class != I2O_CLASS_BUS_ADAPTER_PORT)
return (0);
- if (iop_field_get_all((struct iop_softc *)parent, ia-ia_tid,
- I2O_PARAM_HBA_CTLR_INFO, param, sizeof(param), NULL) != 0)
+ if (iop_field_get_all(iop, ia-ia_tid, I2O_PARAM_HBA_CTLR_INFO, param,
+ sizeof(param), NULL) != 0)
return (0);
return (param.ci.bustype == I2O_HBA_BUS_SCSI ||
CVS commit: src/sys/dev/i2o
Module Name:src Committed By: msaitoh Date: Sun Aug 16 19:21:33 UTC 2015 Modified Files: src/sys/dev/i2o: iop.c Log Message: Fix a buffer pointer check in iop_msg_unmap(). The number of im_xfer is IOP_MAX_MSG_XFERS and it's three. iop_systab_set() makes three ximit buffers. In this case, iop_msg_unmap() overrruns by if((++ix)-ix_size == 0). Check overrun first. This change fixes a bug that iop(4) panics while attaching iopsp(4). To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/dev/i2o/iop.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/i2o/iop.c diff -u src/sys/dev/i2o/iop.c:1.86 src/sys/dev/i2o/iop.c:1.87 --- src/sys/dev/i2o/iop.c:1.86 Fri Jul 25 08:10:37 2014 +++ src/sys/dev/i2o/iop.c Sun Aug 16 19:21:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: iop.c,v 1.86 2014/07/25 08:10:37 dholland Exp $ */ +/* $NetBSD: iop.c,v 1.87 2015/08/16 19:21:33 msaitoh Exp $ */ /*- * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: iop.c,v 1.86 2014/07/25 08:10:37 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: iop.c,v 1.87 2015/08/16 19:21:33 msaitoh Exp $); #include iop.h @@ -2088,10 +2088,10 @@ iop_msg_unmap(struct iop_softc *sc, stru /* Only the first DMA map is static. */ if (i != 0) bus_dmamap_destroy(sc-sc_dmat, ix-ix_map); - if ((++ix)-ix_size == 0) - break; if (++i = IOP_MAX_MSG_XFERS) break; + if ((++ix)-ix_size == 0) + break; } }
