CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Mon May 18 06:42:34 UTC 2015 Modified Files: src/sys/sys: param.h Log Message: Welcome to 7.99.17 (if_clone_list() became public and changed signature) To generate a diff of this commit: cvs rdiff -u -r1.478 -r1.479 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/sys/param.h diff -u src/sys/sys/param.h:1.478 src/sys/sys/param.h:1.479 --- src/sys/sys/param.h:1.478 Sat May 9 15:22:47 2015 +++ src/sys/sys/param.h Mon May 18 06:42:34 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.478 2015/05/09 15:22:47 rtr Exp $ */ +/* $NetBSD: param.h,v 1.479 2015/05/18 06:42:34 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 799001600 /* NetBSD 7.99.16 */ +#define __NetBSD_Version__ 799001700 /* NetBSD 7.99.17 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys
Module Name:src
Committed By: martin
Date: Mon May 18 06:38:59 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
src/sys/net: if.c if.h
Log Message:
Implement SIOCIFGCLONERS for netbsd32, so ifconfig -C works.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/netbsd32/netbsd32_ioctl.h
cvs rdiff -u -r1.314 -r1.315 src/sys/net/if.c
cvs rdiff -u -r1.189 -r1.190 src/sys/net/if.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/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.69 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.70
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.69 Fri Jan 24 12:16:10 2014
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Mon May 18 06:38:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.69 2014/01/24 12:16:10 bouyer Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.70 2015/05/18 06:38:59 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.69 2014/01/24 12:16:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.70 2015/05/18 06:38:59 martin Exp $");
#include
#include
@@ -899,6 +899,17 @@ netbsd32_ioctl(struct lwp *l, const stru
case ATAIOCCOMMAND32:
IOCTL_STRUCT_CONV_TO(ATAIOCCOMMAND, atareq);
+ case SIOCIFGCLONERS32:
+ {
+ struct netbsd32_if_clonereq *req =
+ (struct netbsd32_if_clonereq *)data32;
+ char *buf = NETBSD32PTR64(req->ifcr_buffer);
+
+ error = if_clone_list(req->ifcr_count,
+ buf, &req->ifcr_total);
+ break;
+ }
+
/*
* only a few ifreq syscalls need conversion and those are
* all driver specific... XXX
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.44 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.45
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.44 Fri Jan 24 10:41:07 2014
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Mon May 18 06:38:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.44 2014/01/24 10:41:07 manu Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.45 2015/05/18 06:38:59 martin Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -314,6 +314,12 @@ struct netbsd32_if_addrprefreq {
} ifap_addr;
};
+struct netbsd32_if_clonereq {
+ int ifcr_total;
+ int ifcr_count;
+ netbsd32_charp ifcr_buffer;
+};
+
/* from */
#define SIOCGADDRROM32 _IOW('i', 240, struct netbsd32_ifreq) /* get 128 bytes of ROM */
#define SIOCGCHIPID32 _IOWR('i', 241, struct netbsd32_ifreq) /* get chipid */
@@ -375,6 +381,8 @@ struct netbsd32_if_addrprefreq {
#define SIOCSIFMEDIA32 _IOWR('i', 53, struct netbsd32_ifreq) /* set net media */
#define OSIOCSIFMEDIA32 _IOWR('i', 53, struct netbsd32_oifreq) /* set net media */
+#define SIOCIFGCLONERS32 _IOWR('i', 120, struct netbsd32_if_clonereq) /* get cloners */
+
#define SIOCSIFMTU32 _IOW('i', 127, struct netbsd32_ifreq) /* set ifnet mtu */
#define OSIOCSIFMTU32 _IOW('i', 127, struct netbsd32_oifreq) /* set ifnet mtu */
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.314 src/sys/net/if.c:1.315
--- src/sys/net/if.c:1.314 Wed Apr 22 20:49:44 2015
+++ src/sys/net/if.c Mon May 18 06:38:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.314 2015/04/22 20:49:44 roy Exp $ */
+/* $NetBSD: if.c,v 1.315 2015/05/18 06:38:59 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.314 2015/04/22 20:49:44 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.315 2015/05/18 06:38:59 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -177,7 +177,6 @@ int ifqmaxlen = IFQ_MAXLEN;
static int if_rt_walktree(struct rtentry *, void *);
static struct if_clone *if_clone_lookup(const char *, int *);
-static int if_clone_list(struct if_clonereq *);
static LIST_HEAD(, if_clone) if_cloners = LIST_HEAD_INITIALIZER(if_cloners);
static int if_cloners_count;
@@ -1117,24 +1116,24 @@ if_clone_detach(struct if_clone *ifc)
/*
* Provide list of interface cloners to userspace.
*/
-static int
-if_clone_list(struct if_clonereq *ifcr)
+int
+if_clone_list(int buf_count, char *buffer, int *total)
{
char outbuf[IFNAMSIZ], *dst;
struct if_clone *ifc;
int count, error = 0;
- ifcr->ifcr_total = if_cloners_count;
- if ((dst = ifcr->ifcr_buffer) == NULL) {
+ *total = if_cloners_count;
+ if ((dst = buffer) == NULL) {
/* Just asking how many there are. */
return 0;
}
- if (ifcr->ifcr_count < 0)
+ if (buf_count < 0)
return EINVAL;
- count = (if_cloners_count < ifcr->ifcr_count) ?
- if_cloners_count : ifcr->ifcr_count;
+ count = (if_cloners_count < buf_count) ?
+ if_cloners_count : buf_count;
for (ifc = LIST_FIRS
CVS commit: src
Module Name:src
Committed By: ozaki-r
Date: Mon May 18 06:27:04 UTC 2015
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/net/route: Makefile
Added Files:
src/tests/net/route: t_flags.sh
Log Message:
Add tests for route flags
To generate a diff of this commit:
cvs rdiff -u -r1.621 -r1.622 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/net/route/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/route/t_flags.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.621 src/distrib/sets/lists/tests/mi:1.622
--- src/distrib/sets/lists/tests/mi:1.621 Fri May 15 10:53:58 2015
+++ src/distrib/sets/lists/tests/mi Mon May 18 06:27:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.621 2015/05/15 10:53:58 ozaki-r Exp $
+# $NetBSD: mi,v 1.622 2015/05/18 06:27:04 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3179,6 +3179,7 @@
./usr/tests/net/route/Atffile tests-net-tests atf,rump
./usr/tests/net/route/Kyuafile tests-net-tests atf,rump,kyua
./usr/tests/net/route/t_change tests-net-tests atf,rump
+./usr/tests/net/route/t_flags tests-net-tests atf,rump
./usr/tests/net/systests-net-tests
./usr/tests/net/sys/Atffile tests-net-tests atf
./usr/tests/net/sys/Kyuafile tests-net-tests atf,kyua
Index: src/tests/net/route/Makefile
diff -u src/tests/net/route/Makefile:1.1 src/tests/net/route/Makefile:1.2
--- src/tests/net/route/Makefile:1.1 Tue Feb 8 10:11:29 2011
+++ src/tests/net/route/Makefile Mon May 18 06:27:04 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2011/02/08 10:11:29 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2015/05/18 06:27:04 ozaki-r Exp $
#
.include
TESTSDIR= ${TESTSBASE}/net/route
-TESTS_SH= t_change
+TESTS_SH= t_change t_flags
.include
Added files:
Index: src/tests/net/route/t_flags.sh
diff -u /dev/null src/tests/net/route/t_flags.sh:1.1
--- /dev/null Mon May 18 06:27:04 2015
+++ src/tests/net/route/t_flags.sh Mon May 18 06:27:04 2015
@@ -0,0 +1,393 @@
+# $NetBSD: t_flags.sh,v 1.1 2015/05/18 06:27:04 ozaki-r Exp $
+#
+# Copyright (c) 2015 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+netserver=\
+"rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_shmif"
+SOCK_LOCAL=unix://commsock1
+SOCK_PEER=unix://commsock2
+SOCK_GW=unix://commsock3
+BUS=bus1
+BUS2=bus2
+
+DEBUG=false
+
+setup_local()
+{
+
+ atf_check -s exit:0 ${netserver} ${SOCK_LOCAL}
+
+ export RUMP_SERVER=$SOCK_LOCAL
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 create
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 linkstr ${BUS}
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 10.0.0.2/24
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 up
+
+ $DEBUG && rump.ifconfig
+ $DEBUG && rump.netstat -rn -f inet
+}
+
+setup_peer()
+{
+
+ atf_check -s exit:0 ${netserver} ${SOCK_PEER}
+
+ export RUMP_SERVER=$SOCK_PEER
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 create
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 linkstr ${BUS}
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 10.0.0.1/24
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 up
+
+ $DEBUG && rump.ifconfig
+ $DEBUG && rump.netstat -rn -f inet
+}
+
+setup_gw()
+{
+
+ atf_check -s exit:0 ${netserver} ${SOCK_GW}
+
+ export RUMP_SERVER=$SOCK_GW
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 create
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 linkstr ${BUS}
+ atf_check -s exit:0 -o ignore rump.ifconfig shmif0 10.0.0.254/24
+ atf_ch
CVS commit: src/distrib
Module Name:src
Committed By: martin
Date: Mon May 18 06:25:05 UTC 2015
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/common: Makefile.bootcd
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc: Makefile
src/distrib/sparc64/cdroms/installcd: Makefile
src/distrib/vax/cdroms/installcd: Makefile
Log Message:
Add a new simple method to put whole sets on CD images (instead of
listing single binaries or patterns) and use those for the existing
ISO images.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.25 -r1.26 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.33 -r1.34 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.8 -r1.9 src/distrib/sparc/Makefile
cvs rdiff -u -r1.21 -r1.22 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/distrib/vax/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.13 src/distrib/amd64/cdroms/Makefile.cdrom:1.14
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.13 Sat Apr 18 08:56:56 2015
+++ src/distrib/amd64/cdroms/Makefile.cdrom Mon May 18 06:25:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.13 2015/04/18 08:56:56 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.14 2015/05/18 06:25:04 martin Exp $
.include
@@ -11,62 +11,8 @@ CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CDRUNTIME+= ./bin
-CDRUNTIME+= ./dev/MAKEDEV
-CDRUNTIME+= ./etc
-CDRUNTIME+= ./lib
-CDRUNTIME+= ./libdata
-CDRUNTIME+= ./libexec/ld.elf_so
-CDRUNTIME+= ./libexec/lfs_cleanerd
-CDRUNTIME+= ./libexec/dhcpcd-run-hooks
-CDRUNTIME+= ./libexec/resolvconf/
-CDRUNTIME+= ./mnt
-CDRUNTIME+= ./sbin
-CDRUNTIME+= ./stand
-CDRUNTIME+= ./tmp
-CDRUNTIME+= ./usr/bin/ftp
-CDRUNTIME+= ./usr/bin/grep
-CDRUNTIME+= ./usr/bin/gzip
-CDRUNTIME+= ./usr/bin/less
-CDRUNTIME+= ./usr/bin/more
-CDRUNTIME+= ./usr/bin/netstat
-CDRUNTIME+= ./usr/bin/progress
-CDRUNTIME+= ./usr/bin/sed
-CDRUNTIME+= ./usr/bin/sort
-CDRUNTIME+= ./usr/bin/tip
-CDRUNTIME+= ./usr/bin/tput
-CDRUNTIME+= ./usr/bin/vi
-CDRUNTIME+= ./usr/bin/vmstat
-.if ${MKBSDTAR} != "no"
-CDRUNTIME+= ./usr/lib/libarchive.so*
-.endif
-CDRUNTIME+= ./usr/lib/libbz2.so*
-CDRUNTIME+= ./usr/lib/libc.so*
-CDRUNTIME+= ./usr/lib/libcurses.so*
-CDRUNTIME+= ./usr/lib/libedit.so*
-CDRUNTIME+= ./usr/lib/libgcc_s.so*
-CDRUNTIME+= ./usr/lib/libintl.so*
-CDRUNTIME+= ./usr/lib/libkvm.so*
-CDRUNTIME+= ./usr/lib/liblzma.so*
-CDRUNTIME+= ./usr/lib/libpthread.so*
-CDRUNTIME+= ./usr/lib/libterminfo.so*
-CDRUNTIME+= ./usr/lib/libutil.so*
-CDRUNTIME+= ./usr/lib/libz.so*
-.if (${MKCRYPTO} != "no")
-CDRUNTIME+= ./usr/lib/libcrypto.so*
-CDRUNTIME+= ./usr/lib/libssl.so*
-.endif
-CDRUNTIME+= ./usr/libexec/ld.elf_so
-CDRUNTIME+= ./usr/libexec/getty
-CDRUNTIME+= ./usr/mdec
-CDRUNTIME+= ./usr/sbin/chroot
-CDRUNTIME+= ./usr/sbin/installboot
-CDRUNTIME+= ./usr/sbin/wiconfig
-CDRUNTIME+= ./usr/share/misc/terminfo.cdb
-CDRUNTIME+= ./usr/share/locale
-
image_md_pre:
- ${MKDIR} cdrom/etc
+ ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.25 src/distrib/common/Makefile.bootcd:1.26
--- src/distrib/common/Makefile.bootcd:1.25 Sat May 31 10:18:47 2014
+++ src/distrib/common/Makefile.bootcd Mon May 18 06:25:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.25 2014/05/31 10:18:47 martin Exp $
+# $NetBSD: Makefile.bootcd,v 1.26 2015/05/18 06:25:04 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -31,6 +31,9 @@
# CDKERNELS couples of the form:
#source name_on_cd
# CDRUNTIME files/directories to copy from $DESTDIR onto the CD
+# CD_SETS sets to be extracted onto the CD
+# (default: base modules etc)
+# SETS_DIR where the CD_SETS are found (default provided)
# source kernels are copied from ${CDINSTKERNEL} (or its obj dir)
# note that as of yet, bootxx_cd9660 can't load kernel names of more than
# 8 chars (though they can be in a sub-directory meaning the pathname is
@@ -56,11 +59,15 @@ CDRELEASE_EXCLUDE+= -s ',./installation/
CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.endif
+CD_SETS?= base modules etc
+SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
+
.include # For PRINTOBJDIR
.include # For KERNSRCDIR
DISTRIBVER!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh
DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s
+CUROBJDIR!= cd ${.CURDIR} && ${PRINTOBJDIR}
ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z
PUBLISHER?= The_NetBSD_Project
.if defi
CVS commit: [netbsd-7] src/sys/dev/hpc
Module Name:src
Committed By: msaitoh
Date: Mon May 18 01:56:40 UTC 2015
Modified Files:
src/sys/dev/hpc [netbsd-7]: hpcfb.c
Log Message:
Add missing semicolon. Fix build break in last commit.
To generate a diff of this commit:
cvs rdiff -u -r1.58.34.1 -r1.58.34.2 src/sys/dev/hpc/hpcfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hpc/hpcfb.c
diff -u src/sys/dev/hpc/hpcfb.c:1.58.34.1 src/sys/dev/hpc/hpcfb.c:1.58.34.2
--- src/sys/dev/hpc/hpcfb.c:1.58.34.1 Sat May 16 04:06:04 2015
+++ src/sys/dev/hpc/hpcfb.c Mon May 18 01:56:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.58.34.1 2015/05/16 04:06:04 snj Exp $ */
+/* $NetBSD: hpcfb.c,v 1.58.34.2 2015/05/18 01:56:40 msaitoh Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.58.34.1 2015/05/16 04:06:04 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.58.34.2 2015/05/18 01:56:40 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -472,7 +472,7 @@ hpcfb_init(struct hpcfb_fbconf *fbconf,
}
if (rasops_init(ri, HPCFB_MAX_ROW, HPCFB_MAX_COLUMN)) {
- aprint_error_dev(dc->dc_sc->sc_dev, "rasops_init() failed!")
+ aprint_error_dev(dc->dc_sc->sc_dev, "rasops_init() failed!");
return -1;
}
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Mon May 18 01:53:21 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: INSTALL_ERLITE Log Message: Allow automatic insertion of ramdisk image. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/INSTALL_ERLITE 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/evbmips/conf/INSTALL_ERLITE diff -u src/sys/arch/evbmips/conf/INSTALL_ERLITE:1.1 src/sys/arch/evbmips/conf/INSTALL_ERLITE:1.2 --- src/sys/arch/evbmips/conf/INSTALL_ERLITE:1.1 Fri May 1 20:15:43 2015 +++ src/sys/arch/evbmips/conf/INSTALL_ERLITE Mon May 18 01:53:21 2015 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_ERLITE,v 1.1 2015/05/01 20:15:43 matt Exp $ +# $NetBSD: INSTALL_ERLITE,v 1.2 2015/05/18 01:53:21 matt Exp $ include "arch/evbmips/conf/ERLITE" -#ident "INSTALL_ERLITE-$Revision: 1.1 $" +#ident "INSTALL_ERLITE-$Revision: 1.2 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -12,3 +12,5 @@ options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks + +makeoptions NEED_MDSETIMAGE="yes"
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Mon May 18 01:53:50 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: files.octeon Log Message: Use kern/disk_subr_mbr.c instead of evbmips/disksubr.c To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/files.octeon 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/evbmips/conf/files.octeon diff -u src/sys/arch/evbmips/conf/files.octeon:1.2 src/sys/arch/evbmips/conf/files.octeon:1.3 --- src/sys/arch/evbmips/conf/files.octeon:1.2 Fri May 1 21:34:17 2015 +++ src/sys/arch/evbmips/conf/files.octeon Mon May 18 01:53:50 2015 @@ -1,13 +1,14 @@ -# $NetBSD: files.octeon,v 1.2 2015/05/01 21:34:17 matt Exp $ +# $NetBSD: files.octeon,v 1.3 2015/05/18 01:53:50 matt Exp $ file arch/evbmips/cavium/autoconf.c file arch/evbmips/cavium/machdep.c file arch/evbmips/cavium/mach_intr.c file arch/evbmips/cavium/octeon_bootbus_machdep.c bootbus -file arch/evbmips/evbmips/disksubr.c file arch/evbmips/evbmips/interrupt.c +file kern/subr_disk_mbr.c + device cpu attach cpu at mainbus file arch/evbmips/evbmips/cpu.c cpu
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Mon May 18 01:32:52 UTC 2015
Modified Files:
src/sys/arch/mips/mips: cpu_subr.c
Log Message:
Print cpu_model after copyright.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mips/mips/cpu_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.17 src/sys/arch/mips/mips/cpu_subr.c:1.18
--- src/sys/arch/mips/mips/cpu_subr.c:1.17 Mon May 19 22:47:53 2014
+++ src/sys/arch/mips/mips/cpu_subr.c Mon May 18 01:32:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.17 2014/05/19 22:47:53 rmind Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.18 2015/05/18 01:32:52 matt Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.17 2014/05/19 22:47:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.18 2015/05/18 01:32:52 matt Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -291,6 +291,7 @@ cpu_startup_common(void)
* Good {morning,afternoon,evening,night}.
*/
printf("%s%s", copyright, version);
+ printf("%s\n", cpu_getmodel());
format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
printf("total memory = %s\n", pbuf);
CVS commit: src/sys/arch/evbmips/cavium
Module Name:src
Committed By: matt
Date: Mon May 18 01:32:18 UTC 2015
Modified Files:
src/sys/arch/evbmips/cavium: machdep.c
Log Message:
Set cpu model.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/cavium/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/evbmips/cavium/machdep.c
diff -u src/sys/arch/evbmips/cavium/machdep.c:1.1 src/sys/arch/evbmips/cavium/machdep.c:1.2
--- src/sys/arch/evbmips/cavium/machdep.c:1.1 Wed Apr 29 08:32:01 2015
+++ src/sys/arch/evbmips/cavium/machdep.c Mon May 18 01:32:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1 2015/04/29 08:32:01 hikaru Exp $ */
+/* $NetBSD: machdep.c,v 1.2 2015/05/18 01:32:18 matt Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -112,12 +112,13 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.1 2015/04/29 08:32:01 hikaru Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.2 2015/05/18 01:32:18 matt Exp $");
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -136,7 +137,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include
#endif
-#include
#include
#include
@@ -205,6 +205,17 @@ mach_init(uint64_t arg0, uint64_t arg1,
octeon_cal_timer(corefreq);
+ switch (MIPS_PRID_IMPL(mips_options.mips_cpu_id)) {
+ case 0: cpu_setmodel("Cavium Octeon CN38XX/CN36XX"); break;
+ case 1: cpu_setmodel("Cavium Octeon CN31XX/CN3020"); break;
+ case 2: cpu_setmodel("Cavium Octeon CN3005/CN3010"); break;
+ case 3: cpu_setmodel("Cavium Octeon CN58XX"); break;
+ case 4: cpu_setmodel("Cavium Octeon CN5[4-7]XX"); break;
+ case 6: cpu_setmodel("Cavium Octeon CN50XX"); break;
+ case 7: cpu_setmodel("Cavium Octeon CN52XX"); break;
+ default: cpu_setmodel("Cavium Octeon"); break;
+ }
+
mach_init_vector();
/* set the VM page size */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon May 18 01:06:35 UTC 2015
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Add missing pci_intr_release() for the detach.
To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 src/sys/dev/pci/if_bge.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/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.289 src/sys/dev/pci/if_bge.c:1.290
--- src/sys/dev/pci/if_bge.c:1.289 Sun May 17 14:23:15 2015
+++ src/sys/dev/pci/if_bge.c Mon May 18 01:06:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.289 2015/05/17 14:23:15 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.290 2015/05/18 01:06:35 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.289 2015/05/17 14:23:15 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.290 2015/05/18 01:06:35 msaitoh Exp $");
#include
#include
@@ -4146,6 +4146,9 @@ bge_release_resources(struct bge_softc *
/* Disestablish the interrupt handler */
if (sc->bge_intrhand != NULL) {
pci_intr_disestablish(sc->sc_pc, sc->bge_intrhand);
+#ifdef __HAVE_PCI_MSI_MSIX
+ pci_intr_release(sc->sc_pc, sc->bge_pihp, 1);
+#endif
sc->bge_intrhand = NULL;
}
CVS commit: src/tests/net/mcast
Module Name:src
Committed By: ozaki-r
Date: Mon May 18 00:55:09 UTC 2015
Modified Files:
src/tests/net/mcast: t_mcast.c
Log Message:
KNF
Tweaks of whitespaces and tabs.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/net/mcast/t_mcast.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/net/mcast/t_mcast.c
diff -u src/tests/net/mcast/t_mcast.c:1.12 src/tests/net/mcast/t_mcast.c:1.13
--- src/tests/net/mcast/t_mcast.c:1.12 Sun May 17 15:48:57 2015
+++ src/tests/net/mcast/t_mcast.c Mon May 18 00:55:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mcast.c,v 1.12 2015/05/17 15:48:57 ozaki-r Exp $ */
+/* $NetBSD: t_mcast.c,v 1.13 2015/05/18 00:55:09 ozaki-r Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
#ifdef __RCSID
-__RCSID("$NetBSD: t_mcast.c,v 1.12 2015/05/17 15:48:57 ozaki-r Exp $");
+__RCSID("$NetBSD: t_mcast.c,v 1.13 2015/05/18 00:55:09 ozaki-r Exp $");
#else
extern const char *__progname;
#define getprogname() __progname
@@ -88,12 +88,12 @@ struct message {
static int
addmc(int s, struct addrinfo *ai, bool bug)
{
- struct ip_mreq m4;
+ struct ip_mreq m4;
struct ipv6_mreq m6;
struct sockaddr_in *s4;
struct sockaddr_in6 *s6;
unsigned int ifc;
-
+
switch (ai->ai_family) {
case AF_INET:
s4 = (void *)ai->ai_addr;
@@ -127,11 +127,11 @@ addmc(int s, struct addrinfo *ai, bool b
ifc = 1;
if (setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
&ifc, sizeof(ifc)) == -1)
- return -1;
+ return -1;
ifc = 224;
if (setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
&ifc, sizeof(ifc)) == -1)
- return -1;
+ return -1;
ifc = 1;
if (setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifc,
sizeof(ifc)) == -1)
@@ -140,7 +140,7 @@ addmc(int s, struct addrinfo *ai, bool b
ifc = 1;
#endif
m6.ipv6mr_interface = ifc;
- m6.ipv6mr_multiaddr = s6->sin6_addr;
+ m6.ipv6mr_multiaddr = s6->sin6_addr;
return setsockopt(s, IPPROTO_IPV6, IPV6_JOIN_GROUP,
&m6, sizeof(m6));
default:
@@ -467,14 +467,14 @@ ATF_TC_BODY(unconninet6, tc)
ATF_TP_ADD_TCS(tp)
{
debug++;
-ATF_TP_ADD_TC(tp, conninet4);
-ATF_TP_ADD_TC(tp, connmappedinet4);
-ATF_TP_ADD_TC(tp, connmappedbuginet4);
-ATF_TP_ADD_TC(tp, conninet6);
-ATF_TP_ADD_TC(tp, unconninet4);
-ATF_TP_ADD_TC(tp, unconnmappedinet4);
-ATF_TP_ADD_TC(tp, unconnmappedbuginet4);
-ATF_TP_ADD_TC(tp, unconninet6);
+ ATF_TP_ADD_TC(tp, conninet4);
+ ATF_TP_ADD_TC(tp, connmappedinet4);
+ ATF_TP_ADD_TC(tp, connmappedbuginet4);
+ ATF_TP_ADD_TC(tp, conninet6);
+ ATF_TP_ADD_TC(tp, unconninet4);
+ ATF_TP_ADD_TC(tp, unconnmappedinet4);
+ ATF_TP_ADD_TC(tp, unconnmappedbuginet4);
+ ATF_TP_ADD_TC(tp, unconninet6);
return atf_no_error();
}
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src
Committed By: justin
Date: Sun May 17 22:14:38 UTC 2015
Modified Files:
src/common/lib/libc/arch/arm/string: ffs.S
Log Message:
It is just the __ffssi2 alias we do not want in rump kernel
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/string/ffs.S
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/arch/arm/string/ffs.S
diff -u src/common/lib/libc/arch/arm/string/ffs.S:1.8 src/common/lib/libc/arch/arm/string/ffs.S:1.9
--- src/common/lib/libc/arch/arm/string/ffs.S:1.8 Sun May 17 20:57:12 2015
+++ src/common/lib/libc/arch/arm/string/ffs.S Sun May 17 22:14:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.S,v 1.8 2015/05/17 20:57:12 justin Exp $ */
+/* $NetBSD: ffs.S,v 1.9 2015/05/17 22:14:38 justin Exp $ */
/*
* Copyright (c) 2001 Christopher Gilbert
* All rights reserved.
@@ -30,7 +30,7 @@
#include
-RCSID("$NetBSD: ffs.S,v 1.8 2015/05/17 20:57:12 justin Exp $")
+RCSID("$NetBSD: ffs.S,v 1.9 2015/05/17 22:14:38 justin Exp $")
/*
* ffs - find first set bit, this algorithm isolates the first set
@@ -46,6 +46,7 @@ RCSID("$NetBSD: ffs.S,v 1.8 2015/05/17 2
*/
#ifndef _RUMPKERNEL
STRONG_ALIAS(__ffssi2,ffs)
+#endif
#if (defined(_ARM_ARCH_5) && !defined(__thumb__)) || defined(_ARM_ARCH_T2)
#if defined(_ARM_ARCH_T2)
ENTRY(ffs)
@@ -91,4 +92,3 @@ ARM_ENTRY(ffs)
.byte 30, 0, 23, 19, 29, 18, 17, 0 /* 56-63 */
END(ffs)
#endif
-#endif /* _RUMPKERNEL */
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: justin
Date: Sun May 17 22:08:24 UTC 2015
Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc
sync_bool_compare_and_swap_1.S sync_bool_compare_and_swap_2.S
sync_bool_compare_and_swap_4.S sync_bool_compare_and_swap_8.S
sync_fetch_and_add_8.S sync_fetch_and_and_8.S
sync_fetch_and_nand_8.S sync_fetch_and_or_8.S
sync_fetch_and_sub_8.S sync_fetch_and_xor_8.S
Log Message:
Move arm sync_* changes to Makefile.inc
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/common/lib/libc/arch/arm/atomic/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S
cvs rdiff -u -r1.3 -r1.4 \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S
cvs rdiff -u -r1.4 -r1.5 \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S
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/arch/arm/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.26 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.27
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.26 Tue Oct 14 07:25:05 2014
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2014/10/14 07:25:05 martin Exp $
+# $NetBSD: Makefile.inc,v 1.27 2015/05/17 22:08:24 justin Exp $
.ifnmake obj
.include "${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.mk"
@@ -42,7 +42,7 @@ SRCS.atomic+= atomic_inc_32.S atomic_inc
SRCS.atomic+= atomic_sub_64.S
SRCS.atomic+= atomic_swap.S atomic_swap_16.S atomic_swap_64.S
SRCS.atomic+= membar_ops.S
-.if defined(LIB) && ${LIB} != "kern"
+.if defined(LIB) && ${LIB} != "kern" && ${LIB} != "rump"
.for op in add and nand or sub xor
SRCS.atomic+= sync_fetch_and_${op}_8.S
.endfor
Index: src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S:1.2 src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S:1.3
--- src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S:1.2 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_bool_compare_and_swap_1.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_bool_compare_and_swap_1.S,v 1.3 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
/*
* ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel.
Index: src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S:1.2 src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S:1.3
--- src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S:1.2 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_bool_compare_and_swap_2.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_bool_compare_and_swap_2.S,v 1.3 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
/*
* ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel.
Index: src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S:1.2 src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S:1.3
--- src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S:1.2 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_bool_compare_and_swap_4.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_bool_compare_and_swap_4.S,v 1.3 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include "atomic_op_asm.h"
-#if de
CVS commit: src/common/lib/libc/arch/arm
Module Name:src Committed By: justin Date: Sun May 17 20:57:12 UTC 2015 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_op_asm.h atomic_swap.S atomic_swap_16.S atomic_swap_64.S sync_bool_compare_and_swap_1.S sync_bool_compare_and_swap_2.S sync_bool_compare_and_swap_4.S sync_bool_compare_and_swap_8.S sync_fetch_and_add_8.S sync_fetch_and_and_8.S sync_fetch_and_nand_8.S sync_fetch_and_or_8.S sync_fetch_and_sub_8.S sync_fetch_and_xor_8.S src/common/lib/libc/arch/arm/string: ffs.S Log Message: Do not build arm toolchain symbols in the rump kernel These symbols will be provided at link time and will be duplicate symbols in rump kernel and libc if defined. Many have been fixed previously, but these were missed as did not have a test. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/atomic/atomic_op_asm.h cvs rdiff -u -r1.13 -r1.14 src/common/lib/libc/arch/arm/atomic/atomic_swap.S cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S cvs rdiff -u -r1.9 -r1.10 \ src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S cvs rdiff -u -r1.1 -r1.2 \ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S \ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S \ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S cvs rdiff -u -r1.2 -r1.3 \ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S \ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/string/ffs.S 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/arch/arm/atomic/atomic_op_asm.h diff -u src/common/lib/libc/arch/arm/atomic/atomic_op_asm.h:1.6 src/common/lib/libc/arch/arm/atomic/atomic_op_asm.h:1.7 --- src/common/lib/libc/arch/arm/atomic/atomic_op_asm.h:1.6 Tue Mar 4 16:15:28 2014 +++ src/common/lib/libc/arch/arm/atomic/atomic_op_asm.h Sun May 17 20:57:11 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_op_asm.h,v 1.6 2014/03/04 16:15:28 matt Exp $ */ +/* $NetBSD: atomic_op_asm.h,v 1.7 2015/05/17 20:57:11 justin Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -44,9 +44,6 @@ #if defined(_KERNEL) || defined(_STANDALONE) #define ATOMIC_OP_ALIAS(a,s) STRONG_ALIAS(a,s) -#ifdef _RUMPKERNEL -#define CRT_ALIAS(a,s) STRONG_ALIAS(a,s) -#endif #else /* _KERNEL */ Index: src/common/lib/libc/arch/arm/atomic/atomic_swap.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.13 src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.14 --- src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.13 Fri Apr 17 07:15:02 2015 +++ src/common/lib/libc/arch/arm/atomic/atomic_swap.S Sun May 17 20:57:11 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_swap.S,v 1.13 2015/04/17 07:15:02 skrll Exp $ */ +/* $NetBSD: atomic_swap.S,v 1.14 2015/05/17 20:57:11 justin Exp $ */ /*- * Copyright (c) 2007,2012 The NetBSD Foundation, Inc. @@ -84,7 +84,7 @@ STRONG_ALIAS(_atomic_swap_uint,_atomic_s STRONG_ALIAS(_atomic_swap_ulong,_atomic_swap_32) STRONG_ALIAS(_atomic_swap_ptr,_atomic_swap_32) -#if (!defined(_KERNEL) || defined(_RUMPKERNEL)) && !defined(_STANDALONE) +#if (!defined(_KERNEL) || !defined(_RUMPKERNEL)) && !defined(_STANDALONE) ENTRY_NP(__sync_lock_release_4) mov r1, #0 #ifdef _ARM_ARCH_7 @@ -125,7 +125,7 @@ CRT_ALIAS(__atomic_exchange_1,_atomic_sw STRONG_ALIAS(_atomic_swap_char,_atomic_swap_8) STRONG_ALIAS(_atomic_swap_uchar,_atomic_swap_8) -#if (!defined(_KERNEL) || defined(_RUMPKERNEL)) && !defined(_STANDALONE) +#if (!defined(_KERNEL) || !defined(_RUMPKERNEL)) && !defined(_STANDALONE) ENTRY_NP(__sync_lock_release_1) mov r1, #0 #ifdef _ARM_ARCH_7 Index: src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.4 --- src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S:1.3 Sat Jun 28 20:18:55 2014 +++ src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S Sun May 17 20:57:11 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_swap_16.S,v 1.3 2014/06/28 20:18:55 joerg Exp $ */ +/* $NetBSD: atomic_swap_16.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ CRT_ALIAS(__atomic_exchange_2,_atomic_sw STRONG_ALIAS(_atomic_swap_short,_atomic_swap_16) STRONG_ALIAS(_atomic_swap_ushort,_atomic_swap_16) -#if (!defined(_KERNEL) || defined(_RUMPKERNEL)) && !defined(_STA
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Sun May 17 19:36:52 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: INSTALL_XLSATX32 INSTALL_XLSATX64 Log Message: No need for other kernel configs To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_XLSATX32 \ src/sys/arch/evbmips/conf/INSTALL_XLSATX64 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/evbmips/conf/INSTALL_XLSATX32 diff -u src/sys/arch/evbmips/conf/INSTALL_XLSATX32:1.2 src/sys/arch/evbmips/conf/INSTALL_XLSATX32:1.3 --- src/sys/arch/evbmips/conf/INSTALL_XLSATX32:1.2 Sun Feb 20 07:48:33 2011 +++ src/sys/arch/evbmips/conf/INSTALL_XLSATX32 Sun May 17 19:36:52 2015 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_XLSATX32,v 1.2 2011/02/20 07:48:33 matt Exp $ +# $NetBSD: INSTALL_XLSATX32,v 1.3 2015/05/17 19:36:52 matt Exp $ include "arch/evbmips/conf/XLSATX32" -#ident "INSTALL_XLSATX32-$Revision: 1.2 $" +#ident "INSTALL_XLSATX32-$Revision: 1.3 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -12,3 +12,7 @@ options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks + +no config netbsd-wm0 +no config netbsd-msk0 +no config netbsd-sd0a Index: src/sys/arch/evbmips/conf/INSTALL_XLSATX64 diff -u src/sys/arch/evbmips/conf/INSTALL_XLSATX64:1.2 src/sys/arch/evbmips/conf/INSTALL_XLSATX64:1.3 --- src/sys/arch/evbmips/conf/INSTALL_XLSATX64:1.2 Sun Feb 20 07:48:33 2011 +++ src/sys/arch/evbmips/conf/INSTALL_XLSATX64 Sun May 17 19:36:52 2015 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_XLSATX64,v 1.2 2011/02/20 07:48:33 matt Exp $ +# $NetBSD: INSTALL_XLSATX64,v 1.3 2015/05/17 19:36:52 matt Exp $ include "arch/evbmips/conf/XLSATX64" -#ident "INSTALL_XLSATX64-$Revision: 1.2 $" +#ident "INSTALL_XLSATX64-$Revision: 1.3 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -12,3 +12,7 @@ options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks + +no config netbsd-wm0 +no config netbsd-msk0 +no config netbsd-sd0a
CVS commit: src/sys
Module Name:src
Committed By: matt
Date: Sun May 17 18:52:37 UTC 2015
Modified Files:
src/sys/arch/mips/include: netbsd32_machdep.h
src/sys/arch/mips/mips: netbsd32_machdep.c
src/sys/compat/netbsd32: netbsd32_sysctl.c
Log Message:
machine_arch on mips depends on the ABI so we need a routine to return
the right value.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/include/netbsd32_machdep.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/netbsd32/netbsd32_sysctl.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/include/netbsd32_machdep.h
diff -u src/sys/arch/mips/include/netbsd32_machdep.h:1.3 src/sys/arch/mips/include/netbsd32_machdep.h:1.4
--- src/sys/arch/mips/include/netbsd32_machdep.h:1.3 Sun Feb 19 21:06:16 2012
+++ src/sys/arch/mips/include/netbsd32_machdep.h Sun May 17 18:52:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.h,v 1.3 2012/02/19 21:06:16 rmind Exp $ */
+/* $NetBSD: netbsd32_machdep.h,v 1.4 2015/05/17 18:52:37 matt Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -69,4 +69,6 @@ struct mips_cachectl_args32 {
int ctl;
};
+int cpu_machinearch32(SYSCTLFN_PROTO);
+
#endif /* _MACHINE_NETBSD32_H_ */
Index: src/sys/arch/mips/mips/netbsd32_machdep.c
diff -u src/sys/arch/mips/mips/netbsd32_machdep.c:1.11 src/sys/arch/mips/mips/netbsd32_machdep.c:1.12
--- src/sys/arch/mips/mips/netbsd32_machdep.c:1.11 Sat Jan 25 15:20:55 2014
+++ src/sys/arch/mips/mips/netbsd32_machdep.c Sun May 17 18:52:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.11 2014/01/25 15:20:55 christos Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.12 2015/05/17 18:52:37 matt Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.11 2014/01/25 15:20:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.12 2015/05/17 18:52:37 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -343,3 +343,14 @@ cpu_coredump32(struct lwp *l, struct cor
chdr->c_cpusize);
}
#endif
+
+int
+cpu_machinearch32(SYSCTLFN_ARGS)
+{
+ struct sysctlnode node = *rnode;
+ const char *march = l->l_proc->p_md.md_abi == _MIPS_BSD_API_O32
+ ? machine_arch32 : machine_arch;
+ node.sysctl_data = __UNCONST(march);
+ node.sysctl_size = strlen(march) + 1;
+ return sysctl_lookup(SYSCTLFN_CALL(&node));
+}
Index: src/sys/compat/netbsd32/netbsd32_sysctl.c
diff -u src/sys/compat/netbsd32/netbsd32_sysctl.c:1.35 src/sys/compat/netbsd32/netbsd32_sysctl.c:1.36
--- src/sys/compat/netbsd32/netbsd32_sysctl.c:1.35 Fri Jun 13 10:42:26 2014
+++ src/sys/compat/netbsd32/netbsd32_sysctl.c Sun May 17 18:52:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sysctl.c,v 1.35 2014/06/13 10:42:26 joerg Exp $ */
+/* $NetBSD: netbsd32_sysctl.c,v 1.36 2015/05/17 18:52:37 matt Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.35 2014/06/13 10:42:26 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.36 2015/05/17 18:52:37 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -108,7 +108,9 @@ void
netbsd32_sysctl_init(void)
{
const struct sysctlnode *_root = &netbsd32_sysctl_root;
+#ifndef __mips__
extern const char machine_arch32[];
+#endif
extern const char machine32[];
sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
@@ -150,11 +152,19 @@ netbsd32_sysctl_init(void)
CTLTYPE_STRING, "machine", NULL,
NULL, 0, __UNCONST(&machine32), 0,
CTL_HW, HW_MACHINE, CTL_EOL);
+#ifdef __mips__
+ sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
+ CTLFLAG_PERMANENT,
+ CTLTYPE_STRING, "machine_arch", NULL,
+ cpu_machinearch32, 0, NULL, 0,
+ CTL_HW, HW_MACHINE_ARCH, CTL_EOL);
+#else
sysctl_createv(&netbsd32_clog, 0, &_root, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRING, "machine_arch", NULL,
NULL, 0, __UNCONST(&machine_arch32), 0,
CTL_HW, HW_MACHINE_ARCH, CTL_EOL);
+#endif
}
void
CVS commit: src/tests/net/mcast
Module Name:src
Committed By: ozaki-r
Date: Sun May 17 15:48:57 UTC 2015
Modified Files:
src/tests/net/mcast: t_mcast.c
Log Message:
Save errno for errx
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/net/mcast/t_mcast.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/net/mcast/t_mcast.c
diff -u src/tests/net/mcast/t_mcast.c:1.11 src/tests/net/mcast/t_mcast.c:1.12
--- src/tests/net/mcast/t_mcast.c:1.11 Fri Feb 27 13:15:49 2015
+++ src/tests/net/mcast/t_mcast.c Sun May 17 15:48:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mcast.c,v 1.11 2015/02/27 13:15:49 martin Exp $ */
+/* $NetBSD: t_mcast.c,v 1.12 2015/05/17 15:48:57 ozaki-r Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
#ifdef __RCSID
-__RCSID("$NetBSD: t_mcast.c,v 1.11 2015/02/27 13:15:49 martin Exp $");
+__RCSID("$NetBSD: t_mcast.c,v 1.12 2015/05/17 15:48:57 ozaki-r Exp $");
#else
extern const char *__progname;
#define getprogname() __progname
@@ -186,7 +186,7 @@ getsocket(const char *host, const char *
int (*f)(int, const struct sockaddr *, socklen_t), socklen_t *slen,
bool bug)
{
- int e, s;
+ int e, s, lasterrno = 0;
struct addrinfo hints, *ai0, *ai;
const char *cause = "?";
@@ -202,6 +202,7 @@ getsocket(const char *host, const char *
for (ai = ai0; ai; ai = ai->ai_next) {
s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (s == -1) {
+ lasterrno = errno;
cause = "socket";
continue;
}
@@ -220,13 +221,14 @@ getsocket(const char *host, const char *
*slen = ai->ai_addrlen;
break;
out:
+ lasterrno = errno;
close(s);
s = -1;
continue;
}
freeaddrinfo(ai0);
if (s == -1)
- ERRX(1, "%s (%s)", cause, strerror(errno));
+ ERRX(1, "%s (%s)", cause, strerror(lasterrno));
return s;
}
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun May 17 14:23:15 UTC 2015 Modified Files: src/sys/dev/pci: if_bge.c Log Message: Fix compile error on non-__HAVE_PCI_MSI_MSIX machines. To generate a diff of this commit: cvs rdiff -u -r1.288 -r1.289 src/sys/dev/pci/if_bge.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/if_bge.c diff -u src/sys/dev/pci/if_bge.c:1.288 src/sys/dev/pci/if_bge.c:1.289 --- src/sys/dev/pci/if_bge.c:1.288 Sun May 17 12:06:26 2015 +++ src/sys/dev/pci/if_bge.c Sun May 17 14:23:15 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.288 2015/05/17 12:06:26 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.289 2015/05/17 14:23:15 msaitoh Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.288 2015/05/17 12:06:26 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.289 2015/05/17 14:23:15 msaitoh Exp $"); #include #include @@ -183,7 +183,9 @@ static int bge_rxthresh_nodenum; typedef int (*bge_eaddr_fcn_t)(struct bge_softc *, uint8_t[]); static uint32_t bge_chipid(const struct pci_attach_args *); +#ifdef __HAVE_PCI_MSI_MSIX static int bge_can_use_msi(struct bge_softc *); +#endif static int bge_probe(device_t, cfdata_t, void *); static void bge_attach(device_t, device_t, void *); static int bge_detach(device_t, int); @@ -3279,6 +3281,7 @@ bge_chipid(const struct pci_attach_args return id; } +#ifdef __HAVE_PCI_MSI_MSIX /* * Return true if MSI can be used with this device. */ @@ -3306,6 +3309,7 @@ bge_can_use_msi(struct bge_softc *sc) } return (can_use_msi); } +#endif /* * Probe for a Broadcom chip. Check the PCI vendor and device IDs @@ -3352,7 +3356,9 @@ bge_attach(device_t parent, device_t sel int capmask; int mii_flags; int map_flags; +#ifdef __HAVE_PCI_MSI_MSIX int rv; +#endif char intrbuf[PCI_INTRSTR_LEN]; bp = bge_lookup(pa);
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Sun May 17 14:17:52 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: ERLITE Log Message: Allow overriding/adding configuration in ERLITE.local To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/conf/ERLITE 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/evbmips/conf/ERLITE diff -u src/sys/arch/evbmips/conf/ERLITE:1.5 src/sys/arch/evbmips/conf/ERLITE:1.6 --- src/sys/arch/evbmips/conf/ERLITE:1.5 Fri May 15 08:19:48 2015 +++ src/sys/arch/evbmips/conf/ERLITE Sun May 17 14:17:52 2015 @@ -1,11 +1,11 @@ -# $NetBSD: ERLITE,v 1.5 2015/05/15 08:19:48 martin Exp $ +# $NetBSD: ERLITE,v 1.6 2015/05/17 14:17:52 martin Exp $ include "arch/mips/conf/std.octeon" include "arch/evbmips/conf/files.octeon" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ERLITE-$Revision: 1.5 $" +#ident "ERLITE-$Revision: 1.6 $" maxusers 32 @@ -177,3 +177,6 @@ pseudo-device ksyms# /dev/ksyms # A pseudo device needed for Coda # also needs CODA (above) #pseudo-device vcoda# coda minicache <-> venus comm. + +cinclude "arch/evbmips/conf/ERLITE.local" +
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Sun May 17 13:51:31 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_pci.c
Added Files:
src/sys/rump/dev/lib/libpci/opt: opt_pciide.h
Log Message:
Add pciide_machdep_compat_intr_establish().
Used by ... would you believe pciide?
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libpci/rumpdev_pci.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci/opt/opt_pciide.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/rump/dev/lib/libpci/rumpdev_pci.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.4 src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.5
--- src/sys/rump/dev/lib/libpci/rumpdev_pci.c:1.4 Tue Aug 26 10:58:13 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_pci.c Sun May 17 13:51:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_pci.c,v 1.4 2014/08/26 10:58:13 pooka Exp $ */
+/* $NetBSD: rumpdev_pci.c,v 1.5 2015/05/17 13:51:31 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rumpdev_pci.c,v 1.4 2014/08/26 10:58:13 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpdev_pci.c,v 1.5 2015/05/17 13:51:31 pooka Exp $");
#include
#include
@@ -166,3 +166,26 @@ pci_intr_disestablish(pci_chipset_tag_t
panic("%s: unimplemented", __func__);
}
+
+#ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
+#include
+#include
+#include
+#include
+
+void *
+pciide_machdep_compat_intr_establish(device_t dev,
+ const struct pci_attach_args *pa, int chan,
+ int (*func)(void *), void *arg)
+{
+ pci_intr_handle_t ih;
+ struct pci_attach_args mypa = *pa;
+
+ mypa.pa_intrline = PCIIDE_COMPAT_IRQ(chan);
+ if (pci_intr_map(&mypa, &ih) != 0)
+ return NULL;
+ return rumpcomp_pci_irq_establish(ih, func, arg);
+}
+
+__strong_alias(pciide_machdep_compat_intr_disestablish,pci_intr_disestablish);
+#endif /* __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH */
Added files:
Index: src/sys/rump/dev/lib/libpci/opt/opt_pciide.h
diff -u /dev/null src/sys/rump/dev/lib/libpci/opt/opt_pciide.h:1.1
--- /dev/null Sun May 17 13:51:31 2015
+++ src/sys/rump/dev/lib/libpci/opt/opt_pciide.h Sun May 17 13:51:31 2015
@@ -0,0 +1 @@
+/* $NetBSD: opt_pciide.h,v 1.1 2015/05/17 13:51:31 pooka Exp $ */
CVS commit: src/sys/rump/dev/lib/libpci
Module Name:src
Committed By: pooka
Date: Sun May 17 13:45:37 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libpci: rumpdev_bus_space.c
Log Message:
Implement bus_space_read/write_multi() and bus_space_subregion().
Used by (at least) wdc.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.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/dev/lib/libpci/rumpdev_bus_space.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.3 src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.4
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c:1.3 Fri Aug 22 14:28:58 2014
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_space.c Sun May 17 13:45:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_space.c,v 1.3 2014/08/22 14:28:58 pooka Exp $ */
+/* $NetBSD: rumpdev_bus_space.c,v 1.4 2015/05/17 13:45:37 pooka Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -127,6 +127,39 @@ bus_space_read_4(bus_space_tag_t bst, bu
}
void
+bus_space_read_multi_1(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint8_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ *datap++ = bus_space_read_1(bst, bsh, offset);
+ bus_space_barrier(bst, bst, offset, 1, BUS_SPACE_BARRIER_READ);
+ }
+}
+
+void
+bus_space_read_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint16_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ *datap++ = bus_space_read_2(bst, bsh, offset);
+ bus_space_barrier(bst, bst, offset, 2, BUS_SPACE_BARRIER_READ);
+ }
+}
+
+void
+bus_space_read_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, uint32_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ *datap++ = bus_space_read_4(bst, bsh, offset);
+ bus_space_barrier(bst, bst, offset, 4, BUS_SPACE_BARRIER_READ);
+ }
+}
+
+void
bus_space_write_1(bus_space_tag_t bst, bus_space_handle_t bsh,
bus_size_t offset, uint8_t v)
{
@@ -177,6 +210,45 @@ bus_space_write_4(bus_space_tag_t bst, b
}
}
+void
+bus_space_write_multi_1(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, const uint8_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ const uint8_t value = *datap++;
+
+ bus_space_write_1(bst, bsh, offset, value);
+ bus_space_barrier(bst, bst, offset, 1, BUS_SPACE_BARRIER_WRITE);
+ }
+}
+
+void
+bus_space_write_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, const uint16_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ const uint16_t value = *datap++;
+
+ bus_space_write_2(bst, bsh, offset, value);
+ bus_space_barrier(bst, bst, offset, 2, BUS_SPACE_BARRIER_WRITE);
+ }
+}
+
+void
+bus_space_write_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
+ bus_size_t offset, const uint32_t *datap, bus_size_t count)
+{
+
+ while (count--) {
+ const uint32_t value = *datap++;
+
+ bus_space_write_4(bst, bsh, offset, value);
+ bus_space_barrier(bst, bst, offset, 4, BUS_SPACE_BARRIER_WRITE);
+ }
+}
+
paddr_t
bus_space_mmap(bus_space_tag_t bst, bus_addr_t addr, off_t off,
int prot, int flags)
@@ -190,7 +262,8 @@ bus_space_subregion(bus_space_tag_t bst,
bus_size_t offset, bus_size_t size, bus_space_handle_t *nhandlep)
{
- panic("%s: unimplemented", __func__);
+ *nhandlep = bsh + offset;
+ return 0;
}
void
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Sun May 17 13:14:41 UTC 2015 Modified Files: src/lib/libedit: chartype.h Log Message: add FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libedit/chartype.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/chartype.h diff -u src/lib/libedit/chartype.h:1.14 src/lib/libedit/chartype.h:1.15 --- src/lib/libedit/chartype.h:1.14 Thu May 14 06:44:15 2015 +++ src/lib/libedit/chartype.h Sun May 17 09:14:41 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: chartype.h,v 1.14 2015/05/14 10:44:15 christos Exp $ */ +/* $NetBSD: chartype.h,v 1.15 2015/05/17 13:14:41 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ * supports non-BMP code points without requiring UTF-16, but nothing * seems to actually advertise this properly, despite Unicode 3.1 having * been around since 2001... */ -#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) +#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) #ifndef __STDC_ISO_10646__ /* In many places it is assumed that the first 127 code points are ASCII * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Sun May 17 12:06:26 UTC 2015
Modified Files:
src/sys/dev/pci: if_bge.c if_bgereg.h if_bgevar.h
Log Message:
- Add MSI support.
- Use tagged status function for 5717 and newer devices. All controllers
except BCM5700 supports tagged status but we use tagged status only for MSI
case on BCM5717. Otherwise MSI on BCM5717 does not work. Same as other *BSDs.
To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pci/if_bgereg.h
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_bgevar.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/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.287 src/sys/dev/pci/if_bge.c:1.288
--- src/sys/dev/pci/if_bge.c:1.287 Fri May 1 03:42:15 2015
+++ src/sys/dev/pci/if_bge.c Sun May 17 12:06:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.287 2015/05/01 03:42:15 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.288 2015/05/17 12:06:26 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.287 2015/05/01 03:42:15 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.288 2015/05/17 12:06:26 msaitoh Exp $");
#include
#include
@@ -183,6 +183,7 @@ static int bge_rxthresh_nodenum;
typedef int (*bge_eaddr_fcn_t)(struct bge_softc *, uint8_t[]);
static uint32_t bge_chipid(const struct pci_attach_args *);
+static int bge_can_use_msi(struct bge_softc *);
static int bge_probe(device_t, cfdata_t, void *);
static void bge_attach(device_t, device_t, void *);
static int bge_detach(device_t, int);
@@ -2254,12 +2255,15 @@ bge_phy_addr(struct bge_softc *sc)
static int
bge_chipinit(struct bge_softc *sc)
{
- uint32_t dma_rw_ctl, mode_ctl, reg;
+ uint32_t dma_rw_ctl, misc_ctl, mode_ctl, reg;
int i;
/* Set endianness before we access any non-PCI registers. */
+ misc_ctl = BGE_INIT;
+ if (sc->bge_flags & BGEF_TAGGED_STATUS)
+ misc_ctl |= BGE_PCIMISCCTL_TAGGED_STATUS;
pci_conf_write(sc->sc_pc, sc->sc_pcitag, BGE_PCI_MISC_CTL,
- BGE_INIT);
+ misc_ctl);
/*
* Clear the MAC statistics block in the NIC's
@@ -3276,6 +3280,34 @@ bge_chipid(const struct pci_attach_args
}
/*
+ * Return true if MSI can be used with this device.
+ */
+static int
+bge_can_use_msi(struct bge_softc *sc)
+{
+ int can_use_msi = 0;
+
+ switch (BGE_ASICREV(sc->bge_chipid)) {
+ case BGE_ASICREV_BCM5714_A0:
+ case BGE_ASICREV_BCM5714:
+ /*
+ * Apparently, MSI doesn't work when these chips are
+ * configured in single-port mode.
+ */
+ break;
+ case BGE_ASICREV_BCM5750:
+ if (BGE_CHIPREV(sc->bge_chipid) != BGE_CHIPREV_5750_AX &&
+ BGE_CHIPREV(sc->bge_chipid) != BGE_CHIPREV_5750_BX)
+ can_use_msi = 1;
+ break;
+ default:
+ if (BGE_IS_575X_PLUS(sc))
+ can_use_msi = 1;
+ }
+ return (can_use_msi);
+}
+
+/*
* Probe for a Broadcom chip. Check the PCI vendor and device IDs
* against our list and return its name if we find a match. Note
* that since the Broadcom controller contains VPD support, we
@@ -3303,7 +3335,9 @@ bge_attach(device_t parent, device_t sel
const struct bge_product *bp;
const struct bge_revision *br;
pci_chipset_tag_t pc;
+#ifndef __HAVE_PCI_MSI_MSIX
pci_intr_handle_t ih;
+#endif
const char *intrstr = NULL;
uint32_t hwcfg, hwcfg2, hwcfg3, hwcfg4, hwcfg5;
uint32_t command;
@@ -3318,6 +3352,7 @@ bge_attach(device_t parent, device_t sel
int capmask;
int mii_flags;
int map_flags;
+ int rv;
char intrbuf[PCI_INTRSTR_LEN];
bp = bge_lookup(pa);
@@ -3381,26 +3416,6 @@ bge_attach(device_t parent, device_t sel
return;
}
- DPRINTFN(5, ("pci_intr_map\n"));
- if (pci_intr_map(pa, &ih)) {
- aprint_error_dev(sc->bge_dev, "couldn't map interrupt\n");
- return;
- }
-
- DPRINTFN(5, ("pci_intr_string\n"));
- intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-
- DPRINTFN(5, ("pci_intr_establish\n"));
- sc->bge_intrhand = pci_intr_establish(pc, ih, IPL_NET, bge_intr, sc);
-
- if (sc->bge_intrhand == NULL) {
- aprint_error_dev(sc->bge_dev,
- "couldn't establish interrupt%s%s\n",
- intrstr ? " at " : "", intrstr ? intrstr : "");
- return;
- }
- aprint_normal_dev(sc->bge_dev, "interrupting at %s\n", intrstr);
-
/* Save various chip information. */
sc->bge_chipid = bge_chipid(pa);
sc->bge_phy_addr = bge_phy_addr(sc);
@@ -3705,6 +3720,68 @@ bge_attach(device_t parent, device_t sel
}
}
+#ifdef __HAVE_PCI_MSI_MSIX
+ DPRINTFN(5, ("pci_get_capability\n"));
+ /* Check MSI capability */
+ if (pci_get_capability(pa->pa_pc, pa->pa_tag, PCI_CAP_MSI,
+ &sc->bge_msicap, NULL) != 0) {
+ if (bge_can_use_msi(sc) != 0)
+ sc->bge_flags |= BGEF_MSI;
+ }
+ rv = -1;
+ if (((sc->bge_flags & BGEF_MSI) != 0) && (pci_msi_count(pa) > 0)) {
+ DPRINTFN(5, ("pci_msi_alloc\n"));
+ rv = pci_msi_alloc_exact(p
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun May 17 10:22:20 UTC 2015
Modified Files:
src/usr.sbin/sysinst: Makefile.inc
Log Message:
Do not -DCATALOG_DIR for DEBUG builds to allow easy (local) testin of
translations.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/Makefile.inc
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/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.7 src/usr.sbin/sysinst/Makefile.inc:1.8
--- src/usr.sbin/sysinst/Makefile.inc:1.7 Sun May 10 09:13:15 2015
+++ src/usr.sbin/sysinst/Makefile.inc Sun May 17 10:22:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2015/05/10 09:13:15 martin Exp $
+# $NetBSD: Makefile.inc,v 1.8 2015/05/17 10:22:20 martin Exp $
#
# Makefile for sysinst
@@ -47,8 +47,11 @@ CATALOGDIR= /usr/share/sysinst/catalog
CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.CURDIR} \
-DREL=\"${DISTRIBVER}\" -DMACH=\"${MACHINE}\" \
-DMACH_${MACHINE} -DARCH_${MACHINE_ARCH} \
- ${NODISKLABEL:D-DNO_DISKLABEL} \
- -DCATALOG_DIR=\"${CATALOGDIR}\"
+ ${NODISKLABEL:D-DNO_DISKLABEL}
+
+.if !defined(DEBUG)
+CPPFLAGS+= -DCATALOG_DIR=\"${CATALOGDIR}\"
+.endif
.if (defined(DEBUG))
.if ${ACTIVE_CC} == "gcc"
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun May 17 10:13:24 UTC 2015
Modified Files:
src/usr.sbin/sysinst: msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl
partman.c
Log Message:
Invert sense of a vnd creation message ("Create new image: Yes") and kill
the translations that I can't update myself.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/msg.mi.de \
src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/msg.mi.fr \
src/usr.sbin/sysinst/msg.mi.pl
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/partman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.5 src/usr.sbin/sysinst/msg.mi.de:1.6
--- src/usr.sbin/sysinst/msg.mi.de:1.5 Mon Sep 22 19:01:02 2014
+++ src/usr.sbin/sysinst/msg.mi.de Sun May 17 10:13:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.5 2014/09/22 19:01:02 roy Exp $ */
+/* $NetBSD: msg.mi.de,v 1.6 2015/05/17 10:13:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1199,10 +1199,10 @@ message vnd_err_menufmt { PATH nicht d
message vnd_assgn_menufmt { vnd%1d auf %-50s ASSIGN}
message vnd_menufmt { vnd%1d auf %-44s %11uM}
message vnd_path_fmt {Dateipfad: %29s}
-message vnd_assgn_fmt {Weisen Sie existieren Bild: %12s}
+message vnd_assgn_fmt {Neue Image-Datei erstellen: %12s}
message vnd_size_fmt {Größe: %22sM}
message vnd_ro_fmt {Nur lesen:%22s}
-message vnd_geom_fmt {Stellen Sie Geometrie von Hand: %8s}
+message vnd_geom_fmt {Manuelle Geometrie: %8s}
message vnd_bps_fmt {Byte pro Sektor: %18s}
message vnd_spt_fmt {Sektoren pro Spur:%18s}
message vnd_tpc_fmt {Spuren pro Zylinder: %18s}
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.5 src/usr.sbin/sysinst/msg.mi.es:1.6
--- src/usr.sbin/sysinst/msg.mi.es:1.5 Mon Sep 22 19:01:02 2014
+++ src/usr.sbin/sysinst/msg.mi.es Sun May 17 10:13:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.5 2014/09/22 19:01:02 roy Exp $ */
+/* $NetBSD: msg.mi.es,v 1.6 2015/05/17 10:13:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1180,7 +1180,7 @@ message vnd_err_menufmt { CAMINO NO DE
message vnd_assgn_menufmt { vnd%1d en %-51s ASSIGN}
message vnd_menufmt { vnd%1d en %-45s %11uM}
message vnd_path_fmt {Ruta del archivo: %22s}
-message vnd_assgn_fmt {Asignar existe la imagen: %14s}
+message vnd_assgn_fmt {Create new image: %14s}
message vnd_size_fmt {Tamaño: %22sM}
message vnd_ro_fmt {Sólo lectura: %22s}
message vnd_geom_fmt {Establecer la geometría de la mano: %4s}
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.9 src/usr.sbin/sysinst/msg.mi.en:1.10
--- src/usr.sbin/sysinst/msg.mi.en:1.9 Fri May 1 13:48:05 2015
+++ src/usr.sbin/sysinst/msg.mi.en Sun May 17 10:13:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.9 2015/05/01 13:48:05 gson Exp $ */
+/* $NetBSD: msg.mi.en,v 1.10 2015/05/17 10:13:24 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1039,7 +1039,7 @@ exist. Please check the package path an
message failed {Failed}
message notsupported {Operation not supported!}
-message askfsmountadv {Mountpoint or 'raid' or 'cgd' or 'lvm'?}
+message askfsmountadv {Mountpoint (or 'raid', 'cgd', 'lvm')?}
message partman {Extended partitioning}
message editbsdpart {Edit BSD partitions}
message editmbr {Edit and save MBR}
@@ -1058,7 +1058,7 @@ message doumount {Force umount}
message fillzeros {Fill with zeros}
message fillrandom {Fill with random data}
message fillcrypto {Fill with crypto data}
-message raid0 {0 - No parity, only simple striping.}
+message raid0 {0 - No parity, simple striping.}
message raid1 {1 - Mirroring. The parity is the mirror.}
message raid4 {4 - Striping with parity stored on the last component.}
message raid5 {5 - Striping with distributed parity.}
@@ -1126,7 +1126,7 @@ message vnd_err_menufmt { PATH NOT DEF
message vnd_assgn_menufmt { vnd%1d on %-51s ASSIGN}
message vnd_menufmt { vnd%1d on %-45s %11uM}
message vnd_path_fmt {File path: %29s}
-message vnd_assgn_fmt {Assign exist image: %20s}
+message vnd_assgn_fmt {Create new image: %20s}
message vnd_size_fmt {Size:%22sM}
message vnd_ro_fmt {Read-only:%22s}
message vnd_geom_fmt {Set geometry by hand: %18s}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.7 src/usr.sbin/sysinst/msg.mi.fr:1.8
--- src/usr.sbin/sysinst/msg.mi.fr:1.7 Mon Apr 20 14:10:31 2015
+++ src/usr.sbin/sysinst/msg.mi.fr Sun May 17 10:13:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.7 2015/04/20 14:10:31 maxv Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.8 2015/05/17 10:13:24 martin Exp $ */
/*
* Copyright 1997
CVS commit: src/sys/fs/cd9660
Module Name:src Committed By: pooka Date: Sun May 17 09:45:37 UTC 2015 Removed Files: src/sys/fs/cd9660: TODO.hibler Log Message: Remove. For example, vfs_cluster hasn't existed since early UBC days (which were 10+ years ago). To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/sys/fs/cd9660/TODO.hibler Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/cd9660
Module Name:src
Committed By: pooka
Date: Sun May 17 09:46:12 UTC 2015
Modified Files:
src/sys/fs/cd9660: TODO
Log Message:
update: runs as a userspace process now.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/cd9660/TODO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/cd9660/TODO
diff -u src/sys/fs/cd9660/TODO:1.3 src/sys/fs/cd9660/TODO:1.4
--- src/sys/fs/cd9660/TODO:1.3 Sun Dec 11 12:24:25 2005
+++ src/sys/fs/cd9660/TODO Sun May 17 09:46:12 2015
@@ -1,4 +1,4 @@
-# $NetBSD: TODO,v 1.3 2005/12/11 12:24:25 christos Exp $
+# $NetBSD: TODO,v 1.4 2015/05/17 09:46:12 pooka Exp $
1) should understand "older", original High Sierra ("CDROM001") type
@@ -32,7 +32,7 @@
6) should run as a user process, and not take up kernel space (cdroms
are slow)
- Not yet.
+ Yes, via rump kernels, also transparently on top of puffs w/ rump_cd9660(8).
7) ECMA support.
