CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Mon Mar 8 08:56:03 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c Log Message: ensure that we have an element in the array before we try to store a value in it. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: mrg Date: Mon Mar 8 08:59:06 UTC 2010 Modified Files: src/sys/arch/sparc64/sparc64: cache.h ipifuncs.c locore.s pmap.c Log Message: blast_dcache() SMP friendly: - blast_dcache() becomes sp_blast_dcache(dcache_size, dcache_line_size) - new smp_blast_dcache(sparc64_cpuset_t) that blasts the D$ on this cpuset - sparc64_ipi_blast_dcache() to support the above - in pmap_remove_all(), when freeing mmu contexts for this pmap, mark the set of cpus to blast the d$ on as well and convert the blast_dcache() call into smp_blast_dcache() on the cpus who ran this pmap, or, sp_blast_dcache(dcache_size, dcache_line_size) - convert the remaining blast_dcache() in machdep.c to sp_blast_dcache() - in pmap_destroy()/pmap_remove_all() take the pmap_lock() always since we assert it is held always. with these changes, NFS builds on the U60 seem to be stable now, and the USIII machines also can often complete a single build.sh run now, diskful or diskless. reviewed by mlelstv and partially by martin, tested by martin and myself, with some ideas from chuq as well. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc64/sparc64/cache.h cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sparc64/sparc64/ipifuncs.c cvs rdiff -u -r1.325 -r1.326 src/sys/arch/sparc64/sparc64/locore.s cvs rdiff -u -r1.257 -r1.258 src/sys/arch/sparc64/sparc64/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: he
Date: Mon Mar 8 09:32:18 UTC 2010
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Fix the setting of MKZFS for amd64 and i386, so that the set lists
match up again, and it matches with the comment a few lines above.
To generate a diff of this commit:
cvs rdiff -u -r1.620 -r1.621 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.620 src/share/mk/bsd.own.mk:1.621
--- src/share/mk/bsd.own.mk:1.620 Tue Mar 2 20:49:18 2010
+++ src/share/mk/bsd.own.mk Mon Mar 8 09:32:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.620 2010/03/02 20:49:18 darran Exp $
+# $NetBSD: bsd.own.mk,v 1.621 2010/03/08 09:32:18 he Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -679,7 +679,7 @@
# We want to build zfs only for i386 and amd64 by default for now.
#
.if ${MACHINE} == amd64 || ${MACHINE} == i386
-MKZFS?= no
+MKZFS?= yes
.endif
#
CVS commit: src/share/mk
Module Name:src Committed By: he Date: Mon Mar 8 09:32:18 UTC 2010 Modified Files: src/share/mk: bsd.own.mk Log Message: Fix the setting of MKZFS for amd64 and i386, so that the set lists match up again, and it matches with the comment a few lines above. To generate a diff of this commit: cvs rdiff -u -r1.620 -r1.621 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.
CVS commit: src/usr.bin/config
Module Name:src Committed By: pooka Date: Mon Mar 8 10:19:15 UTC 2010 Modified Files: src/usr.bin/config: defs.h gram.y main.c pack.c scan.l sem.c sem.h Log Message: Add a highly experimental pseudo-root feature to be used in conjuction with the also-experimental ioconf keyword. pseudo-root allows to specify a root at any point in the device tree without having attachments from the actual root. For example, instead of having a config file like this: mainbus0 at root bus_a? at mainbus0 bus_b? at bus_a* device7 at bus_b? You can have one like this: pseudo-root bus_b* device7 at bus_b? This will produce the relevant ioconf.c glue for device number 7 only instead of the whole 9 yards from root. Perhaps needless to say, this can be used to generate snippets of config glue for modules and, let's not deny that my main motivation for doing this, rump components. This is part 2/3 of my modifications to config (the last part is autogenerating source file lists and component Makefiles). No strong objection from cube (after a little pressuring ;), but like he said, the implementation will most likely need some more tweaking and may not work correctly under all pseudo-root uses yet. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/config/defs.h cvs rdiff -u -r1.21 -r1.22 src/usr.bin/config/gram.y cvs rdiff -u -r1.40 -r1.41 src/usr.bin/config/main.c cvs rdiff -u -r1.7 -r1.8 src/usr.bin/config/pack.c cvs rdiff -u -r1.14 -r1.15 src/usr.bin/config/scan.l cvs rdiff -u -r1.33 -r1.34 src/usr.bin/config/sem.c cvs rdiff -u -r1.5 -r1.6 src/usr.bin/config/sem.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/config
Module Name:src
Committed By: pooka
Date: Mon Mar 8 10:19:15 UTC 2010
Modified Files:
src/usr.bin/config: defs.h gram.y main.c pack.c scan.l sem.c sem.h
Log Message:
Add a highly experimental pseudo-root feature to be used in conjuction
with the also-experimental ioconf keyword. pseudo-root allows to
specify a root at any point in the device tree without having
attachments from the actual root.
For example, instead of having a config file like this:
mainbus0 at root
bus_a? at mainbus0
bus_b? at bus_a*
device7 at bus_b?
You can have one like this:
pseudo-root bus_b*
device7 at bus_b?
This will produce the relevant ioconf.c glue for device number 7
only instead of the whole 9 yards from root. Perhaps needless to
say, this can be used to generate snippets of config glue for
modules and, let's not deny that my main motivation for doing this,
rump components.
This is part 2/3 of my modifications to config (the last part is
autogenerating source file lists and component Makefiles).
No strong objection from cube (after a little pressuring ;), but
like he said, the implementation will most likely need some more
tweaking and may not work correctly under all pseudo-root uses yet.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/config/defs.h
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/config/gram.y
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/config/main.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/config/pack.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/config/scan.l
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/config/sem.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/config/sem.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.32 src/usr.bin/config/defs.h:1.33
--- src/usr.bin/config/defs.h:1.32 Wed Mar 3 13:53:22 2010
+++ src/usr.bin/config/defs.h Mon Mar 8 10:19:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.32 2010/03/03 13:53:22 pooka Exp $ */
+/* $NetBSD: defs.h,v 1.33 2010/03/08 10:19:14 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -260,6 +260,7 @@
#define DEVI_ACTIVE 1 /* instance has an active parent */
#define DEVI_IGNORED 2 /* instance's parent has been removed */
#define DEVI_BROKEN 3 /* instance is broken (syntax error) */
+ int i_pseudoroot; /* instance is pseudoroot */
/* created during packing or ioconf.c generation */
short i_collapsed; /* set = this alias no longer needed */
Index: src/usr.bin/config/gram.y
diff -u src/usr.bin/config/gram.y:1.21 src/usr.bin/config/gram.y:1.22
--- src/usr.bin/config/gram.y:1.21 Wed Mar 3 13:53:22 2010
+++ src/usr.bin/config/gram.y Mon Mar 8 10:19:14 2010
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: gram.y,v 1.21 2010/03/03 13:53:22 pooka Exp $ */
+/* $NetBSD: gram.y,v 1.22 2010/03/08 10:19:14 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -111,7 +111,7 @@
%token XMACHINE MAJOR MAKEOPTIONS MAXUSERS MAXPARTITIONS MINOR
%token NEEDS_COUNT NEEDS_FLAG NO
%token XOBJECT OBSOLETE ON OPTIONS
-%token PACKAGE PLUSEQ PREFIX PSEUDO_DEVICE
+%token PACKAGE PLUSEQ PREFIX PSEUDO_DEVICE PSEUDO_ROOT
%token ROOT
%token SOURCE
%token TYPE
@@ -464,6 +464,7 @@
NO CONFIG WORD { delconf($3); } |
NO PSEUDO_DEVICE WORD { delpseudo($3); } |
PSEUDO_DEVICE WORD npseudo { addpseudo($2, $3); } |
+ PSEUDO_ROOT device_instance { addpseudoroot($2); } |
NO device_instance AT attachment
{ deldevi($2, $4); } |
NO DEVICE AT attachment { deldeva($4); } |
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.40 src/usr.bin/config/main.c:1.41
--- src/usr.bin/config/main.c:1.40 Wed Mar 3 13:56:29 2010
+++ src/usr.bin/config/main.c Mon Mar 8 10:19:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.40 2010/03/03 13:56:29 pooka Exp $ */
+/* $NetBSD: main.c,v 1.41 2010/03/08 10:19:14 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -1026,8 +1026,14 @@
{
struct devi *i;
+ /*
+ * EHAMMERTOOBIG: we shouldn't check i_pseudoroot here.
+ * What we want by this check is them to appear non-present
+ * except for purposes of other devices being able to attach
+ * to them.
+ */
for (i = deva-d_ihead; i != NULL; i = i-i_asame)
- if (i-i_active == DEVI_ACTIVE
+ if (i-i_active == DEVI_ACTIVE i-i_pseudoroot == 0
(unit == WILD || unit == i-i_unit || i-i_unit == STAR))
return (1);
return (0);
Index: src/usr.bin/config/pack.c
diff -u src/usr.bin/config/pack.c:1.7 src/usr.bin/config/pack.c:1.8
--- src/usr.bin/config/pack.c:1.7 Thu Jan 21 18:06:38 2010
+++ src/usr.bin/config/pack.c Mon Mar 8 10:19:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pack.c,v 1.7 2010/01/21 18:06:38 pooka Exp $ */
+/* $NetBSD: pack.c,v 1.8 2010/03/08 10:19:14 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -187,7 +187,8 @@
for (i = d-d_ihead; i != NULL; i = i-i_bsame) {
m = n;
for (l = i; l != NULL; l = l-i_alias) {
-if (l-i_active != DEVI_ACTIVE)
+if (l-i_active !=
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Mon Mar 8 10:24:37 UTC 2010 Modified Files: src/sys/rump/dev: files.rump src/sys/rump/dev/lib/libucom: UCOM.ioconf ucom_at_usb.c src/sys/rump/dev/lib/libugenhc: Makefile src/sys/rump/dev/lib/libumass: UMASS.ioconf sd_at_scsibus_at_umass.c src/sys/rump/dev/lib/libusb: Makefile src/sys/rump/librump/rumpdev: autoconf.c rump_dev.c Added Files: src/sys/rump/dev/lib/libugenhc: UGENHC.ioconf ugenhc_at_mainbus.c src/sys/rump/dev/lib/libusb: USB.ioconf usb_at_ugenhc.c Removed Files: src/sys/rump/dev/lib/libusb: locators.h Log Message: Use config pseudo-root keyword instead of monolithic configurations starting from root. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/files.rump cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libucom/UCOM.ioconf cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libucom/ucom_at_usb.c cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libugenhc/Makefile cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libugenhc/UGENHC.ioconf \ src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libumass/UMASS.ioconf \ src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libusb/Makefile cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libusb/USB.ioconf \ src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libusb/locators.h cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpdev/autoconf.c cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpdev/rump_dev.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Mon Mar 8 10:24:37 UTC 2010
Modified Files:
src/sys/rump/dev: files.rump
src/sys/rump/dev/lib/libucom: UCOM.ioconf ucom_at_usb.c
src/sys/rump/dev/lib/libugenhc: Makefile
src/sys/rump/dev/lib/libumass: UMASS.ioconf sd_at_scsibus_at_umass.c
src/sys/rump/dev/lib/libusb: Makefile
src/sys/rump/librump/rumpdev: autoconf.c rump_dev.c
Added Files:
src/sys/rump/dev/lib/libugenhc: UGENHC.ioconf ugenhc_at_mainbus.c
src/sys/rump/dev/lib/libusb: USB.ioconf usb_at_ugenhc.c
Removed Files:
src/sys/rump/dev/lib/libusb: locators.h
Log Message:
Use config pseudo-root keyword instead of monolithic configurations
starting from root.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/files.rump
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libucom/UCOM.ioconf
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libucom/ucom_at_usb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/lib/libugenhc/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libugenhc/UGENHC.ioconf \
src/sys/rump/dev/lib/libugenhc/ugenhc_at_mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libumass/UMASS.ioconf \
src/sys/rump/dev/lib/libumass/sd_at_scsibus_at_umass.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libusb/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libusb/USB.ioconf \
src/sys/rump/dev/lib/libusb/usb_at_ugenhc.c
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libusb/locators.h
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpdev/autoconf.c
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpdev/rump_dev.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/files.rump
diff -u src/sys/rump/dev/files.rump:1.1 src/sys/rump/dev/files.rump:1.2
--- src/sys/rump/dev/files.rump:1.1 Fri Feb 12 04:20:51 2010
+++ src/sys/rump/dev/files.rump Mon Mar 8 10:24:37 2010
@@ -1,24 +1,8 @@
-# $NetBSD: files.rump,v 1.1 2010/02/12 04:20:51 pooka Exp $
+# $NetBSD: files.rump,v 1.2 2010/03/08 10:24:37 pooka Exp $
#
device mainbus { }
attach mainbus at root
+
device ugenhc: usbus, usbroothub
attach ugenhc at mainbus
-
-# ugen0 - ugen3
-mainbus0 at root
-ugenhc0 at mainbus0
-ugenhc1 at mainbus0
-ugenhc2 at mainbus0
-ugenhc3 at mainbus0
-
-# USB bus support
-usb*at ugenhc?
-
-# USB ROOT Hub
-#
-# Do *NOT* configure uhub @ uhub.
-# That is not compatible with ugen.
-#
-uhub* at usb?
Index: src/sys/rump/dev/lib/libucom/UCOM.ioconf
diff -u src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.3 src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.4
--- src/sys/rump/dev/lib/libucom/UCOM.ioconf:1.3 Mon Mar 1 11:34:27 2010
+++ src/sys/rump/dev/lib/libucom/UCOM.ioconf Mon Mar 8 10:24:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: UCOM.ioconf,v 1.3 2010/03/01 11:34:27 pooka Exp $
+# $NetBSD: UCOM.ioconf,v 1.4 2010/03/08 10:24:37 pooka Exp $
#
ioconf ucom
@@ -7,6 +7,8 @@
include dev/usb/files.usb
include rump/dev/files.rump
+pseudo-root uhub*
+
# I/O DATA USB-RSAQ2 serial adapter
uplcom* at uhub?
ucom* at uplcom? portno ?
Index: src/sys/rump/dev/lib/libucom/ucom_at_usb.c
diff -u src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.4 src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.5
--- src/sys/rump/dev/lib/libucom/ucom_at_usb.c:1.4 Sun Mar 7 17:44:40 2010
+++ src/sys/rump/dev/lib/libucom/ucom_at_usb.c Mon Mar 8 10:24:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom_at_usb.c,v 1.4 2010/03/07 17:44:40 pooka Exp $ */
+/* $NetBSD: ucom_at_usb.c,v 1.5 2010/03/08 10:24:37 pooka Exp $ */
#include sys/param.h
#include sys/types.h
@@ -29,15 +29,6 @@
FLAWLESSCALL(config_cfdata_attach(cfdata_ucom, 0));
- FLAWLESSCALL(config_cfdriver_attach(mainbus_cd));
- FLAWLESSCALL(config_cfattach_attach(mainbus, mainbus_ca));
-
- FLAWLESSCALL(config_cfdriver_attach(ugenhc_cd));
- FLAWLESSCALL(config_cfattach_attach(ugenhc, ugenhc_ca));
-
- FLAWLESSCALL(config_cfdriver_attach(usb_cd));
- FLAWLESSCALL(config_cfattach_attach(usb, usb_ca));
-
FLAWLESSCALL(config_cfdriver_attach(uplcom_cd));
FLAWLESSCALL(config_cfattach_attach(uplcom, uplcom_ca));
@@ -50,9 +41,6 @@
FLAWLESSCALL(config_cfdriver_attach(ucom_cd));
FLAWLESSCALL(config_cfattach_attach(ucom, ucom_ca));
- FLAWLESSCALL(config_cfdriver_attach(uhub_cd));
- FLAWLESSCALL(config_cfattach_attach(uhub, uroothub_ca));
-
bmaj = cmaj = -1;
FLAWLESSCALL(devsw_attach(ucom, NULL, bmaj, ucom_cdevsw, cmaj));
Index: src/sys/rump/dev/lib/libugenhc/Makefile
diff -u src/sys/rump/dev/lib/libugenhc/Makefile:1.1 src/sys/rump/dev/lib/libugenhc/Makefile:1.2
--- src/sys/rump/dev/lib/libugenhc/Makefile:1.1 Thu Feb 11 02:22:09 2010
+++ src/sys/rump/dev/lib/libugenhc/Makefile Mon Mar 8 10:24:37 2010
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/02/11 02:22:09 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/03/08 10:24:37 pooka Exp $
#
LIB= rumpdev_ugenhc
+IOCONF= UGENHC.ioconf
-SRCS= ugenhc.c
CVS commit: src/sys/rump/dev/lib/libulpt
Module Name:src
Committed By: pooka
Date: Mon Mar 8 10:30:17 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libulpt: ULPT.ioconf ulpt_at_usb.c
Log Message:
convert to ioconf/pseudo-root
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libulpt/ULPT.ioconf \
src/sys/rump/dev/lib/libulpt/ulpt_at_usb.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/libulpt/ULPT.ioconf
diff -u src/sys/rump/dev/lib/libulpt/ULPT.ioconf:1.2 src/sys/rump/dev/lib/libulpt/ULPT.ioconf:1.3
--- src/sys/rump/dev/lib/libulpt/ULPT.ioconf:1.2 Fri Feb 12 04:20:51 2010
+++ src/sys/rump/dev/lib/libulpt/ULPT.ioconf Mon Mar 8 10:30:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ULPT.ioconf,v 1.2 2010/02/12 04:20:51 pooka Exp $
+# $NetBSD: ULPT.ioconf,v 1.3 2010/03/08 10:30:17 pooka Exp $
#
ioconf ulpt
@@ -7,4 +7,6 @@
include dev/usb/files.usb
include rump/dev/files.rump
+pseudo-root uhub*
+
ulpt* at uhub? port ? configuration ? interface ?
Index: src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c
diff -u src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.2 src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.3
--- src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c:1.2 Mon Mar 1 13:12:20 2010
+++ src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c Mon Mar 8 10:30:17 2010
@@ -1,10 +1,4 @@
-/* $NetBSD: ulpt_at_usb.c,v 1.2 2010/03/01 13:12:20 pooka Exp $ */
-
-/*
- * MACHINE GENERATED: DO NOT EDIT
- *
- * ioconf.c, from TESTI_ulpt
- */
+/* $NetBSD: ulpt_at_usb.c,v 1.3 2010/03/08 10:30:17 pooka Exp $ */
#include sys/param.h
#include sys/conf.h
@@ -12,374 +6,7 @@
#include sys/mount.h
#include sys/stat.h
-static const struct cfiattrdata gpibdevcf_iattrdata = {
- gpibdev, 1,
- {
- { address, -1, -1 },
- }
-};
-static const struct cfiattrdata acpibuscf_iattrdata = {
- acpibus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata caccf_iattrdata = {
- cac, 1,
- {
- { unit, -1, -1 },
- }
-};
-static const struct cfiattrdata spicf_iattrdata = {
- spi, 1,
- {
- { slave, NULL, 0 },
- }
-};
-static const struct cfiattrdata radiodevcf_iattrdata = {
- radiodev, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata mlxcf_iattrdata = {
- mlx, 1,
- {
- { unit, -1, -1 },
- }
-};
-static const struct cfiattrdata ucombuscf_iattrdata = {
- ucombus, 1,
- {
- { portno, -1, -1 },
- }
-};
-static const struct cfiattrdata videobuscf_iattrdata = {
- videobus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata isabuscf_iattrdata = {
- isabus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata i2cbuscf_iattrdata = {
- i2cbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata ata_hlcf_iattrdata = {
- ata_hl, 1,
- {
- { drive, -1, -1 },
- }
-};
-static const struct cfiattrdata depcacf_iattrdata = {
- depca, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata ppbuscf_iattrdata = {
- ppbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata eisabuscf_iattrdata = {
- eisabus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata atapicf_iattrdata = {
- atapi, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata usbroothubifcf_iattrdata = {
- usbroothubif, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata altmemdevcf_iattrdata = {
- altmemdev, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata tcbuscf_iattrdata = {
- tcbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata onewirebuscf_iattrdata = {
- onewirebus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata gpiocf_iattrdata = {
- gpio, 2,
- {
- { offset, -1, -1 },
- { mask, 0, 0 },
- }
-};
-static const struct cfiattrdata cbbuscf_iattrdata = {
- cbbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata gpiobuscf_iattrdata = {
- gpiobus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata drmcf_iattrdata = {
- drm, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata pckbportcf_iattrdata = {
- pckbport, 1,
- {
- { slot, -1, -1 },
- }
-};
-static const struct cfiattrdata irbuscf_iattrdata = {
- irbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata aaccf_iattrdata = {
- aac, 1,
- {
- { unit, -1, -1 },
- }
-};
-static const struct cfiattrdata pcibuscf_iattrdata = {
- pcibus, 1,
- {
- { bus, -1, -1 },
- }
-};
-static const struct cfiattrdata usbififcf_iattrdata = {
- usbifif, 6,
- {
- { port, -1, -1 },
- { configuration, -1, -1 },
- { interface, -1, -1 },
- { vendor, -1, -1 },
- { product, -1, -1 },
- { release, -1, -1 },
- }
-};
-static const struct cfiattrdata upccf_iattrdata = {
- upc, 1,
- {
- { offset, -1, -1 },
- }
-};
-static const struct cfiattrdata iiccf_iattrdata = {
- iic, 2,
- {
- { addr, -1, -1 },
- { size, -1, -1 },
- }
-};
-static const struct cfiattrdata onewirecf_iattrdata
CVS commit: src/sys/rump/dev/lib/libulpt
Module Name:src Committed By: pooka Date: Mon Mar 8 10:30:17 UTC 2010 Modified Files: src/sys/rump/dev/lib/libulpt: ULPT.ioconf ulpt_at_usb.c Log Message: convert to ioconf/pseudo-root To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libulpt/ULPT.ioconf \ src/sys/rump/dev/lib/libulpt/ulpt_at_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/wip/libusbrum
Module Name:src Committed By: pooka Date: Mon Mar 8 10:36:10 UTC 2010 Modified Files: src/sys/rump/dev/wip/libusbrum: rum_at_usb.c Log Message: Update minimum to make compile. i don't have the hardware anymore, so i can't test other changes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libusbrum/rum_at_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/wip/libusbrum
Module Name:src
Committed By: pooka
Date: Mon Mar 8 10:36:10 UTC 2010
Modified Files:
src/sys/rump/dev/wip/libusbrum: rum_at_usb.c
Log Message:
Update minimum to make compile. i don't have the hardware anymore,
so i can't test other changes.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libusbrum/rum_at_usb.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/wip/libusbrum/rum_at_usb.c
diff -u src/sys/rump/dev/wip/libusbrum/rum_at_usb.c:1.3 src/sys/rump/dev/wip/libusbrum/rum_at_usb.c:1.4
--- src/sys/rump/dev/wip/libusbrum/rum_at_usb.c:1.3 Wed Feb 10 02:26:24 2010
+++ src/sys/rump/dev/wip/libusbrum/rum_at_usb.c Mon Mar 8 10:36:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rum_at_usb.c,v 1.3 2010/02/10 02:26:24 pooka Exp $ */
+/* $NetBSD: rum_at_usb.c,v 1.4 2010/03/08 10:36:10 pooka Exp $ */
#include sys/param.h
#include sys/types.h
@@ -81,6 +81,7 @@
{ rum, rum, 0, FSTATE_STAR, NULL, 0, usbdevif_pspec },
};
+#include rump_private.h
#include rump_dev_private.h
#define FLAWLESSCALL(call) \
@@ -90,8 +91,7 @@
panic(\%s\ failed, #call);\
} while (/*CONSTCOND*/0)
-void
-rump_device_configuration(void)
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
extern struct cfattach usb_ca, uhub_ca, uroothub_ca, rum_ca;
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Mon Mar 8 10:53:03 UTC 2010
Modified Files:
src/sys/dev/acpi: wmi_acpi.c
Log Message:
Add a detachment routine.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/wmi_acpi.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/acpi/wmi_acpi.c
diff -u src/sys/dev/acpi/wmi_acpi.c:1.15 src/sys/dev/acpi/wmi_acpi.c:1.16
--- src/sys/dev/acpi/wmi_acpi.c:1.15 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/wmi_acpi.c Mon Mar 8 10:53:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpi.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: wmi_acpi.c,v 1.16 2010/03/08 10:53:03 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wmi_acpi.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: wmi_acpi.c,v 1.16 2010/03/08 10:53:03 jruoho Exp $);
#include sys/param.h
#include sys/device.h
@@ -117,6 +117,7 @@
static int acpi_wmi_match(device_t, cfdata_t, void *);
static voidacpi_wmi_attach(device_t, device_t, void *);
+static int acpi_wmi_detach(device_t, int);
static int acpi_wmi_print(void *, const char *);
static boolacpi_wmi_init(struct acpi_wmi_softc *);
static boolacpi_wmi_add(struct acpi_wmi_softc *, ACPI_OBJECT *);
@@ -128,8 +129,8 @@
static ACPI_STATUS acpi_wmi_guid_get(struct acpi_wmi_softc *,
const char *, struct wmi_t **);
-static voidacpi_wmi_event_add(struct acpi_wmi_softc *);
-static voidacpi_wmi_event_del(struct acpi_wmi_softc *);
+static ACPI_STATUS acpi_wmi_event_add(struct acpi_wmi_softc *);
+static ACPI_STATUS acpi_wmi_event_del(struct acpi_wmi_softc *);
static voidacpi_wmi_event_handler(ACPI_HANDLE, uint32_t, void *);
static boolacpi_wmi_suspend(device_t, const pmf_qual_t *);
static boolacpi_wmi_resume(device_t, const pmf_qual_t *);
@@ -142,7 +143,7 @@
};
CFATTACH_DECL_NEW(acpiwmi, sizeof(struct acpi_wmi_softc),
-acpi_wmi_match, acpi_wmi_attach, NULL, NULL);
+acpi_wmi_match, acpi_wmi_attach, acpi_wmi_detach, NULL);
static int
acpi_wmi_match(device_t parent, cfdata_t match, void *aux)
@@ -163,6 +164,8 @@
sc-sc_dev = self;
sc-sc_node = aa-aa_node;
+
+ sc-sc_child = NULL;
sc-sc_handler = NULL;
aprint_naive(\n);
@@ -175,18 +178,34 @@
acpi_wmi_dump(sc);
#endif
- acpi_wmi_event_add(sc);
-
- if (pmf_device_register(sc-sc_dev,
- acpi_wmi_suspend, acpi_wmi_resume) != true)
- aprint_error_dev(self, failed to register power handler\n);
+ (void)acpi_wmi_event_add(sc);
+ (void)pmf_device_register(self, acpi_wmi_suspend, acpi_wmi_resume);
- /* Attach a child device to the pseudo-bus. */
sc-sc_child = config_found_ia(self, acpiwmibus,
NULL, acpi_wmi_print);
}
static int
+acpi_wmi_detach(device_t self, int flags)
+{
+ struct acpi_wmi_softc *sc = device_private(self);
+ ACPI_STATUS rv;
+
+ rv = acpi_wmi_event_del(sc);
+
+ if (ACPI_FAILURE(rv))
+ return EBUSY;
+
+ if (sc-sc_child != NULL)
+ (void)config_detach(sc-sc_child, flags);
+
+ acpi_wmi_del(sc);
+ pmf_device_deregister(self);
+
+ return 0;
+}
+
+static int
acpi_wmi_print(void *aux, const char *pnp)
{
@@ -389,7 +408,7 @@
/*
* Adds internal event handler.
*/
-static void
+static ACPI_STATUS
acpi_wmi_event_add(struct acpi_wmi_softc *sc)
{
struct wmi_t *wmi;
@@ -401,7 +420,7 @@
if (ACPI_FAILURE(rv)) {
aprint_error_dev(sc-sc_dev, failed to install notify
handler: %s\n, AcpiFormatException(rv));
- return;
+ return rv;
}
/* Enable possible expensive events. */
@@ -422,12 +441,14 @@
expensive WExx: %s\n, AcpiFormatException(rv));
}
}
+
+ return AE_OK;
}
/*
* Removes the internal event handler.
*/
-static void
+static ACPI_STATUS
acpi_wmi_event_del(struct acpi_wmi_softc *sc)
{
struct wmi_t *wmi;
@@ -439,7 +460,7 @@
if (ACPI_FAILURE(rv)) {
aprint_debug_dev(sc-sc_dev, failed to remove notify
handler: %s\n, AcpiFormatException(rv));
- return;
+ return rv;
}
SIMPLEQ_FOREACH(wmi, sc-wmi_head, wmi_link) {
@@ -461,6 +482,8 @@
aprint_error_dev(sc-sc_dev, failed to disable
expensive WExx: %s\n, AcpiFormatException(rv));
}
+
+ return AE_OK;
}
/*
@@ -512,6 +535,9 @@
{
struct acpi_wmi_softc *sc = aux;
+ if (sc-sc_child == NULL)
+ return;
+
if (sc-sc_handler == NULL)
return;
CVS commit: src/sys/rump/dev/lib/libwscons
Module Name:src
Committed By: pooka
Date: Mon Mar 8 10:54:22 UTC 2010
Modified Files:
src/sys/rump/dev/lib/libwscons: Makefile component.c
Added Files:
src/sys/rump/dev/lib/libwscons: WSCONS.ioconf
Removed Files:
src/sys/rump/dev/lib/libwscons: locators.h
Log Message:
convert to ioconf pseudo-root
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libwscons/Makefile \
src/sys/rump/dev/lib/libwscons/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libwscons/WSCONS.ioconf
cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libwscons/locators.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/libwscons/Makefile
diff -u src/sys/rump/dev/lib/libwscons/Makefile:1.2 src/sys/rump/dev/lib/libwscons/Makefile:1.3
--- src/sys/rump/dev/lib/libwscons/Makefile:1.2 Tue Feb 16 20:42:45 2010
+++ src/sys/rump/dev/lib/libwscons/Makefile Mon Mar 8 10:54:21 2010
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/02/16 20:42:45 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2010/03/08 10:54:21 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/wscons
LIB= rumpdev_wscons
+IOCONF= WSCONS.ioconf
SRCS= wsevent.c wskbd.c wskbdutil.c wsmouse.c
Index: src/sys/rump/dev/lib/libwscons/component.c
diff -u src/sys/rump/dev/lib/libwscons/component.c:1.2 src/sys/rump/dev/lib/libwscons/component.c:1.3
--- src/sys/rump/dev/lib/libwscons/component.c:1.2 Mon Mar 1 13:12:20 2010
+++ src/sys/rump/dev/lib/libwscons/component.c Mon Mar 8 10:54:21 2010
@@ -1,426 +1,13 @@
-/* $NetBSD: component.c,v 1.2 2010/03/01 13:12:20 pooka Exp $ */
-
-/*
- * MACHINE GENERATED: DO NOT EDIT
- *
- * ioconf.c, from TESTI_wscons
- */
+/* $NetBSD: component.c,v 1.3 2010/03/08 10:54:21 pooka Exp $ */
#include sys/param.h
#include sys/conf.h
#include sys/device.h
#include sys/mount.h
-
-static const struct cfiattrdata gpibdevcf_iattrdata = {
- gpibdev, 1,
- {
- { address, -1, -1 },
- }
-};
-static const struct cfiattrdata acpibuscf_iattrdata = {
- acpibus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata caccf_iattrdata = {
- cac, 1,
- {
- { unit, -1, -1 },
- }
-};
-static const struct cfiattrdata spicf_iattrdata = {
- spi, 1,
- {
- { slave, NULL, 0 },
- }
-};
-static const struct cfiattrdata radiodevcf_iattrdata = {
- radiodev, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata mlxcf_iattrdata = {
- mlx, 1,
- {
- { unit, -1, -1 },
- }
-};
-static const struct cfiattrdata scsibuscf_iattrdata = {
- scsibus, 2,
- {
- { target, -1, -1 },
- { lun, -1, -1 },
- }
-};
-static const struct cfiattrdata ucombuscf_iattrdata = {
- ucombus, 1,
- {
- { portno, -1, -1 },
- }
-};
-static const struct cfiattrdata videobuscf_iattrdata = {
- videobus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata isabuscf_iattrdata = {
- isabus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata i2cbuscf_iattrdata = {
- i2cbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata ata_hlcf_iattrdata = {
- ata_hl, 1,
- {
- { drive, -1, -1 },
- }
-};
-static const struct cfiattrdata mainbuscf_iattrdata = {
- mainbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata depcacf_iattrdata = {
- depca, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata ppbuscf_iattrdata = {
- ppbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata eisabuscf_iattrdata = {
- eisabus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata atapicf_iattrdata = {
- atapi, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata atapibuscf_iattrdata = {
- atapibus, 1,
- {
- { drive, -1, -1 },
- }
-};
-static const struct cfiattrdata usbroothubifcf_iattrdata = {
- usbroothubif, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata altmemdevcf_iattrdata = {
- altmemdev, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata tcbuscf_iattrdata = {
- tcbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata onewirebuscf_iattrdata = {
- onewirebus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata gpiocf_iattrdata = {
- gpio, 2,
- {
- { offset, -1, -1 },
- { mask, 0, 0 },
- }
-};
-static const struct cfiattrdata cbbuscf_iattrdata = {
- cbbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata gpiobuscf_iattrdata = {
- gpiobus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata drmcf_iattrdata = {
- drm, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata pckbportcf_iattrdata = {
- pckbport, 1,
- {
- { slot, -1, -1 },
- }
-};
-static const struct cfiattrdata irbuscf_iattrdata = {
- irbus, 0, {
- { NULL, NULL, 0 },
- }
-};
-static const struct cfiattrdata aaccf_iattrdata = {
- aac, 1,
- {
- { unit, -1, -1 },
- }
-};
-static const struct cfiattrdata
CVS commit: src/sys/rump/dev/lib/libwscons
Module Name:src Committed By: pooka Date: Mon Mar 8 10:54:22 UTC 2010 Modified Files: src/sys/rump/dev/lib/libwscons: Makefile component.c Added Files: src/sys/rump/dev/lib/libwscons: WSCONS.ioconf Removed Files: src/sys/rump/dev/lib/libwscons: locators.h Log Message: convert to ioconf pseudo-root To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/rump/dev/lib/libwscons/Makefile \ src/sys/rump/dev/lib/libwscons/component.c cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libwscons/WSCONS.ioconf cvs rdiff -u -r1.1 -r0 src/sys/rump/dev/lib/libwscons/locators.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/wip
Module Name:src
Committed By: pooka
Date: Mon Mar 8 10:56:12 UTC 2010
Modified Files:
src/sys/rump/dev/wip: Makefile.inc
Log Message:
need -Irumpkern for RUMP_COMPONENT
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/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/sys/rump/dev/wip/Makefile.inc
diff -u src/sys/rump/dev/wip/Makefile.inc:1.1 src/sys/rump/dev/wip/Makefile.inc:1.2
--- src/sys/rump/dev/wip/Makefile.inc:1.1 Thu Oct 1 21:46:30 2009
+++ src/sys/rump/dev/wip/Makefile.inc Mon Mar 8 10:56:12 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/10/01 21:46:30 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.2 2010/03/08 10:56:12 pooka Exp $
#
RUMPTOP= ${.CURDIR}/../../..
-CPPFLAGS+= -I${RUMPTOP}/librump/rumpdev
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpdev -I${RUMPTOP}/librump/rumpkern
.include ${RUMPTOP}/Makefile.rump
CVS commit: src/sys/rump/dev/wip
Module Name:src Committed By: pooka Date: Mon Mar 8 10:56:12 UTC 2010 Modified Files: src/sys/rump/dev/wip: Makefile.inc Log Message: need -Irumpkern for RUMP_COMPONENT To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/dev/wip/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/wip
Module Name:src Committed By: pooka Date: Mon Mar 8 10:57:25 UTC 2010 Modified Files: src/sys/rump/dev/wip/libukbd: UKBD.ioconf ukbd_at_usb.c src/sys/rump/dev/wip/libums: UMS.ioconf ums_at_usb.c Log Message: Convert to pseudo-root. These can be moved out of wip (once I get some time). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libukbd/UKBD.ioconf \ src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libums/UMS.ioconf \ src/sys/rump/dev/wip/libums/ums_at_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/dev/wip
Module Name:src
Committed By: pooka
Date: Mon Mar 8 10:57:25 UTC 2010
Modified Files:
src/sys/rump/dev/wip/libukbd: UKBD.ioconf ukbd_at_usb.c
src/sys/rump/dev/wip/libums: UMS.ioconf ums_at_usb.c
Log Message:
Convert to pseudo-root.
These can be moved out of wip (once I get some time).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libukbd/UKBD.ioconf \
src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/wip/libums/UMS.ioconf \
src/sys/rump/dev/wip/libums/ums_at_usb.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/wip/libukbd/UKBD.ioconf
diff -u src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.3 src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.4
--- src/sys/rump/dev/wip/libukbd/UKBD.ioconf:1.3 Fri Feb 12 04:21:57 2010
+++ src/sys/rump/dev/wip/libukbd/UKBD.ioconf Mon Mar 8 10:57:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: UKBD.ioconf,v 1.3 2010/02/12 04:21:57 pooka Exp $
+# $NetBSD: UKBD.ioconf,v 1.4 2010/03/08 10:57:25 pooka Exp $
#
ioconf ukbd
@@ -7,6 +7,8 @@
include dev/usb/files.usb
include rump/dev/files.rump
+pseudo-root uhub*
+
# USB HID device
uhidev* at uhub? port ? configuration ? interface ?
Index: src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c
diff -u src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.3 src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.4
--- src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c:1.3 Wed Feb 10 02:26:23 2010
+++ src/sys/rump/dev/wip/libukbd/ukbd_at_usb.c Mon Mar 8 10:57:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd_at_usb.c,v 1.3 2010/02/10 02:26:23 pooka Exp $ */
+/* $NetBSD: ukbd_at_usb.c,v 1.4 2010/03/08 10:57:25 pooka Exp $ */
#include sys/param.h
#include sys/conf.h
@@ -9,6 +9,7 @@
#include sys/stat.h
+#include rump_private.h
#include rump_dev_private.h
#include rump_vfs_private.h
@@ -19,27 +20,14 @@
panic(\%s\ failed, #call);\
} while (/*CONSTCOND*/0)
-void
-rump_device_configuration(void)
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
FLAWLESSCALL(config_cfdata_attach(cfdata_ukbd, 0));
- FLAWLESSCALL(config_cfdriver_attach(mainbus_cd));
- FLAWLESSCALL(config_cfattach_attach(mainbus, mainbus_ca));
-
- FLAWLESSCALL(config_cfdriver_attach(ugenhc_cd));
- FLAWLESSCALL(config_cfattach_attach(ugenhc, ugenhc_ca));
-
- FLAWLESSCALL(config_cfdriver_attach(usb_cd));
- FLAWLESSCALL(config_cfattach_attach(usb, usb_ca));
-
FLAWLESSCALL(config_cfdriver_attach(uhidev_cd));
FLAWLESSCALL(config_cfattach_attach(uhidev, uhidev_ca));
FLAWLESSCALL(config_cfdriver_attach(ukbd_cd));
FLAWLESSCALL(config_cfattach_attach(ukbd, ukbd_ca));
-
- FLAWLESSCALL(config_cfdriver_attach(uhub_cd));
- FLAWLESSCALL(config_cfattach_attach(uhub, uroothub_ca));
}
Index: src/sys/rump/dev/wip/libums/UMS.ioconf
diff -u src/sys/rump/dev/wip/libums/UMS.ioconf:1.3 src/sys/rump/dev/wip/libums/UMS.ioconf:1.4
--- src/sys/rump/dev/wip/libums/UMS.ioconf:1.3 Fri Feb 12 04:21:57 2010
+++ src/sys/rump/dev/wip/libums/UMS.ioconf Mon Mar 8 10:57:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: UMS.ioconf,v 1.3 2010/02/12 04:21:57 pooka Exp $
+# $NetBSD: UMS.ioconf,v 1.4 2010/03/08 10:57:25 pooka Exp $
#
ioconf ums
@@ -7,6 +7,8 @@
include dev/usb/files.usb
include rump/dev/files.rump
+pseudo-root uhub*
+
# USB HID device
uhidev* at uhub? port ? configuration ? interface ?
Index: src/sys/rump/dev/wip/libums/ums_at_usb.c
diff -u src/sys/rump/dev/wip/libums/ums_at_usb.c:1.3 src/sys/rump/dev/wip/libums/ums_at_usb.c:1.4
--- src/sys/rump/dev/wip/libums/ums_at_usb.c:1.3 Wed Feb 10 02:26:24 2010
+++ src/sys/rump/dev/wip/libums/ums_at_usb.c Mon Mar 8 10:57:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ums_at_usb.c,v 1.3 2010/02/10 02:26:24 pooka Exp $ */
+/* $NetBSD: ums_at_usb.c,v 1.4 2010/03/08 10:57:25 pooka Exp $ */
#include sys/param.h
#include sys/conf.h
@@ -7,6 +7,7 @@
#include ioconf.c
+#include rump_private.h
#include rump_dev_private.h
#include rump_vfs_private.h
@@ -17,27 +18,14 @@
panic(\%s\ failed, #call);\
} while (/*CONSTCOND*/0)
-void
-rump_device_configuration(void)
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
FLAWLESSCALL(config_cfdata_attach(cfdata_ums, 0));
- FLAWLESSCALL(config_cfdriver_attach(mainbus_cd));
- FLAWLESSCALL(config_cfattach_attach(mainbus, mainbus_ca));
-
- FLAWLESSCALL(config_cfdriver_attach(ugenhc_cd));
- FLAWLESSCALL(config_cfattach_attach(ugenhc, ugenhc_ca));
-
- FLAWLESSCALL(config_cfdriver_attach(usb_cd));
- FLAWLESSCALL(config_cfattach_attach(usb, usb_ca));
-
FLAWLESSCALL(config_cfdriver_attach(uhidev_cd));
FLAWLESSCALL(config_cfattach_attach(uhidev, uhidev_ca));
FLAWLESSCALL(config_cfdriver_attach(ums_cd));
FLAWLESSCALL(config_cfattach_attach(ums, ums_ca));
-
- FLAWLESSCALL(config_cfdriver_attach(uhub_cd));
- FLAWLESSCALL(config_cfattach_attach(uhub, uroothub_ca));
}
CVS commit: src/usr.bin/config
Module Name:src
Committed By: pooka
Date: Mon Mar 8 11:12:32 UTC 2010
Modified Files:
src/usr.bin/config: gram.y
Log Message:
print ioconf WARNING in caps too
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/config/gram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/gram.y
diff -u src/usr.bin/config/gram.y:1.22 src/usr.bin/config/gram.y:1.23
--- src/usr.bin/config/gram.y:1.22 Mon Mar 8 10:19:14 2010
+++ src/usr.bin/config/gram.y Mon Mar 8 11:12:32 2010
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: gram.y,v 1.22 2010/03/08 10:19:14 pooka Exp $ */
+/* $NetBSD: gram.y,v 1.23 2010/03/08 11:12:32 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -621,7 +621,7 @@
struct nvlist *nv;
if (isioconf) {
- fprintf(stderr, warning: ioconf is an experimental feature\n);
+ fprintf(stderr, WARNING: ioconf is an experimental feature\n);
if (include(_PATH_DEVNULL, ENDDEFS, 0, 0) != 0)
exit(1);
ioconfname = mch;
CVS commit: src/usr.bin/config
Module Name:src Committed By: pooka Date: Mon Mar 8 11:12:32 UTC 2010 Modified Files: src/usr.bin/config: gram.y Log Message: print ioconf WARNING in caps too To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.bin/config/gram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Mon Mar 8 11:39:43 UTC 2010
Modified Files:
src/sys/dev/acpi: dalb_acpi.c
Log Message:
Remove unused struct sysctllog from the softc.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/dalb_acpi.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/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.9 src/sys/dev/acpi/dalb_acpi.c:1.10
--- src/sys/dev/acpi/dalb_acpi.c:1.9 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/dalb_acpi.c Mon Mar 8 11:39:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.10 2010/03/08 11:39:42 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger ceg...@netbsd.org
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dalb_acpi.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: dalb_acpi.c,v 1.10 2010/03/08 11:39:42 jruoho Exp $);
/*
* Direct Application Launch Button:
@@ -36,7 +36,6 @@
#include sys/param.h
#include sys/device.h
-#include sys/sysctl.h
#include sys/systm.h
#include dev/acpi/acpireg.h
@@ -50,7 +49,6 @@
struct acpi_dalb_softc {
device_t sc_dev;
struct acpi_devnode *sc_node;
- struct sysctllog *sc_log;
ACPI_INTEGER sc_usageid;
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Mon Mar 8 11:39:43 UTC 2010 Modified Files: src/sys/dev/acpi: dalb_acpi.c Log Message: Remove unused struct sysctllog from the softc. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/dalb_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Mon Mar 8 11:45:45 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_bat.c Log Message: Use the predefined ACPI_STA_BATTERY_PRESENT instead of defining a local one. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/sys/dev/acpi/acpi_bat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Mon Mar 8 11:45:45 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_bat.c
Log Message:
Use the predefined ACPI_STA_BATTERY_PRESENT instead of defining a local one.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/acpi/acpi_bat.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/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.84 src/sys/dev/acpi/acpi_bat.c:1.85
--- src/sys/dev/acpi/acpi_bat.c:1.84 Fri Mar 5 14:00:16 2010
+++ src/sys/dev/acpi/acpi_bat.c Mon Mar 8 11:45:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.84 2010/03/05 14:00:16 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.85 2010/03/08 11:45:45 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_bat.c,v 1.84 2010/03/05 14:00:16 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_bat.c,v 1.85 2010/03/08 11:45:45 jruoho Exp $);
#include sys/param.h
#include sys/condvar.h
@@ -166,19 +166,6 @@
#define ACPIBAT_ST_CRITICAL 0x0004 /* battery is critical */
/*
- * Flags for battery status from _STA return. Note that
- * this differs from the conventional evaluation of _STA:
- *
- * Unlike most other devices, when a battery is inserted or
- * removed from the system, the device itself (the battery bay)
- * is still considered to be present in the system. For most
- * systems, the _STA for this device will always return a value
- * with bits 0-3 set and will toggle bit 4 to indicate the actual
- * presence of a battery. (ACPI 3.0, sec. 10.2.1, p. 320.)
- */
-#define ACPIBAT_STA_PRESENT 0x0010 /* battery present */
-
-/*
* A value used when _BST or _BIF is teporarily unknown (see ibid.).
*/
#define ACPIBAT_VAL_UNKNOWN 0x
@@ -318,7 +305,7 @@
sc-sc_sensor[ACPIBAT_PRESENT].state = ENVSYS_SVALID;
- if ((val ACPIBAT_STA_PRESENT) == 0) {
+ if ((val ACPI_STA_BATTERY_PRESENT) == 0) {
sc-sc_sensor[ACPIBAT_PRESENT].value_cur = 0;
return 0;
}
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: cnst
Date: Mon Mar 8 11:54:35 UTC 2010
Modified Files:
src/sys/dev/acpi: atk0110.c
Log Message:
register aibs(4) with pmf(9) to quiet the latter down; reported Dieter Roelants
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/atk0110.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/acpi/atk0110.c
diff -u src/sys/dev/acpi/atk0110.c:1.9 src/sys/dev/acpi/atk0110.c:1.10
--- src/sys/dev/acpi/atk0110.c:1.9 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/atk0110.c Mon Mar 8 11:54:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atk0110.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: atk0110.c,v 1.10 2010/03/08 11:54:35 cnst Exp $ */
/* $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atk0110.c,v 1.9 2010/03/05 14:00:17 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: atk0110.c,v 1.10 2010/03/08 11:54:35 cnst Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -129,6 +129,9 @@
free(sc-sc_asens_fan, M_DEVBUF);
return;
}
+
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, could not establish power handler\n);
}
static void
@@ -264,6 +267,7 @@
{
struct aibs_softc *sc = device_private(self);
+ pmf_device_deregister(self);
sysmon_envsys_unregister(sc-sc_sme);
if (sc-sc_asens_volt != NULL)
free(sc-sc_asens_volt, M_DEVBUF);
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: cnst Date: Mon Mar 8 11:54:35 UTC 2010 Modified Files: src/sys/dev/acpi: atk0110.c Log Message: register aibs(4) with pmf(9) to quiet the latter down; reported Dieter Roelants To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/atk0110.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: pooka
Date: Mon Mar 8 12:17:45 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Log Message:
mfs miniroot is mandatory
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
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/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.24 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.25
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.24 Tue Feb 16 20:42:47 2010
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Mar 8 12:17:45 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.24 2010/02/16 20:42:47 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.25 2010/03/08 12:17:45 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -10,7 +10,7 @@
${RUMPTOP}/../miscfs/genfs ${RUMPTOP}/../miscfs/syncfs \
${RUMPTOP}/../miscfs/specfs ${RUMPTOP}/../miscfs/deadfs \
${RUMPTOP}/../compat/common ${RUMPTOP}/../uvm \
- ${RUMPTOP}/../dev
+ ${RUMPTOP}/../dev ${RUMPTOP}/../ufs/mfs
#
# Source modules, first the ones specifically implemented for librump.
@@ -48,6 +48,9 @@
SRCS+= subr_bufq.c bufq_disksort.c bufq_fcfs.c bufq_priocscan.c \
bufq_readprio.c
+# MFS miniroot support
+SRCS+= mfs_miniroot.c
+
# dev
# firmload is technically part of rumpdev, but it's pure vfs in nature.
SRCS+= firmload.c
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Mon Mar 8 12:29:01 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Added Files:
src/sys/rump/fs/lib/libmfs: Makefile shlib_version
Log Message:
support mfs
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/fs/Makefile.rumpfs
cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libmfs/Makefile \
src/sys/rump/fs/lib/libmfs/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.16 src/sys/rump/fs/Makefile.rumpfs:1.17
--- src/sys/rump/fs/Makefile.rumpfs:1.16 Fri Sep 4 17:21:34 2009
+++ src/sys/rump/fs/Makefile.rumpfs Mon Mar 8 12:29:01 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.rumpfs,v 1.16 2009/09/04 17:21:34 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.17 2010/03/08 12:29:01 pooka Exp $
#
RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs lfs msdos nfs nilfs ntfs
-RUMPFSLIST+= smbfs syspuffs sysvbfs tmpfs udf
+RUMPFSLIST+= mfs smbfs syspuffs sysvbfs tmpfs udf
.for var in ${RUMPFSLIST}
RUMPFSLIBS+=lib${var}
Added files:
Index: src/sys/rump/fs/lib/libmfs/Makefile
diff -u /dev/null src/sys/rump/fs/lib/libmfs/Makefile:1.1
--- /dev/null Mon Mar 8 12:29:01 2010
+++ src/sys/rump/fs/lib/libmfs/Makefile Mon Mar 8 12:29:01 2010
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2010/03/08 12:29:01 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../ufs/mfs
+
+LIB= rumpfs_mfs
+
+SRCS= mfs_vfsops.c mfs_vnops.c
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/fs/lib/libmfs/shlib_version
diff -u /dev/null src/sys/rump/fs/lib/libmfs/shlib_version:1.1
--- /dev/null Mon Mar 8 12:29:01 2010
+++ src/sys/rump/fs/lib/libmfs/shlib_version Mon Mar 8 12:29:01 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/03/08 12:29:01 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/fs
Module Name:src Committed By: pooka Date: Mon Mar 8 12:29:01 UTC 2010 Modified Files: src/sys/rump/fs: Makefile.rumpfs Added Files: src/sys/rump/fs/lib/libmfs: Makefile shlib_version Log Message: support mfs To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/rump/fs/Makefile.rumpfs cvs rdiff -u -r0 -r1.1 src/sys/rump/fs/lib/libmfs/Makefile \ src/sys/rump/fs/lib/libmfs/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: pooka
Date: Mon Mar 8 12:30:04 UTC 2010
Modified Files:
src/sys/rump/fs: Makefile.rumpfs
Log Message:
attempt to know my a-b-c's
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/fs/Makefile.rumpfs
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/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.17 src/sys/rump/fs/Makefile.rumpfs:1.18
--- src/sys/rump/fs/Makefile.rumpfs:1.17 Mon Mar 8 12:29:01 2010
+++ src/sys/rump/fs/Makefile.rumpfs Mon Mar 8 12:30:04 2010
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.rumpfs,v 1.17 2010/03/08 12:29:01 pooka Exp $
+# $NetBSD: Makefile.rumpfs,v 1.18 2010/03/08 12:30:04 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs lfs msdos nfs nilfs ntfs
-RUMPFSLIST+= mfs smbfs syspuffs sysvbfs tmpfs udf
+RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs lfs mfs msdos nfs nilfs ntfs
+RUMPFSLIST+= smbfs syspuffs sysvbfs tmpfs udf
.for var in ${RUMPFSLIST}
RUMPFSLIBS+=lib${var}
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Mon Mar 8 12:32:18 UTC 2010 Modified Files: src/distrib/sets/lists/base: shl.elf shl.mi src/distrib/sets/lists/comp: mi shl.mi Log Message: add rumpfs_mfs to setlists To generate a diff of this commit: cvs rdiff -u -r1.203 -r1.204 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.524 -r1.525 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1405 -r1.1406 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.203 src/distrib/sets/lists/base/shl.elf:1.204 --- src/distrib/sets/lists/base/shl.elf:1.203 Sun Feb 21 03:18:46 2010 +++ src/distrib/sets/lists/base/shl.elf Mon Mar 8 12:32:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.203 2010/02/21 03:18:46 darran Exp $ +# $NetBSD: shl.elf,v 1.204 2010/03/08 12:32:17 pooka Exp $ # # Note: Do not mark old major and major.minor shared libraries as # obsolete; just remove the entry, as third-party applications @@ -288,6 +288,8 @@ ./usr/lib/librumpfs_hfs.so.0 base-rump-shlib ./usr/lib/librumpfs_lfs.so base-rump-shlib ./usr/lib/librumpfs_lfs.so.0 base-rump-shlib +./usr/lib/librumpfs_mfs.so base-rump-shlib +./usr/lib/librumpfs_mfs.so.0 base-rump-shlib ./usr/lib/librumpfs_msdos.so base-rump-shlib ./usr/lib/librumpfs_msdos.so.0 base-rump-shlib ./usr/lib/librumpfs_nfs.so base-rump-shlib Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.524 src/distrib/sets/lists/base/shl.mi:1.525 --- src/distrib/sets/lists/base/shl.mi:1.524 Mon Mar 8 06:40:06 2010 +++ src/distrib/sets/lists/base/shl.mi Mon Mar 8 12:32:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.524 2010/03/08 06:40:06 lukem Exp $ +# $NetBSD: shl.mi,v 1.525 2010/03/08 12:32:17 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -151,6 +151,7 @@ ./usr/lib/librumpfs_ffs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_hfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_lfs.so.0.0 base-rump-shlib +./usr/lib/librumpfs_mfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_msdos.so.0.0 base-rump-shlib ./usr/lib/librumpfs_nfs.so.0.0 base-rump-shlib ./usr/lib/librumpfs_nilfs.so.0.0 base-rump-shlib Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1405 src/distrib/sets/lists/comp/mi:1.1406 --- src/distrib/sets/lists/comp/mi:1.1405 Mon Mar 8 06:40:06 2010 +++ src/distrib/sets/lists/comp/mi Mon Mar 8 12:32:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1405 2010/03/08 06:40:06 lukem Exp $ +# $NetBSD: mi,v 1.1406 2010/03/08 12:32:17 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2643,6 +2643,9 @@ ./usr/lib/librumpfs_lfs.a comp-c-lib ./usr/lib/librumpfs_lfs_g.a -unknown- debuglib ./usr/lib/librumpfs_lfs_p.a comp-c-proflib profile +./usr/lib/librumpfs_mfs.a comp-c-lib +./usr/lib/librumpfs_mfs_g.a -unknown- debuglib +./usr/lib/librumpfs_mfs_p.a comp-c-proflib profile ./usr/lib/librumpfs_msdos.a comp-c-lib ./usr/lib/librumpfs_msdos_g.a -unknown- debuglib ./usr/lib/librumpfs_msdos_p.a comp-c-proflib profile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.106 src/distrib/sets/lists/comp/shl.mi:1.107 --- src/distrib/sets/lists/comp/shl.mi:1.106 Sun Feb 21 03:18:46 2010 +++ src/distrib/sets/lists/comp/shl.mi Mon Mar 8 12:32:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.106 2010/02/21 03:18:46 darran Exp $ +# $NetBSD: shl.mi,v 1.107 2010/03/08 12:32:17 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -113,6 +113,7 @@ ./usr/lib/librumpfs_ffs_pic.a comp-c-piclib ./usr/lib/librumpfs_hfs_pic.a comp-c-piclib ./usr/lib/librumpfs_lfs_pic.a comp-c-piclib +./usr/lib/librumpfs_mfs_pic.a comp-c-piclib ./usr/lib/librumpfs_msdos_pic.a comp-c-piclib ./usr/lib/librumpfs_nfs_pic.a comp-c-piclib ./usr/lib/librumpfs_nilfs_pic.a comp-c-piclib
CVS commit: src/lib/libukfs
Module Name:src Committed By: pooka Date: Mon Mar 8 12:38:14 UTC 2010 Modified Files: src/lib/libukfs: ukfs.c Log Message: mfs is a bit off in the sense that mount(2) doesn't return since mfs uses the mounting process for the backing store memory. I guess mfs could be fixed to just reference the process vmspace and let it return, but that would probably cause wait() to return for other worms. So it's easier to dance according to mfs's tune: if mounting mfs, create a thread for extra execution context. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/lib/libukfs/ukfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libukfs
Module Name:src
Committed By: pooka
Date: Mon Mar 8 12:38:14 UTC 2010
Modified Files:
src/lib/libukfs: ukfs.c
Log Message:
mfs is a bit off in the sense that mount(2) doesn't return since
mfs uses the mounting process for the backing store memory. I
guess mfs could be fixed to just reference the process vmspace and
let it return, but that would probably cause wait() to return for
other worms. So it's easier to dance according to mfs's tune: if
mounting mfs, create a thread for extra execution context.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/lib/libukfs/ukfs.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/libukfs/ukfs.c
diff -u src/lib/libukfs/ukfs.c:1.48 src/lib/libukfs/ukfs.c:1.49
--- src/lib/libukfs/ukfs.c:1.48 Fri Mar 5 18:49:30 2010
+++ src/lib/libukfs/ukfs.c Mon Mar 8 12:38:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ukfs.c,v 1.48 2010/03/05 18:49:30 pooka Exp $ */
+/* $NetBSD: ukfs.c,v 1.49 2010/03/08 12:38:14 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -501,6 +501,30 @@
return rv;
}
+struct mountinfo {
+ const char *mi_vfsname;
+ const char *mi_mountpath;
+ int mi_mntflags;
+ void *mi_arg;
+ size_t mi_alen;
+ int *mi_error;
+};
+static void *
+mfs_mounter(void *arg)
+{
+ struct mountinfo *mi = arg;
+ int rv;
+
+ rv = rump_sys_mount(mi-mi_vfsname, mi-mi_mountpath, mi-mi_mntflags,
+ mi-mi_arg, mi-mi_alen);
+ if (rv) {
+ warn(mfs mount failed. fix me.);
+ abort(); /* XXX */
+ }
+
+ return NULL;
+}
+
static struct ukfs *
doukfsmount(const char *vfsname, const char *devpath, struct ukfs_part *part,
const char *mountpath, int mntflags, void *arg, size_t alen)
@@ -544,11 +568,50 @@
regged = 1;
}
- rv = rump_sys_mount(vfsname, mountpath, mntflags, arg, alen);
- if (rv) {
- rv = errno;
- goto out;
+ /*
+ * MFS is special since mount(2) doesn't return. Hence, we
+ * create a thread here. Could fix mfs to return, but there's
+ * too much history for me to bother.
+ */
+ if (strcmp(vfsname, MOUNT_MFS) == 0) {
+ pthread_t pt;
+ struct mountinfo mi;
+ int i;
+
+ mi.mi_vfsname = vfsname;
+ mi.mi_mountpath = mountpath;
+ mi.mi_mntflags = mntflags;
+ mi.mi_arg = arg;
+ mi.mi_alen = alen;
+
+ if (pthread_create(pt, NULL, mfs_mounter, mi) == -1) {
+ rv = errno;
+ goto out;
+ }
+
+ for (i = 0;i 10; i++) {
+ struct statvfs svfsb;
+
+ rv = rump_sys_statvfs1(mountpath, svfsb, ST_WAIT);
+ if (rv == -1) {
+rv = errno;
+goto out;
+ }
+
+ if (strcmp(svfsb.f_mntonname, mountpath) == 0
+ strcmp(svfsb.f_fstypename, MOUNT_MFS) == 0) {
+break;
+ }
+ usleep(1);
+ }
+ } else {
+ rv = rump_sys_mount(vfsname, mountpath, mntflags, arg, alen);
+ if (rv) {
+ rv = errno;
+ goto out;
+ }
}
+
mounted = 1;
rv = rump_pub_vfs_getmp(mountpath, fs-ukfs_mp);
if (rv) {
CVS commit: src/usr.sbin/puffs/rump_nqmfs
Module Name:src Committed By: pooka Date: Mon Mar 8 12:46:34 UTC 2010 Added Files: src/usr.sbin/puffs/rump_nqmfs: Makefile rump_nqmfs.c Log Message: Not Quite MFS Instead of copulating with newfs to produce a new FFS image into memory, mmap() a given existing image and pass that as the backing store. If -s is given, mmap is done with MAP_SHARED and changes are kept across mounts, else MAP_COPY (i.e. MAP_PRIVATE for us) is done and changes are lost when the server exits. Note: -s does not guarantee any kind of file system safety whatsoever and in case of kill, crash, exit or other form of elusion, everything will be, according to our theme, quite screwed. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/usr.sbin/puffs/rump_nqmfs/Makefile \ src/usr.sbin/puffs/rump_nqmfs/rump_nqmfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/puffs
Module Name:src Committed By: pooka Date: Mon Mar 8 12:48:31 UTC 2010 Modified Files: src/usr.sbin/puffs: Makefile Log Message: add commented out nqmfs To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/puffs/Makefile 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/puffs/Makefile diff -u src/usr.sbin/puffs/Makefile:1.11 src/usr.sbin/puffs/Makefile:1.12 --- src/usr.sbin/puffs/Makefile:1.11 Sat Dec 5 20:11:18 2009 +++ src/usr.sbin/puffs/Makefile Mon Mar 8 12:48:31 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2009/12/05 20:11:18 pooka Exp $ +# $NetBSD: Makefile,v 1.12 2010/03/08 12:48:31 pooka Exp $ SUBDIR= mount_9p mount_psshfs mount_sysctlfs @@ -14,4 +14,7 @@ # and is therefore not useful for the average user #SUBDIR+=rump_fdesc +# rump_mqmfs is just another ffs, useful mainly for debugging +#SUBDIR+=rump_nqmfs + .include bsd.subdir.mk
Re: CVS commit: src/external/bsd/openldap/dist/include
On Mon, Mar 08, 2010 at 05:07:16AM +, Luke Mewburn wrote: Module Name: src Committed By: lukem Date: Mon Mar 8 05:07:16 UTC 2010 Modified Files: src/external/bsd/openldap/dist/include: portable.hin Log Message: Disable HAVE_TLS here; we'll conditionally enable it in the Makefiles. Disable HAVE_FETCH; API appears to be incompatible Yes, the portable version has a different interface than the FreeBSD version as the FreeBSD code depends on funopen(3). It is easy to provide fallback code if anyone is interested. Joerg
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Mon Mar 8 14:52:29 UTC 2010 Modified Files: src/sys/arch/hppa/hppa: vm_machdep.c Log Message: Set the frame pointer of newly created and function changing LWPs to 0 for the benefit of DDB. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hppa/hppa/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/btattach
Module Name:src
Committed By: kiyohara
Date: Mon Mar 8 17:41:11 UTC 2010
Modified Files:
src/usr.sbin/btattach: btattach.c
Log Message:
Add options 'no parity'(-P) and 'disable flow control'(-F).
Also default enable parity for bcsp.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/btattach/btattach.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/btattach/btattach.c
diff -u src/usr.sbin/btattach/btattach.c:1.6 src/usr.sbin/btattach/btattach.c:1.7
--- src/usr.sbin/btattach/btattach.c:1.6 Wed Feb 17 09:49:41 2010
+++ src/usr.sbin/btattach/btattach.c Mon Mar 8 17:41:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: btattach.c,v 1.6 2010/02/17 09:49:41 plunky Exp $ */
+/* $NetBSD: btattach.c,v 1.7 2010/03/08 17:41:11 kiyohara Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -27,7 +27,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.);
-__RCSID($NetBSD: btattach.c,v 1.6 2010/02/17 09:49:41 plunky Exp $);
+__RCSID($NetBSD: btattach.c,v 1.7 2010/03/08 17:41:11 kiyohara Exp $);
#include sys/ioctl.h
#include sys/param.h
@@ -64,7 +64,7 @@
.name = bcsp,
.line = bcsp,
.descr = Generic BlueCore Serial Protocol,
- .cflag = CRTSCTS,
+ .cflag = CRTSCTS | PARENB,
.speed = B57600,
},
{
@@ -150,21 +150,26 @@
const struct devtype *type;
struct termios tio;
unsigned int init_speed, speed;
- tcflag_t cflag;
+ tcflag_t cflag, Cflag;
int fd, ch, i;
const char *name;
char *ptr;
init_speed = 0;
cflag = CLOCAL;
+ Cflag = 0;
name = btuart;
- while ((ch = getopt(argc, argv, dfi:op)) != -1) {
+ while ((ch = getopt(argc, argv, dFfi:oPp)) != -1) {
switch (ch) {
case 'd':
opt_debug++;
break;
+ case 'F':
+ Cflag |= CRTSCTS;
+ break;
+
case 'f':
cflag |= CRTSCTS;
break;
@@ -180,6 +185,10 @@
cflag |= (PARENB | PARODD);
break;
+ case 'P':
+ Cflag |= PARENB;
+ break;
+
case 'p':
cflag |= PARENB;
break;
@@ -228,6 +237,7 @@
cfmakeraw(tio);
tio.c_cflag |= (cflag | type-cflag);
+ tio.c_cflag = ~Cflag;
if (cfsetspeed(tio, init_speed) 0
|| tcsetattr(fd, TCSANOW, tio) 0
@@ -276,13 +286,15 @@
size_t i;
fprintf(stderr,
- Usage: %s [-dfop] [-i speed] [type] tty speed\n
+ Usage: %s [-dFfoPp] [-i speed] [type] tty speed\n
\n
Where:\n
\t-d debug mode (no detach, dump io)\n
+ \t-F disable flow control\n
\t-f enable flow control\n
\t-i speedinit speed\n
\t-o odd parity\n
+ \t-P no parity\n
\t-p even parity\n
\n
Known types:\n
CVS commit: src/usr.sbin/btattach
Module Name:src Committed By: kiyohara Date: Mon Mar 8 17:41:11 UTC 2010 Modified Files: src/usr.sbin/btattach: btattach.c Log Message: Add options 'no parity'(-P) and 'disable flow control'(-F). Also default enable parity for bcsp. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/btattach/btattach.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/btattach
Module Name:src Committed By: kiyohara Date: Mon Mar 8 17:59:52 UTC 2010 Modified Files: src/usr.sbin/btattach: btattach.c Log Message: Add option 'test mode'(-t). Can test your Bluetooth module via com-port. This mode guess speed for bcsp(4) or btuart(4), if not respond. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/btattach/btattach.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys
On Sun, Mar 07, 2010 at 03:11:35PM +0200, Antti Kantee wrote: What, specifically, is the problem with the netbsd.o approach? (changing the default link that way would be good step, especially for people wanting an easy-to-grow-at-home-from-sets MONOLITHIC) Someone actually trying it ... David -- David Laight: da...@l8s.co.uk
CVS commit: src/usr.sbin/btattach
Module Name:src
Committed By: plunky
Date: Mon Mar 8 21:19:29 UTC 2010
Modified Files:
src/usr.sbin/btattach: btattach.c
Log Message:
fix compilation errors
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/btattach/btattach.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/btattach/btattach.c
diff -u src/usr.sbin/btattach/btattach.c:1.8 src/usr.sbin/btattach/btattach.c:1.9
--- src/usr.sbin/btattach/btattach.c:1.8 Mon Mar 8 17:59:52 2010
+++ src/usr.sbin/btattach/btattach.c Mon Mar 8 21:19:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: btattach.c,v 1.8 2010/03/08 17:59:52 kiyohara Exp $ */
+/* $NetBSD: btattach.c,v 1.9 2010/03/08 21:19:29 plunky Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -27,7 +27,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.);
-__RCSID($NetBSD: btattach.c,v 1.8 2010/03/08 17:59:52 kiyohara Exp $);
+__RCSID($NetBSD: btattach.c,v 1.9 2010/03/08 21:19:29 plunky Exp $);
#include sys/ioctl.h
#include sys/param.h
@@ -522,7 +522,9 @@
test(const char *tty, tcflag_t cflag, tcflag_t Cflag)
{
struct termios tio;
- int fd, guessed, i, j, k, n;
+ int fd, guessed;
+ size_t i, j, k;
+ ssize_t n;
unsigned char buf[32];
const int bauds[] = {
57600, /* BCSP specific default */
@@ -573,11 +575,12 @@
for (i = 0; i __arraycount(bauds); i++) {
if (cfsetspeed(tio, bauds[i]) 0
|| tcsetattr(fd, TCSANOW, tio) 0
- || tcflush(fd, TCIOFLUSH) 0)
+ || tcflush(fd, TCIOFLUSH) 0) {
if (bauds[i] 115200)
continue;
else
err(EXIT_FAILURE, tty setup failed);
+ }
if (opt_debug)
printf( try with B%d\n, bauds[i]);
@@ -600,7 +603,7 @@
err(EXIT_FAILURE, read);
} else {
- if (n sizeof(bcsp_lepkt))
+ if ((size_t)n sizeof(bcsp_lepkt))
continue;
for (j = 0; j n - sizeof(bcsp_lepkt); j++) {
for (k = 0; k sizeof(bcsp_lepkt); k++)
CVS commit: src/usr.sbin/btattach
Module Name:src Committed By: plunky Date: Mon Mar 8 21:48:42 UTC 2010 Modified Files: src/usr.sbin/btattach: btattach.c Log Message: use %zd for ssize_t argument To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/btattach/btattach.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/btattach
Module Name:src
Committed By: plunky
Date: Mon Mar 8 21:48:42 UTC 2010
Modified Files:
src/usr.sbin/btattach: btattach.c
Log Message:
use %zd for ssize_t argument
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/btattach/btattach.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/btattach/btattach.c
diff -u src/usr.sbin/btattach/btattach.c:1.9 src/usr.sbin/btattach/btattach.c:1.10
--- src/usr.sbin/btattach/btattach.c:1.9 Mon Mar 8 21:19:29 2010
+++ src/usr.sbin/btattach/btattach.c Mon Mar 8 21:48:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: btattach.c,v 1.9 2010/03/08 21:19:29 plunky Exp $ */
+/* $NetBSD: btattach.c,v 1.10 2010/03/08 21:48:42 plunky Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -27,7 +27,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.);
-__RCSID($NetBSD: btattach.c,v 1.9 2010/03/08 21:19:29 plunky Exp $);
+__RCSID($NetBSD: btattach.c,v 1.10 2010/03/08 21:48:42 plunky Exp $);
#include sys/ioctl.h
#include sys/param.h
@@ -589,7 +589,7 @@
n = read(fd, buf, sizeof(buf));
if (opt_debug 1)
- printf( %dbyte read\n, n);
+ printf( %zd bytes read\n, n);
if (n 0) {
if (i == 0 errno == EAGAIN) {
printf(This module is *maybe* supported by btuart(4).\n
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: hubertf Date: Mon Mar 8 22:51:52 UTC 2010 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add etherip(4), commented out To generate a diff of this commit: cvs rdiff -u -r1.973 -r1.974 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: hubertf Date: Mon Mar 8 22:51:52 UTC 2010 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add etherip(4), commented out To generate a diff of this commit: cvs rdiff -u -r1.973 -r1.974 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.973 src/sys/arch/i386/conf/GENERIC:1.974 --- src/sys/arch/i386/conf/GENERIC:1.973 Sat Mar 6 21:12:04 2010 +++ src/sys/arch/i386/conf/GENERIC Mon Mar 8 22:51:52 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.973 2010/03/06 21:12:04 plunky Exp $ +# $NetBSD: GENERIC,v 1.974 2010/03/08 22:51:52 hubertf Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.973 $ +#ident GENERIC-$Revision: 1.974 $ maxusers 64 # estimated number of users @@ -1534,6 +1534,7 @@ pseudo-device agr # IEEE 802.3ad link aggregation #pseudo-device pf # PF packet filter #pseudo-device pflog # PF log if +#pseudo-device etherip # Tunnel Ethernet over IP # srt is EXPERIMENTAL #pseudo-device srt # source-address-based routing
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/rmixl
Module Name:src Committed By: matt Date: Tue Mar 9 02:02:53 UTC 2010 Modified Files: src/sys/arch/evbmips/rmixl [matt-nb5-mips64]: machdep.c Log Message: Use dmfc0 k0,cop0_osscratch if _LP64 To generate a diff of this commit: cvs rdiff -u -r1.1.2.22 -r1.1.2.23 src/sys/arch/evbmips/rmixl/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/rmixl/machdep.c diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.22 src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.23 --- src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.22 Sat Feb 27 21:26:28 2010 +++ src/sys/arch/evbmips/rmixl/machdep.c Tue Mar 9 02:02:53 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.1.2.22 2010/02/27 21:26:28 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.1.2.23 2010/03/09 02:02:53 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -112,7 +112,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1.2.22 2010/02/27 21:26:28 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1.2.23 2010/03/09 02:02:53 matt Exp $); #include opt_ddb.h #include opt_com.h @@ -469,8 +469,11 @@ * relative from the start of struct cpu_info. */ - /* [0] = mfc0 rX, $22 (OSScratch) */ + /* [0] = [d]mfc0 rX, $22 (OSScratch) */ new_insns[0] = (020 26) +#ifdef _LP64 + | (1 21) /* double move */ +#endif | (new_insns[0] 0x001f) | (MIPS_COP_0_OSSCRATCH 11) | (0 0);
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/rmixl
Module Name:src Committed By: matt Date: Tue Mar 9 02:04:46 UTC 2010 Modified Files: src/sys/arch/evbmips/rmixl [matt-nb5-mips64]: machdep.c Log Message: Use dmtc0 too. To generate a diff of this commit: cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/sys/arch/evbmips/rmixl/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/rmixl/machdep.c diff -u src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.23 src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.24 --- src/sys/arch/evbmips/rmixl/machdep.c:1.1.2.23 Tue Mar 9 02:02:53 2010 +++ src/sys/arch/evbmips/rmixl/machdep.c Tue Mar 9 02:04:46 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.1.2.23 2010/03/09 02:02:53 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.1.2.24 2010/03/09 02:04:46 matt Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -112,7 +112,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1.2.23 2010/03/09 02:02:53 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.1.2.24 2010/03/09 02:04:46 matt Exp $); #include opt_ddb.h #include opt_com.h @@ -448,7 +448,7 @@ /* * Fix up the exception vector to use COP0 OSSCRATCH0 */ - __asm __volatile(mtc0 %0,$%1 + __asm __volatile(dmtc0 %0,$%1 :: r(cpu_info_store), n(MIPS_COP_0_OSSCRATCH)); mips_fixup_exceptions(rmixl_fixup_cop0_oscratch); #endif
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src
Committed By: snj
Date: Tue Mar 9 03:45:43 UTC 2010
Modified Files:
src/sys/dev/usb [netbsd-5]: umass.c usbdevs
Log Message:
Pull up following revision(s) (requested by is/martin):
sys/dev/usb/usbdevs: revision 1.535
sys/dev/usb/umass.c: revision 1.137
Add SuperTop and SuperTop IDE Bridge to usbdevs.
--
Max out the expected response size at the actual transfer length.
Fixes PR kern/42225.
To generate a diff of this commit:
cvs rdiff -u -r1.129.4.1 -r1.129.4.2 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.519.4.4 -r1.519.4.5 src/sys/dev/usb/usbdevs
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/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.129.4.1 src/sys/dev/usb/umass.c:1.129.4.2
--- src/sys/dev/usb/umass.c:1.129.4.1 Sat Dec 13 21:44:42 2008
+++ src/sys/dev/usb/umass.c Tue Mar 9 03:45:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.129.4.1 2008/12/13 21:44:42 bouyer Exp $ */
+/* $NetBSD: umass.c,v 1.129.4.2 2010/03/09 03:45:43 snj Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.129.4.1 2008/12/13 21:44:42 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.129.4.2 2010/03/09 03:45:43 snj Exp $);
#include atapibus.h
#include scsibus.h
@@ -996,6 +996,7 @@
{
struct umass_softc *sc = (struct umass_softc *) priv;
usbd_xfer_handle next_xfer;
+ int residue;
KASSERT(sc-sc_wire UMASS_WPROTO_BBB,
(sc-sc_wire == 0x%02x wrong for umass_bbb_state\n,
@@ -1168,6 +1169,10 @@
DIF(UDMASS_BBB, umass_bbb_dump_csw(sc, sc-csw));
+ residue = UGETDW(sc-csw.dCSWDataResidue);
+ if (residue sc-transfer_datalen - sc-transfer_actlen)
+ residue = sc-transfer_datalen - sc-transfer_actlen;
+
/* Translate weird command-status signatures. */
if ((sc-sc_quirks UMASS_QUIRK_WRONG_CSWSIG)
UGETDW(sc-csw.dCSWSignature) == CSWSIGNATURE_OLYMPUS_C1)
@@ -1210,8 +1215,7 @@
return;
} else if (sc-csw.bCSWStatus == CSWSTATUS_PHASE) {
printf(%s: Phase Error, residue = %d\n,
-USBDEVNAME(sc-sc_dev),
-UGETDW(sc-csw.dCSWDataResidue));
+USBDEVNAME(sc-sc_dev), residue);
umass_bbb_reset(sc, STATUS_WIRE_FAILED);
return;
@@ -1223,32 +1227,29 @@
sc-transfer_actlen, sc-transfer_datalen);
#if 0
} else if (sc-transfer_datalen - sc-transfer_actlen
- != UGETDW(sc-csw.dCSWDataResidue)) {
+ != residue) {
DPRINTF(UDMASS_BBB, (%s: actlen=%d != residue=%d\n,
USBDEVNAME(sc-sc_dev),
sc-transfer_datalen - sc-transfer_actlen,
-UGETDW(sc-csw.dCSWDataResidue)));
+residue));
umass_bbb_reset(sc, STATUS_WIRE_FAILED);
return;
#endif
} else if (sc-csw.bCSWStatus == CSWSTATUS_FAILED) {
DPRINTF(UDMASS_BBB, (%s: Command Failed, res = %d\n,
-USBDEVNAME(sc-sc_dev),
-UGETDW(sc-csw.dCSWDataResidue)));
+USBDEVNAME(sc-sc_dev), residue));
/* SCSI command failed but transfer was succesful */
sc-transfer_state = TSTATE_IDLE;
- sc-transfer_cb(sc, sc-transfer_priv,
- UGETDW(sc-csw.dCSWDataResidue),
+ sc-transfer_cb(sc, sc-transfer_priv, residue,
STATUS_CMD_FAILED);
return;
} else { /* success */
sc-transfer_state = TSTATE_IDLE;
- sc-transfer_cb(sc, sc-transfer_priv,
- UGETDW(sc-csw.dCSWDataResidue),
+ sc-transfer_cb(sc, sc-transfer_priv, residue,
STATUS_CMD_OK);
return;
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.519.4.4 src/sys/dev/usb/usbdevs:1.519.4.5
--- src/sys/dev/usb/usbdevs:1.519.4.4 Sat Jan 16 17:47:12 2010
+++ src/sys/dev/usb/usbdevs Tue Mar 9 03:45:43 2010
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.519.4.4 2010/01/16 17:47:12 bouyer Exp $
+$NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -454,6 +454,7 @@
vendor RALINK 0x1485 Ralink Technology
vendor RALINK_2 0x148f Ralink Technology
vendor CONCEPTRONIC 0x14b2 Conceptronic
+vendor SUPERTOP 0x14cd SuperTop
vendor PLANEX3 0x14ea Planex Communications
vendor SILICONPORTALS 0x1527 Silicon Portals
vendor OQO 0x1557 OQO
@@ -2194,6 +2195,9 @@
/* XXX The above is a North American PC style keyboard possibly */
product SUN MOUSE 0x0100 Type 6 USB mouse
+/* SuperTop products */
+product SUPERTOP IDEBRIDGE 0x6600 SuperTop IDE Bridge
+
/* Supra products */
product DIAMOND2 SUPRAEXPRESS56K 0x07da Supra Express 56K modem
product DIAMOND2 SUPRA2890 0x0b4a SupraMax 2890 56K Modem
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src Committed By: snj Date: Tue Mar 9 03:45:43 UTC 2010 Modified Files: src/sys/dev/usb [netbsd-5]: umass.c usbdevs Log Message: Pull up following revision(s) (requested by is/martin): sys/dev/usb/usbdevs: revision 1.535 sys/dev/usb/umass.c: revision 1.137 Add SuperTop and SuperTop IDE Bridge to usbdevs. -- Max out the expected response size at the actual transfer length. Fixes PR kern/42225. To generate a diff of this commit: cvs rdiff -u -r1.129.4.1 -r1.129.4.2 src/sys/dev/usb/umass.c cvs rdiff -u -r1.519.4.4 -r1.519.4.5 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/dev/usb
Module Name:src
Committed By: snj
Date: Tue Mar 9 03:46:24 UTC 2010
Modified Files:
src/sys/dev/usb [netbsd-5]: usbdevs.h usbdevs_data.h
Log Message:
Regen for ticket 1123.
To generate a diff of this commit:
cvs rdiff -u -r1.515.4.4 -r1.515.4.5 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.516.4.4 -r1.516.4.5 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.515.4.4 src/sys/dev/usb/usbdevs.h:1.515.4.5
--- src/sys/dev/usb/usbdevs.h:1.515.4.4 Sat Jan 16 17:50:13 2010
+++ src/sys/dev/usb/usbdevs.h Tue Mar 9 03:46:24 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.515.4.4 2010/01/16 17:50:13 bouyer Exp $ */
+/* $NetBSD: usbdevs.h,v 1.515.4.5 2010/03/09 03:46:24 snj Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp
*/
/*
@@ -461,6 +461,7 @@
#define USB_VENDOR_RALINK 0x1485 /* Ralink Technology */
#define USB_VENDOR_RALINK_2 0x148f /* Ralink Technology */
#define USB_VENDOR_CONCEPTRONIC 0x14b2 /* Conceptronic */
+#define USB_VENDOR_SUPERTOP 0x14cd /* SuperTop */
#define USB_VENDOR_PLANEX3 0x14ea /* Planex Communications */
#define USB_VENDOR_SILICONPORTALS 0x1527 /* Silicon Portals */
#define USB_VENDOR_OQO 0x1557 /* OQO */
@@ -2201,6 +2202,9 @@
/* XXX The above is a North American PC style keyboard possibly */
#define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 USB mouse */
+/* SuperTop products */
+#define USB_PRODUCT_SUPERTOP_IDEBRIDGE 0x6600 /* SuperTop IDE Bridge */
+
/* Supra products */
#define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */
#define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K Modem */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.516.4.4 src/sys/dev/usb/usbdevs_data.h:1.516.4.5
--- src/sys/dev/usb/usbdevs_data.h:1.516.4.4 Sat Jan 16 17:50:13 2010
+++ src/sys/dev/usb/usbdevs_data.h Tue Mar 9 03:46:24 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.516.4.4 2010/01/16 17:50:13 bouyer Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.516.4.5 2010/03/09 03:46:24 snj Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD
+ * NetBSD: usbdevs,v 1.519.4.5 2010/03/09 03:45:43 snj Exp
*/
/*
@@ -1639,6 +1639,10 @@
Conceptronic,
},
{
+ USB_VENDOR_SUPERTOP,
+ SuperTop,
+ },
+ {
USB_VENDOR_PLANEX3,
Planex Communications,
},
@@ -1855,7 +1859,7 @@
GNU Radio USRP,
},
};
-const int usb_nvendors = 454;
+const int usb_nvendors = 455;
const struct usb_product usb_products[] = {
{
@@ -6359,6 +6363,10 @@
Type 6 USB mouse,
},
{
+ USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDEBRIDGE,
+ SuperTop IDE Bridge,
+ },
+ {
USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K,
Supra Express 56K modem,
},
@@ -6835,4 +6843,4 @@
Prestige,
},
};
-const int usb_nproducts = 1244;
+const int usb_nproducts = 1245;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Tue Mar 9 04:11:20 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1123, 1329, 1332. To generate a diff of this commit: cvs rdiff -u -r1.1.2.211 -r1.1.2.212 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Tue Mar 9 04:11:20 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 1123, 1329, 1332. To generate a diff of this commit: cvs rdiff -u -r1.1.2.211 -r1.1.2.212 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.211 src/doc/CHANGES-5.1:1.1.2.212 --- src/doc/CHANGES-5.1:1.1.2.211 Sun Mar 7 08:59:31 2010 +++ src/doc/CHANGES-5.1 Tue Mar 9 04:11:19 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.211 2010/03/07 08:59:31 sborrill Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.212 2010/03/09 04:11:19 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -16890,3 +16890,30 @@ Should fix PR#42881. [joerg, ticket #1320] +sys/dev/usb/umass.c1.137 via patch +sys/dev/usb/usbdevs1.535 via patch +sys/dev/usb/usbdevs.hregen +sys/dev/usb/usbdevs_data.h regen + + Add SuperTop and SuperTop IDE Bridge to usbdevs. + -- + Max out the expected response size at the actual transfer length. + Fixes PR kern/42225. + [is/martin, ticket #1123] + +external/ibm-public/postfix/sbin/postconf/Makefile 1.2 + + Add nint_table.h and nint_vars.h to generated list files so that + they get removed during cleandir. + [veego, ticket #1329] + +sys/dev/usb/ugen.c1.109 + + Replace USB_GET_SC() instances with USB_GET_SC_OPEN(). The latter + is exactly like the former, except it returns with ENXIO if sc is + NULL instead of continuing on to use it. Most of the time this is + handled by the fd layer and you get EBADF, but sometimes it's + possible to race into the device method for whatever reason and + you get a kernel panic. + [pooka, ticket #1332] +
