CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Fri Jul 20 07:31:15 UTC 2012
Modified Files:
src/sys/dev/usb: usb.c
Log Message:
usb task fixes, from jared and myself:
- create the task/event threads in usb_attach() so they're more likely
to be ready when usb_doattach() runs
- move the task thread creation into usb_once_init(), instead of having
some other method of only creating them once
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/dev/usb/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/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.133 src/sys/dev/usb/usb.c:1.134
--- src/sys/dev/usb/usb.c:1.133 Fri Jul 20 02:23:35 2012
+++ src/sys/dev/usb/usb.c Fri Jul 20 07:31:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.133 2012/07/20 02:23:35 christos Exp $ */
+/* $NetBSD: usb.c,v 1.134 2012/07/20 07:31:14 mrg Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.133 2012/07/20 02:23:35 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.134 2012/07/20 07:31:14 mrg Exp $);
#include opt_compat_netbsd.h
#include opt_usb.h
@@ -104,7 +104,6 @@ struct usb_taskq {
kcondvar_t cv;
struct lwp *task_thread_lwp;
const char *name;
- int taskcreated; /* task thread exists. */
};
static struct usb_taskq usb_taskq[USB_NUM_TASKQS];
@@ -167,6 +166,8 @@ CFATTACH_DECL3_NEW(usb, sizeof(struct us
usb_match, usb_attach, usb_detach, usb_activate, NULL, usb_childdet,
DVF_DETACH_SHUTDOWN);
+static const char *taskq_names[] = USB_TASKQ_NAMES;
+
int
usb_match(device_t parent, cfdata_t match, void *aux)
{
@@ -179,9 +180,11 @@ usb_attach(device_t parent, device_t sel
{
static ONCE_DECL(init_control);
struct usb_softc *sc = device_private(self);
+ bool mpsafe;
int usbrev;
sc-sc_bus = aux;
+ mpsafe = sc-sc_bus-methods-get_lock ? true : false;
usbrev = sc-sc_bus-usbrev;
aprint_naive(\n);
@@ -198,6 +201,12 @@ usb_attach(device_t parent, device_t sel
}
aprint_normal(\n);
+ if (mpsafe)
+ sc-sc_bus-methods-get_lock(sc-sc_bus, sc-sc_bus-lock);
+ else
+ sc-sc_bus-lock = NULL;
+ usb_create_event_thread(self);
+
RUN_ONCE(init_control, usb_once_init);
config_interrupts(self, usb_doattach);
}
@@ -205,10 +214,31 @@ usb_attach(device_t parent, device_t sel
static int
usb_once_init(void)
{
+ struct usb_taskq *taskq;
+ int i;
selinit(usb_selevent);
mutex_init(usb_event_lock, MUTEX_DEFAULT, IPL_NONE);
cv_init(usb_event_cv, usbrea);
+
+ for (i = 0; i USB_NUM_TASKQS; i++) {
+ taskq = usb_taskq[i];
+
+ TAILQ_INIT(taskq-tasks);
+ mutex_init(taskq-lock, MUTEX_DEFAULT, IPL_NONE);
+ cv_init(taskq-cv, usbtsk);
+ taskq-name = taskq_names[i];
+ if (kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL,
+ usb_task_thread, taskq, taskq-task_thread_lwp,
+ %s, taskq-name)) {
+ printf(unable to create task thread: %s\n, taskq-name);
+ panic(usb_create_event_thread task);
+ }
+ /*
+ * XXX we should make sure these threads are alive before
+ * end up using them in usb_doattach().
+ */
+ }
return 0;
}
@@ -220,7 +250,7 @@ usb_doattach(device_t self)
usbd_status err;
int speed;
struct usb_event *ue;
- bool mpsafe = sc-sc_bus-methods-get_lock ? true : false;
+ const bool mpsafe = sc-sc_bus-methods-get_lock ? true : false;
DPRINTF((usbd_doattach\n));
@@ -239,11 +269,6 @@ usb_doattach(device_t self)
panic(usb_doattach);
}
- if (mpsafe) {
- sc-sc_bus-methods-get_lock(sc-sc_bus, sc-sc_bus-lock);
- } else {
- sc-sc_bus-lock = NULL;
- }
cv_init(sc-sc_bus-needs_explore_cv, usbevt);
ue = usb_alloc_event();
@@ -288,7 +313,6 @@ usb_doattach(device_t self)
}
config_pending_incr();
- usb_create_event_thread(self);
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, couldn't establish power handler\n);
@@ -299,14 +323,10 @@ usb_doattach(device_t self)
return;
}
-static const char *taskq_names[] = USB_TASKQ_NAMES;
-
void
usb_create_event_thread(device_t self)
{
struct usb_softc *sc = device_private(self);
- struct usb_taskq *taskq;
- int i;
if (kthread_create(PRI_NONE,
sc-sc_bus-lock ? KTHREAD_MPSAFE : 0, NULL,
@@ -316,24 +336,6 @@ usb_create_event_thread(device_t self)
device_xname(self));
panic(usb_create_event_thread);
}
- for (i = 0; i USB_NUM_TASKQS; i++) {
- taskq = usb_taskq[i];
-
- if (taskq-taskcreated)
- continue;
-
- TAILQ_INIT(taskq-tasks);
- mutex_init(taskq-lock, MUTEX_DEFAULT, IPL_NONE);
- cv_init(taskq-cv, usbtsk);
- taskq-taskcreated = 1;
- taskq-name = taskq_names[i];
- if (kthread_create(PRI_NONE, KTHREAD_MPSAFE, NULL,
- usb_task_thread, taskq, taskq-task_thread_lwp,
- %s, taskq-name)) {
- printf(unable to create task thread: %s\n, taskq-name);
- panic(usb_create_event_thread task);
- }
- }
}
/*
CVS commit: src/share/man/man9
Module Name:src Committed By: mrg Date: Fri Jul 20 07:55:44 UTC 2012 Modified Files: src/share/man/man9: usbdi.9 Log Message: - remove some comments about only being relevant for usbmp. - add documentation for usb_rem_task(), and clean up the task doc in general. be clear about SMP issues for tasks - bump date To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man9/usbdi.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/usbdi.9 diff -u src/share/man/man9/usbdi.9:1.23 src/share/man/man9/usbdi.9:1.24 --- src/share/man/man9/usbdi.9:1.23 Sun Jun 10 06:40:08 2012 +++ src/share/man/man9/usbdi.9 Fri Jul 20 07:55:44 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: usbdi.9,v 1.23 2012/06/10 06:40:08 mrg Exp $ +.\ $NetBSD: usbdi.9,v 1.24 2012/07/20 07:55:44 mrg Exp $ .\ .\ Copyright (c) 2012 Matthew R. Green .\ All rights reserved. @@ -54,7 +54,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 2, 2012 +.Dd July 20, 2012 .Dt USBDI 9 .Os .Sh NAME @@ -642,7 +642,6 @@ with the and .Dv USBD_SYNCHRONOUS_SIG flags set. -This function is only available with the USB SMP code. .Pp Transfers are aborted via this pipe with .Fn usbd_abort_pipe @@ -900,8 +899,6 @@ and that is being waited on with .Fn usb_detach_wait . .Pp -These functions are only available with the USB SMP code. -.Pp The are another pair of functions with similar functionality that do not use a condition variable or mutex and should be avoided in new code. The @@ -917,7 +914,9 @@ function works like The USB stack provides a task management framework to execute tasks in a thread context at the soonest opportunity. Typically this is used by network drivers to handle periodic updates -or status change requests. +or status change requests, or other operations that need to run in +a normal context. +.Pp The .Fn usb_init_task function takes a pointer to a @@ -927,18 +926,33 @@ that will be initalised, a function to c and the argument to pass to .Fa func , .Fa arg . -To schedule the task to be run the +.Pp +To invoke the task callback the .Fn usb_add_task function should be called with the .Fa iface -associated with this device, the task queue to invoke +associated with this device, the task structure .Fa task , and the .Fa queue to run against, either .Dv USB_TASKQ_HC -or -.Dv USB_TASKQ_DRIVER . +for operations initiated by host controllers or +.Dv USB_TASKQ_DRIVER +for operations initiated by USB drivers. +.Pp +To deschedule a potentially running task the +.Fn usb_rem_task +function should be called. +.Pp +The driver using these facilities is expected to provide the +necessary serialisation between +.Fn usb_init_task , +.Fn usb_add_task +and +.Fn usb_rem_task +for each specific +.Ft struct usb_task . .Sh SEE ALSO .Xr usb 4 , .Xr usbd_status 9
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Fri Jul 20 09:02:48 UTC 2012
Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh
Log Message:
add some network-related compat defs
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/include/rump/makerumpdefs.sh
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/include/rump/makerumpdefs.sh
diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.6 src/sys/rump/include/rump/makerumpdefs.sh:1.7
--- src/sys/rump/include/rump/makerumpdefs.sh:1.6 Fri Jul 2 10:44:26 2010
+++ src/sys/rump/include/rump/makerumpdefs.sh Fri Jul 20 09:02:48 2012
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
rm -f rumpdefs.h
exec rumpdefs.h
-printf '/* $NetBSD: makerumpdefs.sh,v 1.6 2010/07/02 10:44:26 hannken Exp $ */\n\n'
+printf '/* $NetBSD: makerumpdefs.sh,v 1.7 2012/07/20 09:02:48 pooka Exp $ */\n\n'
printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n'
printf '#ifndef _RUMP_RUMPDEFS_H_\n'
printf '#define _RUMP_RUMPDEFS_H_\n\n'
@@ -19,6 +19,22 @@ fromvers () {
sed -n '1{s/\$//gp;q;}' $1
}
+# Odds of sockaddr_in changing are zero, so no acrobatics needed. Alas,
+# dealing with in_addr_t for s_addr is very difficult, so have it as
+# an incompatible uint32_t for now.
+echo
+cat EOF
+struct rump_sockaddr_in {
+ uint8_t sin_len;
+ uint8_t sin_family;
+ uint16_t sin_port;
+ struct {
+ uint32_t s_addr;
+ } sin_addr;
+ int8_t sin_zero[8];
+};
+EOF
+
fromvers ../../../sys/fcntl.h
sed -n '/#define O_[A-Z]* *0x/s/O_/RUMP_O_/gp' \
../../../sys/fcntl.h
@@ -41,4 +57,14 @@ sed -n '/#define.*RB_[A-Z]/s/RB_/RUMP_RB
sed -n '/#define.*AB_[A-Z]/s/AB_/RUMP_AB_/gp' ../../../sys/reboot.h \
| sed 's,/\*.*$,,'
+fromvers ../../../sys/socket.h
+sed -n '/#define[ ]*SOCK_[A-Z]/s/SOCK_/RUMP_SOCK_/gp' ../../../sys/socket.h \
+| sed 's,/\*.*$,,'
+sed -n '/#define[ ]*[AP]F_[A-Z]/s/[AP]F_/RUMP_/gp' ../../../sys/socket.h \
+| sed 's,/\*.*$,,'
+sed -n '/#define[ ]*SO_[A-Z]/s/SO_/RUMP_/gp' ../../../sys/socket.h \
+| sed 's,/\*.*$,,'
+sed -n '/#define[ ]*SOL_[A-Z]/s/SOL_/RUMP_/gp' ../../../sys/socket.h \
+| sed 's,/\*.*$,,'
+
printf '\n#endif /* _RUMP_RUMPDEFS_H_ */\n'
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Fri Jul 20 09:03:09 UTC 2012
Modified Files:
src/sys/rump/include/rump: rumpdefs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/include/rump/rumpdefs.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/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.10 src/sys/rump/include/rump/rumpdefs.h:1.11
--- src/sys/rump/include/rump/rumpdefs.h:1.10 Tue Feb 1 21:21:34 2011
+++ src/sys/rump/include/rump/rumpdefs.h Fri Jul 20 09:03:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.10 2011/02/01 21:21:34 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.11 2012/07/20 09:03:09 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -9,7 +9,17 @@
#include rump/rump_namei.h
-/* NetBSD: fcntl.h,v 1.36 2010/09/21 19:26:18 chs Exp */
+struct rump_sockaddr_in {
+ uint8_t sin_len;
+ uint8_t sin_family;
+ uint16_t sin_port;
+ struct {
+ uint32_t s_addr;
+ } sin_addr;
+ int8_t sin_zero[8];
+};
+
+/* NetBSD: fcntl.h,v 1.42 2012/01/25 00:28:35 christos Exp */
#define RUMP_O_RDONLY 0x /* open for reading only */
#define RUMP_O_WRONLY 0x0001 /* open for writing only */
#define RUMP_O_RDWR 0x0002 /* open for reading and writing */
@@ -29,8 +39,11 @@
#define RUMP_O_RSYNC 0x0002 /* read: I/O completion as for write */
#define RUMP_O_DIRECT 0x0008 /* direct I/O hint */
#define RUMP_O_DIRECTORY 0x0020 /* fail if not a directory */
+#define RUMP_O_CLOEXEC 0x0040 /* set close on exec */
+#define RUMP_O_SEARCH 0x0080 /* skip search permission checks */
+#define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */
-/* NetBSD: vnode.h,v 1.223 2010/07/28 11:03:47 hannken Exp */
+/* NetBSD: vnode.h,v 1.236 2011/11/24 15:51:30 ahoka Exp */
#ifndef __VTYPE_DEFINED
#define __VTYPE_DEFINED
enum vtype { VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD };
@@ -70,4 +83,110 @@ enum vtype { VNON, VREG, VDIR, VBLK, VCH
#define RUMP_AB_SILENT 0x0004
#define RUMP_AB_DEBUG 0x0008
+/* NetBSD: socket.h,v 1.107 2012/06/22 18:26:35 christos Exp */
+#define RUMP_SOCK_STREAM 1
+#define RUMP_SOCK_DGRAM 2
+#define RUMP_SOCK_RAW 3
+#define RUMP_SOCK_RDM 4
+#define RUMP_SOCK_SEQPACKET 5
+#define RUMP_SOCK_CLOEXEC 0x1000
+#define RUMP_SOCK_NONBLOCK 0x2000
+#define RUMP_SOCK_NOSIGPIPE 0x4000
+#define RUMP_SOCK_FLAGS_MASK 0xf000
+#define RUMP_AF_UNSPEC 0
+#define RUMP_AF_LOCAL 1
+#define RUMP_AF_UNIX RUMP_AF_LOCAL
+#define RUMP_AF_INET 2
+#define RUMP_AF_IMPLINK 3
+#define RUMP_AF_PUP 4
+#define RUMP_AF_CHAOS 5
+#define RUMP_AF_NS 6
+#define RUMP_AF_ISO 7
+#define RUMP_AF_OSI RUMP_AF_ISO
+#define RUMP_AF_ECMA 8
+#define RUMP_AF_DATAKIT 9
+#define RUMP_AF_CCITT 10
+#define RUMP_AF_SNA 11
+#define RUMP_AF_DECnet 12
+#define RUMP_AF_DLI 13
+#define RUMP_AF_LAT 14
+#define RUMP_AF_HYLINK 15
+#define RUMP_AF_APPLETALK 16
+#define RUMP_AF_OROUTE 17
+#define RUMP_AF_LINK 18
+#define RUMP_AF_COIP 20
+#define RUMP_AF_CNT 21
+#define RUMP_AF_IPX 23
+#define RUMP_AF_INET6 24
+#define RUMP_AF_ISDN 26
+#define RUMP_AF_E164 RUMP_AF_ISDN
+#define RUMP_AF_NATM 27
+#define RUMP_AF_ARP 28
+#define RUMP_AF_BLUETOOTH 31
+#define RUMP_AF_IEEE80211 32
+#define RUMP_AF_MPLS 33
+#define RUMP_AF_ROUTE 34
+#define RUMP_AF_MAX 35
+#define RUMP_PF_UNSPEC RUMP_AF_UNSPEC
+#define RUMP_PF_LOCAL RUMP_AF_LOCAL
+#define RUMP_PF_UNIX RUMP_PF_LOCAL
+#define RUMP_PF_INET RUMP_AF_INET
+#define RUMP_PF_IMPLINK RUMP_AF_IMPLINK
+#define RUMP_PF_PUP RUMP_AF_PUP
+#define RUMP_PF_CHAOS RUMP_AF_CHAOS
+#define RUMP_PF_NS RUMP_AF_NS
+#define RUMP_PF_ISO RUMP_AF_ISO
+#define RUMP_PF_OSI RUMP_AF_ISO
+#define RUMP_PF_ECMA RUMP_AF_ECMA
+#define RUMP_PF_DATAKIT RUMP_AF_DATAKIT
+#define RUMP_PF_CCITT RUMP_AF_CCITT
+#define RUMP_PF_SNA RUMP_AF_SNA
+#define RUMP_PF_DECnet RUMP_AF_DECnet
+#define RUMP_PF_DLI RUMP_AF_DLI
+#define RUMP_PF_LAT RUMP_AF_LAT
+#define RUMP_PF_HYLINK RUMP_AF_HYLINK
+#define RUMP_PF_APPLETALK RUMP_AF_APPLETALK
+#define RUMP_PF_OROUTE RUMP_AF_OROUTE
+#define RUMP_PF_LINK RUMP_AF_LINK
+#define RUMP_PF_XTP pseudo_RUMP_AF_XTP
+#define RUMP_PF_COIP RUMP_AF_COIP
+#define RUMP_PF_CNT RUMP_AF_CNT
+#define RUMP_PF_INET6 RUMP_AF_INET6
+#define RUMP_PF_IPX RUMP_AF_IPX
+#define RUMP_PF_RTIP pseudo_RUMP_AF_RTIP
+#define RUMP_PF_PIP pseudo_RUMP_AF_PIP
+#define RUMP_PF_ISDN RUMP_AF_ISDN
+#define RUMP_PF_E164 RUMP_AF_E164
+#define RUMP_PF_NATM RUMP_AF_NATM
+#define RUMP_PF_ARP RUMP_AF_ARP
+#define RUMP_PF_KEY pseudo_RUMP_AF_KEY
+#define RUMP_PF_BLUETOOTH RUMP_AF_BLUETOOTH
+#define RUMP_PF_MPLS RUMP_AF_MPLS
+#define RUMP_PF_ROUTE RUMP_AF_ROUTE
+#define RUMP_PF_MAX RUMP_AF_MAX
+#define RUMP_SO_DEBUG 0x0001
+#define RUMP_SO_ACCEPTCONN 0x0002
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Fri Jul 20 09:10:23 UTC 2012 Modified Files: src/sys/rump/include/rump: rump_syscalls_compat.h Log Message: add simple compat for other OSs to be able to use rump_syscalls.h To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/rump/include/rump/rump_syscalls_compat.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/include/rump/rump_syscalls_compat.h diff -u src/sys/rump/include/rump/rump_syscalls_compat.h:1.7 src/sys/rump/include/rump/rump_syscalls_compat.h:1.8 --- src/sys/rump/include/rump/rump_syscalls_compat.h:1.7 Mon Jan 17 18:24:17 2011 +++ src/sys/rump/include/rump/rump_syscalls_compat.h Fri Jul 20 09:10:23 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls_compat.h,v 1.7 2011/01/17 18:24:17 pooka Exp $ */ +/* $NetBSD: rump_syscalls_compat.h,v 1.8 2012/07/20 09:10:23 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -28,8 +28,8 @@ #ifndef _RUMP_RUMP_SYSCALLS_COMPAT_H_ #define _RUMP_RUMP_SYSCALLS_COMPAT_H_ -#ifndef _KERNEL #ifdef __NetBSD__ +#include sys/cdefs.h #include sys/param.h /* time_t change */ @@ -51,7 +51,13 @@ #define RUMP_SYS_RENAME_FHSTAT rump___sysimpl_fhstat40 #endif /* __NetBSD_Prereq(5,99,7) */ +#else /* !__NetBSD__ */ + +#ifndef __RENAME +#define __RUMPSTRINGIFY(x) #x +#define __RENAME(x) __asm(__RUMPSTRINGIFY(x)) +#endif /* __RENAME */ + #endif /* __NetBSD__ */ -#endif /* _KERNEL */ #endif /* _RUMP_RUMP_SYSCALLS_COMPAT_H_ */
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Fri Jul 20 09:11:33 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern: memalloc.c vm.c
Log Message:
make unreal allocators work again
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/librump/rumpkern/memalloc.c
cvs rdiff -u -r1.127 -r1.128 src/sys/rump/librump/rumpkern/vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/memalloc.c
diff -u src/sys/rump/librump/rumpkern/memalloc.c:1.16 src/sys/rump/librump/rumpkern/memalloc.c:1.17
--- src/sys/rump/librump/rumpkern/memalloc.c:1.16 Tue Jun 5 22:51:47 2012
+++ src/sys/rump/librump/rumpkern/memalloc.c Fri Jul 20 09:11:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: memalloc.c,v 1.16 2012/06/05 22:51:47 jym Exp $ */
+/* $NetBSD: memalloc.c,v 1.17 2012/07/20 09:11:33 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: memalloc.c,v 1.16 2012/06/05 22:51:47 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: memalloc.c,v 1.17 2012/07/20 09:11:33 pooka Exp $);
#include sys/param.h
#include sys/kmem.h
@@ -122,6 +122,10 @@ kmem_free(void *p, size_t size)
rumpuser_free(p);
}
+__strong_alias(kmem_intr_alloc, kmem_alloc);
+__strong_alias(kmem_intr_zalloc, kmem_zalloc);
+__strong_alias(kmem_intr_free, kmem_free);
+
/*
* pool pool_cache
*/
@@ -317,6 +321,12 @@ pool_page_free(struct pool *pp, void *it
return pool_put(pp, item);
}
+struct pool_allocator pool_allocator_kmem = {
+.pa_alloc = pool_page_alloc,
+.pa_free = pool_page_free,
+.pa_pagesz = 0
+};
+
void
vmem_rehash_start()
{
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.127 src/sys/rump/librump/rumpkern/vm.c:1.128
--- src/sys/rump/librump/rumpkern/vm.c:1.127 Tue Jun 5 22:51:47 2012
+++ src/sys/rump/librump/rumpkern/vm.c Fri Jul 20 09:11:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.127 2012/06/05 22:51:47 jym Exp $ */
+/* $NetBSD: vm.c,v 1.128 2012/07/20 09:11:33 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.127 2012/06/05 22:51:47 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.128 2012/07/20 09:11:33 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -331,6 +331,8 @@ uvm_init(void)
kernel_map-pmap = pmap_kernel();
pool_subsystem_init();
+
+#ifndef RUMP_USE_UNREAL_ALLOCATORS
vmem_bootstrap();
kmem_arena = vmem_create(kmem, 0, 1024*1024, PAGE_SIZE,
NULL, NULL, NULL,
@@ -341,6 +343,7 @@ uvm_init(void)
kmem_va_arena = vmem_create(kva, 0, 0, PAGE_SIZE,
vmem_alloc, vmem_free, kmem_arena,
8 * PAGE_SIZE, VM_NOSLEEP | VM_BOOTSTRAP, IPL_VM);
+#endif /* !RUMP_USE_UNREAL_ALLOCATORS */
pool_cache_bootstrap(pagecache, sizeof(struct vm_page), 0, 0, 0,
page$, NULL, IPL_NONE, pgctor, pgdtor, NULL);
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Fri Jul 20 09:20:05 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern memalloc.c vm.c
Log Message:
Make it possible to select between real and unreal allocators from
make. Plus some gratuitous renaming.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpkern/memalloc.c
cvs rdiff -u -r1.128 -r1.129 src/sys/rump/librump/rumpkern/vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.118 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.119
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.118 Fri Jun 22 12:45:43 2012
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Fri Jul 20 09:20:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.118 2012/06/22 12:45:43 rmind Exp $
+# $NetBSD: Makefile.rumpkern,v 1.119 2012/07/20 09:20:05 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -128,13 +128,16 @@ SRCS+= clock_subr.c
# compat
SRCS+= kern_select_50.c
-# Flip the comment to the other line if you want to use malloc(3)
-# directly instead of the kernel allocators backed by malloc(3)/mmap(2).
-# Libc malloc is a few percent faster, but doesn't emulate all kernel
-# corner cases as well (not to mention if you want to debug the
+# Set RUMP_UNREAL_ALLOCATORS to yes to use memory allocation hypercalls
+# directly instead of the kmem/pool allocators backed by hypercalls.
+# Direct hypercalls may be a few percent faster, but don't emulate
+# all kernel corner cases as well (not to mention if you want to debug the
# allocators themselves).
-#CPPFLAGS+= -DRUMP_USE_UNREAL_ALLOCATORS
+.if defined(RUMP_UNREAL_ALLOCATORS) ${RUMP_UNREAL_ALLOCATORS} == yes
+CPPFLAGS+= -DRUMP_UNREAL_ALLOCATORS
+.else
SRCS+= subr_kmem.c subr_percpu.c subr_pool.c subr_vmem.c
+.endif
.ifdef RUMP_LOCKDEBUG
SRCS+= subr_lockdebug.c
Index: src/sys/rump/librump/rumpkern/memalloc.c
diff -u src/sys/rump/librump/rumpkern/memalloc.c:1.17 src/sys/rump/librump/rumpkern/memalloc.c:1.18
--- src/sys/rump/librump/rumpkern/memalloc.c:1.17 Fri Jul 20 09:11:33 2012
+++ src/sys/rump/librump/rumpkern/memalloc.c Fri Jul 20 09:20:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: memalloc.c,v 1.17 2012/07/20 09:11:33 pooka Exp $ */
+/* $NetBSD: memalloc.c,v 1.18 2012/07/20 09:20:05 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: memalloc.c,v 1.17 2012/07/20 09:11:33 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: memalloc.c,v 1.18 2012/07/20 09:20:05 pooka Exp $);
#include sys/param.h
#include sys/kmem.h
@@ -88,7 +88,7 @@ kern_free(void *ptr)
* Kmem
*/
-#ifdef RUMP_USE_UNREAL_ALLOCATORS
+#ifdef RUMP_UNREAL_ALLOCATORS
void
kmem_init()
{
@@ -391,4 +391,4 @@ percpu_foreach(percpu_t *pc, percpu_call
cb(pc, arg, rump_cpu);
}
-#endif /* RUMP_USE_UNREAL_ALLOCATORS */
+#endif /* RUMP_UNREAL_ALLOCATORS */
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.128 src/sys/rump/librump/rumpkern/vm.c:1.129
--- src/sys/rump/librump/rumpkern/vm.c:1.128 Fri Jul 20 09:11:33 2012
+++ src/sys/rump/librump/rumpkern/vm.c Fri Jul 20 09:20:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.128 2012/07/20 09:11:33 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.129 2012/07/20 09:20:05 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.128 2012/07/20 09:11:33 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.129 2012/07/20 09:20:05 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -332,7 +332,7 @@ uvm_init(void)
pool_subsystem_init();
-#ifndef RUMP_USE_UNREAL_ALLOCATORS
+#ifndef RUMP_UNREAL_ALLOCATORS
vmem_bootstrap();
kmem_arena = vmem_create(kmem, 0, 1024*1024, PAGE_SIZE,
NULL, NULL, NULL,
@@ -343,7 +343,7 @@ uvm_init(void)
kmem_va_arena = vmem_create(kva, 0, 0, PAGE_SIZE,
vmem_alloc, vmem_free, kmem_arena,
8 * PAGE_SIZE, VM_NOSLEEP | VM_BOOTSTRAP, IPL_VM);
-#endif /* !RUMP_USE_UNREAL_ALLOCATORS */
+#endif /* !RUMP_UNREAL_ALLOCATORS */
pool_cache_bootstrap(pagecache, sizeof(struct vm_page), 0, 0, 0,
page$, NULL, IPL_NONE, pgctor, pgdtor, NULL);
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Fri Jul 20 09:27:12 UTC 2012 Modified Files: src/sys/rump/include/rump: rump.h Log Message: Revert rev 1.51. Turns out the defines are still useful when you really want a local client. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/rump/include/rump/rump.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/include/rump/rump.h diff -u src/sys/rump/include/rump/rump.h:1.53 src/sys/rump/include/rump/rump.h:1.54 --- src/sys/rump/include/rump/rump.h:1.53 Mon Mar 21 16:41:08 2011 +++ src/sys/rump/include/rump/rump.h Fri Jul 20 09:27:11 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.h,v 1.53 2011/03/21 16:41:08 pooka Exp $ */ +/* $NetBSD: rump.h,v 1.54 2012/07/20 09:27:11 pooka Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -145,31 +145,59 @@ _END_DECLS #endif /* RUMP_SYS_NETWORKING */ #ifdef RUMP_SYS_IOCTL -#error deprecated syscall selection. use rumphijack +#define ioctl(...) rump_sys_ioctl(__VA_ARGS__) +#define fnctl(...) rump_sys_fcntl(__VA_ARGS__) #endif /* RUMP_SYS_IOCTL */ #ifdef RUMP_SYS_CLOSE -#error deprecated syscall selection. use rumphijack +#define close(a) rump_sys_close(a) #endif /* RUMP_SYS_CLOSE */ #ifdef RUMP_SYS_OPEN -#error deprecated syscall selection. use rumphijack +#define open(...) rump_sys_open(__VA_ARGS__) #endif /* RUMP_SYS_OPEN */ #ifdef RUMP_SYS_READWRITE -#error deprecated syscall selection. use rumphijack +#define read(a,b,c) rump_sys_read(a,b,c) +#define readv(a,b,c) rump_sys_readv(a,b,c) +#define pread(a,b,c,d) rump_sys_pread(a,b,c,d) +#define preadv(a,b,c,d) rump_sys_preadv(a,b,c,d) +#define write(a,b,c) rump_sys_write(a,b,c) +#define writev(a,b,c) rump_sys_writev(a,b,c) +#define pwrite(a,b,c,d) rump_sys_pwrite(a,b,c,d) +#define pwritev(a,b,c,d) rump_sys_pwritev(a,b,c,d) #endif /* RUMP_SYS_READWRITE */ #ifdef RUMP_SYS_FILEOPS -#error deprecated syscall selection. use rumphijack +#define mkdir(a,b) rump_sys_mkdir(a,b) +#define rmdir(a) rump_sys_rmdir(a) +#define link(a,b) rump_sys_link(a,b) +#define symlink(a,b) rump_sys_symlink(a,b) +#define unlink(a) rump_sys_unlink(a) +#define readlink(a,b,c) rump_sys_readlink(a,b,c) +#define chdir(a) rump_sys_chdir(a) +#define fsync(a) rump_sys_fsync(a) +#define sync() rump_sys_sync() +#define chown(a,b,c) rump_sys_chown(a,b,c) +#define fchown(a,b,c) rump_sys_fchown(a,b,c) +#define lchown(a,b,c) rump_sys_lchown(a,b,c) +#define lseek(a,b,c) rump_sys_lseek(a,b,c) +#define mknod(a,b,c) rump_sys_mknod(a,b,c) +#define rename(a,b) rump_sys_rename(a,b) +#define truncate(a,b) rump_sys_truncate(a,b) +#define ftruncate(a,b) rump_sys_ftruncate(a,b) +#define umask(a) rump_sys_umask(a) +#define getdents(a,b,c) rump_sys_getdents(a,b,c) #endif /* RUMP_SYS_FILEOPS */ #ifdef RUMP_SYS_STAT -#error deprecated syscall selection. use rumphijack +#define stat(a,b) rump_sys_stat(a,b) +#define fstat(a,b) rump_sys_fstat(a,b) +#define lstat(a,b) rump_sys_lstat(a,b) #endif /* RUMP_SYS_STAT */ #ifdef RUMP_SYS_PROCOPS -#error deprecated syscall selection. use rumphijack +#define getpid() rump_sys_getpid() #endif /* RUMP_SYS_PROCOPS */ #endif /* _RUMP_RUMP_H_ */
CVS commit: src/distrib/common
Module Name:src
Committed By: matt
Date: Fri Jul 20 11:19:03 UTC 2012
Modified Files:
src/distrib/common: Makefile.makedev
Log Message:
Add a dependency for Makefile so that when you add device to the Makefile
it will automatically regenerate the device mtree file and cause the ramdisk
to be updated.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/common/Makefile.makedev
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.makedev
diff -u src/distrib/common/Makefile.makedev:1.16 src/distrib/common/Makefile.makedev:1.17
--- src/distrib/common/Makefile.makedev:1.16 Sat Feb 18 14:26:27 2012
+++ src/distrib/common/Makefile.makedev Fri Jul 20 11:19:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.makedev,v 1.16 2012/02/18 14:26:27 njoly Exp $
+# $NetBSD: Makefile.makedev,v 1.17 2012/07/20 11:19:03 matt Exp $
#
# Makefile snippet to add ${MAKEDEVTARGETS} devices to the mtree list
# (if set), otherwise copy .OBJDIR-of-etc/MAKEDEV to ./dev
@@ -41,7 +41,7 @@ CLEANFILES+= ${MAKEDEVSPEC} ${MAKEDEVSPE
#
MTREECONF+= ${MAKEDEVSPEC}
-${MAKEDEVSPEC}: ${MAKEDEVSCRIPT}
+${MAKEDEVSPEC}: ${MAKEDEVSCRIPT} Makefile
${_MKTARGET_CREATE}
rm -f ${.TARGET} ${.TARGET}.tmp
MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
CVS commit: src/distrib/evbppc/ramdisk
Module Name:src
Committed By: matt
Date: Fri Jul 20 11:19:51 UTC 2012
Modified Files:
src/distrib/evbppc/ramdisk: dot.profile
Log Message:
Change erase from ^H to ^? (delete).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbppc/ramdisk/dot.profile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbppc/ramdisk/dot.profile
diff -u src/distrib/evbppc/ramdisk/dot.profile:1.3 src/distrib/evbppc/ramdisk/dot.profile:1.4
--- src/distrib/evbppc/ramdisk/dot.profile:1.3 Tue Jan 18 01:27:16 2011
+++ src/distrib/evbppc/ramdisk/dot.profile Fri Jul 20 11:19:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.3 2011/01/18 01:27:16 matt Exp $
+# $NetBSD: dot.profile,v 1.4 2012/07/20 11:19:51 matt Exp $
#
# Copyright (c) 1995 Jason R. Thorpe
# Copyright (c) 1994 Christopher G. Demetriou
@@ -47,8 +47,8 @@ if [ X${DONEPROFILE} = X ]; then
export DONEPROFILE
# set up some sane defaults
- echo 'erase ^H, werase ^W, kill ^U, intr ^C, status ^T'
- stty newcrt werase ^W intr ^C kill ^U erase ^H status ^T
+ echo 'erase ^?, werase ^W, kill ^U, intr ^C, status ^T'
+ stty newcrt werase ^W intr ^C kill ^U erase ^? status ^T
# mount root read-write
mount -u /dev/md0a /
CVS commit: src/distrib/evbppc/ramdisk
Module Name:src Committed By: matt Date: Fri Jul 20 11:20:37 UTC 2012 Modified Files: src/distrib/evbppc/ramdisk: list Log Message: Add gpt and cksum(md5/sha1/sum) To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/evbppc/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/evbppc/ramdisk/list diff -u src/distrib/evbppc/ramdisk/list:1.18 src/distrib/evbppc/ramdisk/list:1.19 --- src/distrib/evbppc/ramdisk/list:1.18 Wed Feb 1 22:25:46 2012 +++ src/distrib/evbppc/ramdisk/list Fri Jul 20 11:20:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.18 2012/02/01 22:25:46 matt Exp $ +# $NetBSD: list,v 1.19 2012/07/20 11:20:37 matt Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -32,6 +32,7 @@ PROG sbin/fsck PROG sbin/fsck_ffs PROG sbin/fsck_ext2fs PROG sbin/fsck_msdos +PROG sbin/gpt PROG sbin/ifconfig PROG sbin/init PROG sbin/mknod @@ -54,6 +55,7 @@ PROG sbin/shutdown PROG sbin/swapctl PROG sbin/umount +PROG usr/bin/cksum usr/bin/md5 usr/bin/sha1 usr/bin/sum PROG usr/bin/ftp PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip PROG usr/bin/more
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: rkujawa
Date: Fri Jul 20 12:03:32 UTC 2012
Modified Files:
src/sys/dev/pci: tdvfb.c tdvfbreg.h tdvfbvar.h
Log Message:
Add 3Dfx Voodoo Graphics (aka Voodoo 1) support.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/tdvfb.c src/sys/dev/pci/tdvfbreg.h \
src/sys/dev/pci/tdvfbvar.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/tdvfb.c
diff -u src/sys/dev/pci/tdvfb.c:1.1 src/sys/dev/pci/tdvfb.c:1.2
--- src/sys/dev/pci/tdvfb.c:1.1 Wed Jul 18 23:30:14 2012
+++ src/sys/dev/pci/tdvfb.c Fri Jul 20 12:03:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tdvfb.c,v 1.1 2012/07/18 23:30:14 rkujawa Exp $ */
+/* $NetBSD: tdvfb.c,v 1.2 2012/07/20 12:03:32 rkujawa Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
/*
- * A console driver for 3Dfx Voodoo2 (CVG).
+ * A console driver for 3Dfx Voodoo2 (CVG) and 3Dfx Voodoo Graphics (SST-1).
*
* 3Dfx Glide 2.x source code, Linux driver by Ghozlane Toumi, and
* Voodoo2 Graphics Engine for 3D Game Acceleration document were used as
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tdvfb.c,v 1.1 2012/07/18 23:30:14 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: tdvfb.c,v 1.2 2012/07/20 12:03:32 rkujawa Exp $);
#include sys/param.h
#include sys/systm.h
@@ -108,6 +108,9 @@ tdvfb_match(device_t parent, cfdata_t ma
if ((PCI_VENDOR(pa-pa_id) == PCI_VENDOR_3DFX)
(PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_3DFX_VOODOO2))
return 100;
+ if ((PCI_VENDOR(pa-pa_id) == PCI_VENDOR_3DFX)
+ (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_3DFX_VOODOO))
+ return 100;
return 0;
}
@@ -133,6 +136,11 @@ tdvfb_attach(device_t parent, device_t s
sc-sc_pcitag = pa-pa_tag;
sc-sc_dev = self;
+ if (PCI_PRODUCT(pa-pa_id) == PCI_PRODUCT_3DFX_VOODOO2)
+ sc-sc_voodootype = TDV_VOODOO_2;
+ else
+ sc-sc_voodootype = TDV_VOODOO_1;
+
screg = pci_conf_read(sc-sc_pc, sc-sc_pcitag,
PCI_COMMAND_STATUS_REG);
screg |= PCI_COMMAND_MEM_ENABLE;
@@ -154,7 +162,7 @@ tdvfb_attach(device_t parent, device_t s
aprint_error_dev(sc-sc_dev, unable to map the framebuffer);
}
- aprint_normal_dev(sc-sc_dev, CVG at 0x%08x, fb at 0x%08x\n,
+ aprint_normal_dev(sc-sc_dev, registers at 0x%08x, fb at 0x%08x\n,
sc-sc_cvg_pa, sc-sc_cvg_pa + TDV_OFF_FB);
/* Do the low level setup. */
@@ -169,7 +177,7 @@ tdvfb_attach(device_t parent, device_t s
*/
sc-sc_memsize = tdvfb_mem_size(sc);
- /* Select video mode, 800x600x60 by default... */
+ /* Select video mode, 800x600 32bpp 60Hz by default... */
sc-sc_width = 800;
sc-sc_height = 600;
sc-sc_bpp = 32;
@@ -295,7 +303,10 @@ tdvfb_videomode_set(struct tdvfb_softc *
sc-vid_timing = tdvfb_gendac_calc_pll(sc-sc_videomode-dot_clock);
- sc-sc_x_tiles = (sc-sc_videomode-hdisplay + 63 ) / 64 * 2;
+ if(sc-sc_voodootype == TDV_VOODOO_2)
+ sc-sc_x_tiles = (sc-sc_videomode-hdisplay + 63 ) / 64 * 2;
+ else
+ sc-sc_x_tiles = (sc-sc_videomode-hdisplay + 63 ) / 64;
tdvfb_cvg_write(sc, TDV_OFF_NOPCMD, 0);
tdvfb_wait(sc);
@@ -309,9 +320,10 @@ tdvfb_videomode_set(struct tdvfb_softc *
tdvfb_cvg_unset(sc, TDV_OFF_FBIINIT2, TDV_FBIINIT2_DRAM_REFR);
tdvfb_wait(sc);
- /* program video timings into CVG */
+ /* program video timings into CVG/SST-1*/
tdvfb_cvg_write(sc, TDV_OFF_VDIMENSIONS, yheight 16 | (xwidth - 1));
- tdvfb_cvg_write(sc, TDV_OFF_BACKPORCH, vbackporch 16 | (hbackporch-2));
+ tdvfb_cvg_write(sc, TDV_OFF_BACKPORCH, vbackporch 16 |
+ (hbackporch - 2));
tdvfb_cvg_write(sc, TDV_OFF_HSYNC, hsyncoff 16 | (hsyncon - 1));
tdvfb_cvg_write(sc, TDV_OFF_VSYNC, vsyncoff 16 | vsyncon);
@@ -325,22 +337,29 @@ tdvfb_videomode_set(struct tdvfb_softc *
TDV_FBIINIT1_DR_DCLK |
TDV_FBIINIT1_IN_VCLK_2X );
- fbiinit1 |= ((sc-sc_x_tiles 0x20) 5) TDV_FBIINIT1_TILES_X_MSB |
- ((sc-sc_x_tiles 0x1e) 1) TDV_FBIINIT1_TILES_X;
- fbiinit6 = (sc-sc_x_tiles 0x1) TDV_FBIINIT6_TILES_X_LSB;
+ if (sc-sc_voodootype == TDV_VOODOO_2) {
+ fbiinit1 |= ((sc-sc_x_tiles 0x20) 5)
+ TDV_FBIINIT1_TILES_X_MSB | ((sc-sc_x_tiles 0x1e) 1)
+ TDV_FBIINIT1_TILES_X;
+ fbiinit6 = (sc-sc_x_tiles 0x1) TDV_FBIINIT6_TILES_X_LSB;
+ } else
+ fbiinit1 |= sc-sc_x_tiles TDV_FBIINIT1_TILES_X;
fbiinit1 |= TDV_FBIINIT1_VCLK_2X TDV_FBIINIT1_VCLK_SRC;
- fbiinit5 = tdvfb_cvg_read(sc, TDV_OFF_FBIINIT5) TDV_FBIINIT5_VIDMASK;
-
- if (sc-sc_videomode-flags VID_PHSYNC)
- fbiinit5 |= TDV_FBIINIT5_PHSYNC;
- if (sc-sc_videomode-flags VID_PVSYNC)
- fbiinit5 |= TDV_FBIINIT5_PVSYNC;
-
+ if (sc-sc_voodootype == TDV_VOODOO_2) {
+ fbiinit5 = tdvfb_cvg_read(sc, TDV_OFF_FBIINIT5)
+ TDV_FBIINIT5_VIDMASK;
+ if (sc-sc_videomode-flags VID_PHSYNC)
+ fbiinit5 |= TDV_FBIINIT5_PHSYNC;
+ if (sc-sc_videomode-flags VID_PVSYNC)
+ fbiinit5 |= TDV_FBIINIT5_PVSYNC;
+ }
CVS commit: src/doc
Module Name:src Committed By: rkujawa Date: Fri Jul 20 12:05:36 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Note added support for 3Dfx Voodoo 1. To generate a diff of this commit: cvs rdiff -u -r1.1719 -r1.1720 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.1719 src/doc/CHANGES:1.1720 --- src/doc/CHANGES:1.1719 Wed Jul 18 23:33:26 2012 +++ src/doc/CHANGES Fri Jul 20 12:05:36 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1719 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1720 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -83,3 +83,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: kernel: Add support for sensors to provide entropy to rnd(4) [pgoyette 20120715] tdvfb(4): Add 3Dfx Voodoo2 driver. [rkujawa 20120719] + tdvfb(4): Add 3Dfx Voodoo Graphics (aka Voodoo1) support. + [rkujawa 20120720]
CVS commit: src/lib/libc/inet
Module Name:src Committed By: ginsbach Date: Fri Jul 20 13:40:58 UTC 2012 Modified Files: src/lib/libc/inet: inet_net.3 Log Message: - Use .Vt for variable types outside the SYNOPSIS section rather than .Ft - Use .Fn for function names outside the NAME section rather than .Nm - Mark NULL as a defined value (.Dv) - New sentence new line - Don't start sentences with an arugment name - Use \- rather than a bare - for a minus sign - Spelling: rightmost - Stray whitespace (Most changes from FreeBSD) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/inet/inet_net.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/inet/inet_net.3 diff -u src/lib/libc/inet/inet_net.3:1.2 src/lib/libc/inet/inet_net.3:1.3 --- src/lib/libc/inet/inet_net.3:1.2 Wed Apr 30 13:10:50 2008 +++ src/lib/libc/inet/inet_net.3 Fri Jul 20 13:40:58 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: inet_net.3,v 1.2 2008/04/30 13:10:50 martin Exp $ +.\ $NetBSD: inet_net.3,v 1.3 2012/07/20 13:40:58 ginsbach Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -48,14 +48,17 @@ The .Fn inet_net_ntop function converts an Internet network number from network format (usually a -.Ft struct in_addr +.Vt struct in_addr or some other binary form, in network byte order) to CIDR presentation format (suitable for external display purposes). +The .Fa bits -is the number of bits in +argument is the number of bits in .Fa src that are the network number. -It returns NULL if a system error occurs (in which case, +It returns +.Dv NULL +if a system error occurs (in which case, .Va errno will have been set), or it returns a pointer to the destination string. .Pp @@ -63,10 +66,10 @@ The .Fn inet_net_pton function converts a presentation format Internet network number (that is, printable form as held in a character string) to network format (usually a -.Ft struct in_addr +.Vt struct in_addr or some other internal binary representation, in network byte order). It returns the number of bits (either computed based on the class, or -specified with /CIDR), or -1 if a failure occurred +specified with /CIDR), or \-1 if a failure occurred (in which case .Va errno will have been set. @@ -80,8 +83,9 @@ are .Dv AF_INET and .Dv AF_INET6 . +The .Fa size -is the size of the result buffer +argument is the size of the result buffer .Fa dst . .Sh NETWORK NUMBERS (IP VERSION 4) Internet network numbers may be specified in one of the following forms: @@ -95,11 +99,11 @@ a .Pp When four parts are specified, each is interpreted as a byte of data and assigned, from left to right, -to the four bytes of an Internet network number. Note -that when an Internet network number is viewed as a 32-bit +to the four bytes of an Internet network number. +Note that when an Internet network number is viewed as a 32-bit integer quantity on a system that uses little-endian byte order (such as the -.Tn Intel 386, 486 +.Tn Intel 386 , 486 , and .Tn Pentium processors) the bytes referred to above appear as @@ -108,14 +112,14 @@ That is, little-endian bytes are ordered .Pp When a three part number is specified, the last part is interpreted as a 16-bit quantity and placed -in the right-most two bytes of the Internet network number. +in the rightmost two bytes of the Internet network number. This makes the three part number format convenient for specifying Class B network numbers as .Dq Li 128.net.host . .Pp When a two part number is supplied, the last part is interpreted as a 24-bit quantity and placed in -the right most three bytes of the Internet network number. +the rightmost three bytes of the Internet network number. This makes the two part number format convenient for specifying Class A network numbers as .Dq Li net.host . @@ -127,7 +131,7 @@ rearrangement. All numbers supplied as .Dq parts in a -.Ql \. +.Ql \. notation may be decimal, octal, or hexadecimal, as specified in the C language (i.e., a leading 0x or 0X implies @@ -143,9 +147,9 @@ otherwise, the number is interpreted as .Xr networks 5 .Sh HISTORY The -.Nm inet_net_ntop +.Fn inet_net_ntop and -.Nm inet_net_pton +.Fn inet_net_pton functions appeared in BIND 4.9.4 and thence .Nx 1.3 . Support for
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Fri Jul 20 14:21:20 UTC 2012
Modified Files:
src/sys/arch/powerpc/powerpc: syscall.c
Log Message:
Use the new syscall approach by collapsing fancy/plain variants into just
a single routine.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/powerpc/powerpc/syscall.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/powerpc/powerpc/syscall.c
diff -u src/sys/arch/powerpc/powerpc/syscall.c:1.50 src/sys/arch/powerpc/powerpc/syscall.c:1.51
--- src/sys/arch/powerpc/powerpc/syscall.c:1.50 Sun Feb 19 21:06:24 2012
+++ src/sys/arch/powerpc/powerpc/syscall.c Fri Jul 20 14:21:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.50 2012/02/19 21:06:24 rmind Exp $ */
+/* $NetBSD: syscall.c,v 1.51 2012/07/20 14:21:20 matt Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -61,7 +61,7 @@
#define EMULNAME(x) (x)
#define EMULNAMEU(x) (x)
-__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.50 2012/02/19 21:06:24 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.51 2012/07/20 14:21:20 matt Exp $);
void
child_return(void *arg)
@@ -79,107 +79,15 @@ child_return(void *arg)
}
#endif
-static void EMULNAME(syscall_plain)(struct trapframe *);
-
#include powerpc/spr.h
-void
-EMULNAME(syscall_plain)(struct trapframe *tf)
-{
- struct lwp *l = curlwp;
- struct proc *p = l-l_proc;
- const struct sysent *callp;
- size_t argsize;
- register_t code;
- register_t *params, rval[2];
- register_t args[10];
- int error;
- int n;
-
- LWP_CACHE_CREDS(l, p);
- curcpu()-ci_ev_scalls.ev_count++;
- curcpu()-ci_data.cpu_nsyscall++;
-
- code = tf-tf_fixreg[0];
- params = tf-tf_fixreg + FIRSTARG;
- n = NARGREG;
-
- {
- switch (code) {
- case EMULNAMEU(SYS_syscall):
- /*
- * code is first argument,
- * followed by actual args.
- */
- code = *params++;
- n -= 1;
- break;
-#if !defined(COMPAT_LINUX)
- case EMULNAMEU(SYS___syscall):
- params++;
- code = *params++;
- n -= 2;
- break;
-#endif
- default:
- break;
- }
-
- callp = p-p_emul-e_sysent +
- (code (EMULNAMEU(SYS_NSYSENT)-1));
- }
-
- argsize = callp-sy_argsize;
-
- if (argsize n * sizeof(register_t)) {
- memcpy(args, params, n * sizeof(register_t));
- error = copyin(MOREARGS(tf-tf_fixreg[1]),
- args + n,
- argsize - n * sizeof(register_t));
- if (error)
- goto bad;
- params = args;
- }
-
- rval[0] = 0;
- rval[1] = 0;
-
- error = sy_call(callp, l, params, rval);
-
- switch (error) {
- case 0:
- tf-tf_fixreg[FIRSTARG] = rval[0];
- tf-tf_fixreg[FIRSTARG + 1] = rval[1];
- tf-tf_cr = ~0x1000;
- break;
- case ERESTART:
- /*
- * Set user's pc back to redo the system call.
- */
- tf-tf_srr0 -= 4;
- break;
- case EJUSTRETURN:
- /* nothing to do */
- break;
- default:
- bad:
- if (p-p_emul-e_errno)
- error = p-p_emul-e_errno[error];
- tf-tf_fixreg[FIRSTARG] = error;
- tf-tf_cr |= 0x1000;
- break;
- }
-
- userret(l, tf);
-}
-
-static void EMULNAME(syscall_fancy)(struct trapframe *);
+static void EMULNAME(syscall)(struct trapframe *);
void
-EMULNAME(syscall_fancy)(struct trapframe *tf)
+EMULNAME(syscall)(struct trapframe *tf)
{
- struct lwp *l = curlwp;
- struct proc *p = l-l_proc;
+ struct lwp * const l = curlwp;
+ struct proc * const p = l-l_proc;
const struct sysent *callp;
size_t argsize;
register_t code;
@@ -236,38 +144,43 @@ EMULNAME(syscall_fancy)(struct trapframe
params = args;
}
- if ((error = trace_enter(realcode, params, callp-sy_narg)) != 0)
- goto out;
+ if (!__predict_false(p-p_trace_enabled)
+ || __predict_false(callp-sy_flags SYCALL_INDIRECT)
+ || (error = trace_enter(realcode, params, callp-sy_narg)) == 0) {
+ rval[0] = 0;
+ rval[1] = 0;
+ error = sy_call(callp, l, params, rval);
+ }
- rval[0] = 0;
- rval[1] = 0;
+ if (__predict_false(p-p_trace_enabled)
+ !__predict_false(callp-sy_flags SYCALL_INDIRECT)) {
+ trace_exit(code, rval, error);
+ }
- error = sy_call(callp, l, params, rval);
-out:
- switch (error) {
- case 0:
+ if (__predict_true(error == 0)) {
tf-tf_fixreg[FIRSTARG] = rval[0];
tf-tf_fixreg[FIRSTARG + 1] = rval[1];
tf-tf_cr = ~0x1000;
- break;
- case ERESTART:
- /*
- * Set user's pc back to redo the system call.
- */
- tf-tf_srr0 -= 4;
- break;
- case EJUSTRETURN:
- /* nothing to do */
- break;
- default:
- bad:
- if (p-p_emul-e_errno)
- error = p-p_emul-e_errno[error];
- tf-tf_fixreg[FIRSTARG] = error;
- tf-tf_cr |= 0x1000;
- break;
+ } else {
+ switch (error) {
+ case ERESTART:
+ /*
+ * Set user's pc back to redo the system call.
+ */
+ tf-tf_srr0 -= 4;
+ break;
+ case EJUSTRETURN:
+ /* nothing to do */
+ break;
+ default:
+ bad:
+ if (p-p_emul-e_errno)
+error = p-p_emul-e_errno[error];
+ tf-tf_fixreg[FIRSTARG] = error;
+ tf-tf_cr |= 0x1000;
+ break;
+ }
}
- trace_exit(realcode, rval,
CVS commit: src/lib/libc/inet
Module Name:src Committed By: ginsbach Date: Fri Jul 20 14:25:38 UTC 2012 Modified Files: src/lib/libc/inet: inet.3 Log Message: - Use .Vt for variable types outside the SYNOPSIS section rather than .Ft - Use .Fn for function names outside the NAME section rather than .Nm To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/inet/inet.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/inet/inet.3 diff -u src/lib/libc/inet/inet.3:1.2 src/lib/libc/inet/inet.3:1.3 --- src/lib/libc/inet/inet.3:1.2 Thu Sep 22 18:21:58 2011 +++ src/lib/libc/inet/inet.3 Fri Jul 20 14:25:38 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: inet.3,v 1.2 2011/09/22 18:21:58 christos Exp $ +.\ $NetBSD: inet.3,v 1.3 2012/07/20 14:25:38 ginsbach Exp $ .\ .\ Copyright (c) 1983, 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -304,43 +304,43 @@ for malformed requests. .Re .Sh STANDARDS The -.Nm inet_ntop +.Fn inet_ntop and -.Nm inet_pton +.Fn inet_pton functions conform to .St -p1003.1-2001 . Note that -.Nm inet_pton +.Fn inet_pton does not accept 1-, 2-, or 3-part dotted addresses; all four parts must be specified. This is a narrower input set than that accepted by -.Nm inet_aton . +.Fn inet_aton . .Sh HISTORY The -.Nm inet_addr , -.Nm inet_network , -.Nm inet_makeaddr , -.Nm inet_lnaof +.Fn inet_addr , +.Fn inet_network , +.Fn inet_makeaddr , +.Fn inet_lnaof and -.Nm inet_netof +.Fn inet_netof functions appeared in .Bx 4.2 . They were changed to use -.Va in_addr_t +.Vt in_addr_t in place of -.Va unsigned long +.Vt unsigned long in .Nx 2.0 . The -.Nm inet_aton +.Fn inet_aton and -.Nm inet_ntoa +.Fn inet_ntoa functions appeared in .Bx 4.3 . The -.Nm inet_pton +.Fn inet_pton and -.Nm inet_ntop +.Fn inet_ntop functions appeared in BIND 4.9.4 and thence .Nx 1.3 ; they were also in @@ -364,4 +364,4 @@ resides in a static memory area. .Pp .Fn inet_addr should return a -.Fa struct in_addr . +.Vt struct in_addr .
CVS commit: src/sys/arch/evbarm/stand/boot2440
Module Name:src
Committed By: matt
Date: Fri Jul 20 14:53:27 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/boot2440: Makefile
Log Message:
Add ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/stand/boot2440/Makefile
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/evbarm/stand/boot2440/Makefile
diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.3 src/sys/arch/evbarm/stand/boot2440/Makefile:1.4
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.3 Wed Feb 22 12:12:21 2012
+++ src/sys/arch/evbarm/stand/boot2440/Makefile Fri Jul 20 14:53:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/02/22 12:12:21 nisimura Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/20 14:53:27 matt Exp $
S= ${.CURDIR}/../../../..
@@ -59,6 +59,7 @@ vers.c: version
${${MKREPRO} == yes :?:-D} ${.CURDIR}/version evbarm
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${.TARGET}.elf \
${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${OBJCOPY} -S -O binary ${.TARGET}.elf ${.TARGET}
CVS commit: src/sys/arch/evbarm/stand/boot2440
Module Name:src Committed By: matt Date: Fri Jul 20 14:53:52 UTC 2012 Modified Files: src/sys/arch/evbarm/stand/boot2440: s3csdi.c Log Message: Add machine/int_mwgwtypes.h include for intmax_t To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/stand/boot2440/s3csdi.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/evbarm/stand/boot2440/s3csdi.c diff -u src/sys/arch/evbarm/stand/boot2440/s3csdi.c:1.1 src/sys/arch/evbarm/stand/boot2440/s3csdi.c:1.2 --- src/sys/arch/evbarm/stand/boot2440/s3csdi.c:1.1 Mon Jan 30 03:28:34 2012 +++ src/sys/arch/evbarm/stand/boot2440/s3csdi.c Fri Jul 20 14:53:52 2012 @@ -32,6 +32,7 @@ #include lib/libsa/stand.h +#include machine/int_mwgwtypes.h #include machine/limits.h #include dev/sdmmc/sdmmcreg.h
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src
Committed By: matt
Date: Fri Jul 20 14:59:34 UTC 2012
Modified Files:
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
Add missing ${_MKTARGET_LINK}
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
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/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.17 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.18
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.17 Sat Jan 22 19:19:17 2011
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Fri Jul 20 14:59:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.17 2011/01/22 19:19:17 joerg Exp $
+# $NetBSD: Makefile.gzboot,v 1.18 2012/07/20 14:59:33 matt Exp $
NOMAN= # defined
@@ -116,5 +116,6 @@ FILES= ${PROGSYM}
.include bsd.prog.mk
${PROGSYM}: ${STARTFILE} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -o ${.TARGET} ${LDFLAGS} ${STARTFILE} \
${OBJS} ${LIBLIST} ${BASE}.list
CVS commit: src/sys/arch/alpha/stand
Module Name:src
Committed By: matt
Date: Fri Jul 20 15:23:02 UTC 2012
Modified Files:
src/sys/arch/alpha/stand: Makefile.bootxx
src/sys/arch/alpha/stand/boot: Makefile
src/sys/arch/alpha/stand/netboot: Makefile
src/sys/arch/alpha/stand/standtest: Makefile
src/sys/arch/alpha/stand/ustarboot: Makefile
Log Message:
Use ${_MKTARGET_LINK} and ${_MKTARGET_CREATE}
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/stand/Makefile.bootxx
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/stand/boot/Makefile
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/stand/netboot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/alpha/stand/standtest/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/stand/ustarboot/Makefile
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/alpha/stand/Makefile.bootxx
diff -u src/sys/arch/alpha/stand/Makefile.bootxx:1.9 src/sys/arch/alpha/stand/Makefile.bootxx:1.10
--- src/sys/arch/alpha/stand/Makefile.bootxx:1.9 Fri Apr 3 10:38:12 2009
+++ src/sys/arch/alpha/stand/Makefile.bootxx Fri Jul 20 15:23:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.9 2009/04/03 10:38:12 tsutsui Exp $
+# $NetBSD: Makefile.bootxx,v 1.10 2012/07/20 15:23:02 matt Exp $
SRCS = start.S bootxx.c booted_dev.c blkdev.c prom.c prom_disp.S \
putstr.c panic_putstr.c
@@ -37,6 +37,7 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_US
# they are not included in the final object.
${PROG}.sym: ${OBJS} ${LIBSA} ${LIBKERN}
+ ${_MKTARGET_LINK}
@${LD} -Ttext 0x2000 -N --verbose 21 \
| ${TOOL_SED} -n '/^==/,/^===/{/^/d; \
s,^[[:blank:]]*\.eh_frame[[:blank:]]*:, /DISCARD/ : ,;p;}' \
Index: src/sys/arch/alpha/stand/boot/Makefile
diff -u src/sys/arch/alpha/stand/boot/Makefile:1.31 src/sys/arch/alpha/stand/boot/Makefile:1.32
--- src/sys/arch/alpha/stand/boot/Makefile:1.31 Sat Sep 22 03:34:17 2001
+++ src/sys/arch/alpha/stand/boot/Makefile Fri Jul 20 15:23:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/09/22 03:34:17 tv Exp $
+# $NetBSD: Makefile,v 1.32 2012/07/20 15:23:02 matt Exp $
PROG = boot
@@ -19,7 +19,7 @@ CPPFLAGS += ${SECONDARY_CPPFLAGS} \
CLEANFILES+= ${PROG}.sym
${PROG}: ${PROG}.sym
- @echo creating ${PROG} from ${PROG}.sym...
+ @${_MKTARGET_CREATE}
@${OBJCOPY} --output-target=binary ${PROG}.sym ${PROG}
@chmod 644 ${PROG}
@ls -l ${PROG}
@@ -30,6 +30,7 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_US
.include ../Makefile.bootprogs
${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
${OBJS} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
${SIZE} ${PROG}.sym
Index: src/sys/arch/alpha/stand/netboot/Makefile
diff -u src/sys/arch/alpha/stand/netboot/Makefile:1.25 src/sys/arch/alpha/stand/netboot/Makefile:1.26
--- src/sys/arch/alpha/stand/netboot/Makefile:1.25 Fri Jan 3 15:34:42 2003
+++ src/sys/arch/alpha/stand/netboot/Makefile Fri Jul 20 15:23:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/01/03 15:34:42 lukem Exp $
+# $NetBSD: Makefile,v 1.26 2012/07/20 15:23:02 matt Exp $
PROG = netboot
@@ -15,7 +15,7 @@ CPPFLAGS += ${UNIFIED_CPPFLAGS} -DSUPPOR
-DBOOT_TYPE_NAME='Network'
${PROG}: ${PROG}.sym
- @echo creating ${PROG} from ${PROG}.sym...
+ ${_MKTARGET_CREATE}
@${OBJCOPY} --output-target=binary ${PROG}.sym ${PROG}
@chmod 644 ${PROG}
@ls -l ${PROG}
@@ -26,6 +26,7 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=yes SA_U
.include ../Makefile.bootprogs
${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${PROG}.sym \
${OBJS} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
${SIZE} ${PROG}.sym
Index: src/sys/arch/alpha/stand/standtest/Makefile
diff -u src/sys/arch/alpha/stand/standtest/Makefile:1.2 src/sys/arch/alpha/stand/standtest/Makefile:1.3
--- src/sys/arch/alpha/stand/standtest/Makefile:1.2 Fri Jul 21 21:25:19 2000
+++ src/sys/arch/alpha/stand/standtest/Makefile Fri Jul 20 15:23:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/21 21:25:19 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2012/07/20 15:23:02 matt Exp $
PROG= test
BINDIR= /stand
@@ -20,5 +20,6 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_US
.include ../Makefile.bootprogs
${PROG}.sym: ${OBJS} ${LIBSA} ${LIBKERN}
+ ${_MKTARGET_LINK}
${LD} -Ttext ${RELOC} -N -e start -o ${PROG}.sym \
${OBJS} ${LIBSA} ${LIBKERN}
Index: src/sys/arch/alpha/stand/ustarboot/Makefile
diff -u src/sys/arch/alpha/stand/ustarboot/Makefile:1.8 src/sys/arch/alpha/stand/ustarboot/Makefile:1.9
--- src/sys/arch/alpha/stand/ustarboot/Makefile:1.8 Wed Aug 25 16:30:44 2010
+++ src/sys/arch/alpha/stand/ustarboot/Makefile Fri Jul 20 15:23:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/08/25 16:30:44 christos Exp $
+# $NetBSD: Makefile,v 1.9 2012/07/20 15:23:02 matt Exp $
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Fri Jul 20 16:44:33 UTC 2012
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
revert 1.119. theoretically there should be no issue, and i couldn't
find one in practice either, except including rump_syscalls.h from
non-NetBSD now works.
ok christos
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.120 src/sys/kern/makesyscalls.sh:1.121
--- src/sys/kern/makesyscalls.sh:1.120 Sat May 5 19:37:37 2012
+++ src/sys/kern/makesyscalls.sh Fri Jul 20 16:44:33 2012
@@ -1,5 +1,4 @@
-#! /bin/sh -
-# $NetBSD: makesyscalls.sh,v 1.120 2012/05/05 19:37:37 christos Exp $
+# $NetBSD: makesyscalls.sh,v 1.121 2012/07/20 16:44:33 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -283,9 +282,8 @@ NR == 1 {
printf #error Interface not supported inside kernel\n rumpcallshdr
printf #endif /* _KERNEL */\n\n rumpcallshdr
printf #include sys/types.h /* typedefs */\n rumpcallshdr
- printf #include sys/select.h /* typedefs */\n rumpcallshdr
- printf #include sys/sigtypes.h /* typedefs */\n rumpcallshdr
- printf #include sys/socket.h /* typedefs */\n\n rumpcallshdr
+ printf #include sys/select.h /* typedefs */\n\n rumpcallshdr
+ printf #include signal.h /* typedefs */\n\n rumpcallshdr
printf #include rump/rump_syscalls_compat.h\n\n rumpcallshdr
printf %s, sysarghdrextra sysarghdr
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Fri Jul 20 16:49:46 UTC 2012 Modified Files: src/sys/kern: init_sysent.c syscalls.c src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c src/sys/sys: syscall.h syscallargs.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.266 -r1.267 src/sys/kern/init_sysent.c cvs rdiff -u -r1.257 -r1.258 src/sys/kern/syscalls.c cvs rdiff -u -r1.56 -r1.57 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.78 -r1.79 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.253 -r1.254 src/sys/sys/syscall.h cvs rdiff -u -r1.236 -r1.237 src/sys/sys/syscallargs.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/kern/init_sysent.c diff -u src/sys/kern/init_sysent.c:1.266 src/sys/kern/init_sysent.c:1.267 --- src/sys/kern/init_sysent.c:1.266 Fri Jun 22 18:27:25 2012 +++ src/sys/kern/init_sysent.c Fri Jul 20 16:49:46 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: init_sysent.c,v 1.266 2012/06/22 18:27:25 christos Exp $ */ +/* $NetBSD: init_sysent.c,v 1.267 2012/07/20 16:49:46 pooka Exp $ */ /* * System call switch table. @@ -8,7 +8,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.266 2012/06/22 18:27:25 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: init_sysent.c,v 1.267 2012/07/20 16:49:46 pooka Exp $); #include opt_modular.h #include opt_ntp.h Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.257 src/sys/kern/syscalls.c:1.258 --- src/sys/kern/syscalls.c:1.257 Fri Jun 22 18:27:25 2012 +++ src/sys/kern/syscalls.c Fri Jul 20 16:49:46 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: syscalls.c,v 1.257 2012/06/22 18:27:25 christos Exp $ */ +/* $NetBSD: syscalls.c,v 1.258 2012/07/20 16:49:46 pooka Exp $ */ /* * System call names. @@ -8,7 +8,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.257 2012/06/22 18:27:25 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: syscalls.c,v 1.258 2012/07/20 16:49:46 pooka Exp $); #if defined(_KERNEL_OPT) #include opt_modular.h Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.56 src/sys/rump/include/rump/rump_syscalls.h:1.57 --- src/sys/rump/include/rump/rump_syscalls.h:1.56 Thu Mar 8 21:59:31 2012 +++ src/sys/rump/include/rump/rump_syscalls.h Fri Jul 20 16:49:45 2012 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.56 2012/03/08 21:59:31 joerg Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.57 2012/07/20 16:49:45 pooka Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.258 2012/03/08 21:55:45 joerg Exp + * created from NetBSD: syscalls.master,v 1.260 2012/06/22 18:26:35 christos Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ @@ -16,697 +16,697 @@ #include sys/types.h /* typedefs */ #include sys/select.h /* typedefs */ -#include sys/sigtypes.h /* typedefs */ -#include sys/socket.h /* typedefs */ + +#include signal.h /* typedefs */ #include rump/rump_syscalls_compat.h -#ifndef RUMP_SYS_RENAME_FCHROOT -#define RUMP_SYS_RENAME_FCHROOT rump___sysimpl_fchroot +#ifndef RUMP_SYS_RENAME_FGETXATTR +#define RUMP_SYS_RENAME_FGETXATTR rump___sysimpl_fgetxattr #endif -#ifndef RUMP_SYS_RENAME__KSEM_INIT -#define RUMP_SYS_RENAME__KSEM_INIT rump___sysimpl__ksem_init +#ifndef RUMP_SYS_RENAME_IOCTL +#define RUMP_SYS_RENAME_IOCTL rump___sysimpl_ioctl #endif -#ifndef RUMP_SYS_RENAME_EXTATTR_LIST_FD -#define RUMP_SYS_RENAME_EXTATTR_LIST_FD rump___sysimpl_extattr_list_fd +#ifndef RUMP_SYS_RENAME_GETPPID +#define RUMP_SYS_RENAME_GETPPID rump___sysimpl_getppid #endif -#ifndef RUMP_SYS_RENAME_PWRITE -#define RUMP_SYS_RENAME_PWRITE rump___sysimpl_pwrite +#ifndef RUMP_SYS_RENAME___QUOTACTL +#define RUMP_SYS_RENAME___QUOTACTL rump___sysimpl___quotactl #endif -#ifndef RUMP_SYS_RENAME_FGETXATTR -#define RUMP_SYS_RENAME_FGETXATTR rump___sysimpl_fgetxattr +#ifndef RUMP_SYS_RENAME_GETPGID +#define RUMP_SYS_RENAME_GETPGID rump___sysimpl_getpgid #endif -#ifndef RUMP_SYS_RENAME_GETGID_WITH_EGID -#define RUMP_SYS_RENAME_GETGID_WITH_EGID rump___sysimpl_getgid +#ifndef RUMP_SYS_RENAME___SETLOGIN +#define RUMP_SYS_RENAME___SETLOGIN rump___sysimpl___setlogin #endif -#ifndef RUMP_SYS_RENAME_FUTIMENS -#define RUMP_SYS_RENAME_FUTIMENS rump___sysimpl_futimens +#ifndef RUMP_SYS_RENAME_SETEUID +#define RUMP_SYS_RENAME_SETEUID rump___sysimpl_seteuid #endif -#ifndef RUMP_SYS_RENAME_PREAD -#define RUMP_SYS_RENAME_PREAD rump___sysimpl_pread +#ifndef RUMP_SYS_RENAME_GETPEERNAME +#define RUMP_SYS_RENAME_GETPEERNAME rump___sysimpl_getpeername #endif -#ifndef RUMP_SYS_RENAME__KSEM_TRYWAIT -#define RUMP_SYS_RENAME__KSEM_TRYWAIT rump___sysimpl__ksem_trywait +#ifndef RUMP_SYS_RENAME_SYMLINK +#define RUMP_SYS_RENAME_SYMLINK rump___sysimpl_symlink #endif
CVS commit: src/share/man/man4
Module Name:src Committed By: rkujawa Date: Fri Jul 20 17:31:17 UTC 2012 Modified Files: src/share/man/man4: tdvfb.4 Log Message: Note added Voodoo 1 support. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/tdvfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/tdvfb.4 diff -u src/share/man/man4/tdvfb.4:1.2 src/share/man/man4/tdvfb.4:1.3 --- src/share/man/man4/tdvfb.4:1.2 Thu Jul 19 10:27:58 2012 +++ src/share/man/man4/tdvfb.4 Fri Jul 20 17:31:17 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: tdvfb.4,v 1.2 2012/07/19 10:27:58 wiz Exp $ +.\ $NetBSD: tdvfb.4,v 1.3 2012/07/20 17:31:17 rkujawa Exp $ .\ .\ Copyright (c) 2012 Radoslaw Kujawa .\ All rights reserved. @@ -24,12 +24,12 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd July 19, 2012 +.Dd July 20, 2012 .Dt TDVFB 4 .Os .Sh NAME .Nm tdvfb -.Nd 3Dfx Voodoo 2 framebuffer driver +.Nd 3Dfx Voodoo Graphics / Voodoo 2 framebuffer driver .Sh SYNOPSIS .Cd tdvfb* at pci? .Cd wsdisplay* at tdvfb? @@ -37,18 +37,19 @@ .Sh DESCRIPTION The .Nm -driver provides support for the 3Dfx Voodoo 2 graphics card and provides an -interface for the machine independent +driver provides support for the graphics cards based on 3Dfx Voodoo Graphics +(SST-1) and 3Dfx Voodoo2 (CVG) chipsets and provides an interface for the +machine independent .Xr wscons 4 driver. .Pp -Since Voodoo2 was originally designed as a 3D-only solution, most boards do not -have any kind of firmware. +Since both Voodoo Graphics and Voodoo2 were originally designed as a 3D-only +solutions, most boards do not have any kind of firmware. The .Nm driver is able to do low level initialization (boot) of the board, which means that it can be used on all architectures and is truly machine independent. -However, it also means that driver is cannot detect automatically if Voodoo2 +However, it also means that driver cannot detect automatically if the card is used as a console. The .Dv TDVFB_CONSOLE @@ -89,7 +90,7 @@ driver is unaccelerated. Video mode is hard-coded to 800x600 at 60Hz in 32-bits, it should be selectable at least via kernel configuration file. It is not possible to detect what resolutions are supported by the monitor, -since Voodoo2 has no DDC interface. +since Voodoo Graphics and Voodoo2 have no DDC interface. .Pp 8-bit depth is not supported by the hardware. 16-bit depth is supported by the hardware and is the preferred depth, however it
CVS commit: src/share/man/man4
Module Name:src Committed By: rkujawa Date: Fri Jul 20 17:32:41 UTC 2012 Modified Files: src/share/man/man4: tdvfb.4 Log Message: Also add HISTORY section. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/tdvfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/tdvfb.4 diff -u src/share/man/man4/tdvfb.4:1.3 src/share/man/man4/tdvfb.4:1.4 --- src/share/man/man4/tdvfb.4:1.3 Fri Jul 20 17:31:17 2012 +++ src/share/man/man4/tdvfb.4 Fri Jul 20 17:32:40 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: tdvfb.4,v 1.3 2012/07/20 17:31:17 rkujawa Exp $ +.\ $NetBSD: tdvfb.4,v 1.4 2012/07/20 17:32:40 rkujawa Exp $ .\ .\ Copyright (c) 2012 Radoslaw Kujawa .\ All rights reserved. @@ -66,6 +66,11 @@ driver is intended to be used as a conso .%N Revision 1.16 .%D December 1, 1999 .Re +.Sh HISTORY +The +.Nm +device first appeared in +.Nx 7.0 . .Sh AUTHORS .An -nosplit The
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Fri Jul 20 18:17:26 UTC 2012
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
unrevert part of 1.119 which should not have been reverted (sys/socket.h)
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.121 src/sys/kern/makesyscalls.sh:1.122
--- src/sys/kern/makesyscalls.sh:1.121 Fri Jul 20 16:44:33 2012
+++ src/sys/kern/makesyscalls.sh Fri Jul 20 18:17:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.121 2012/07/20 16:44:33 pooka Exp $
+# $NetBSD: makesyscalls.sh,v 1.122 2012/07/20 18:17:26 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -283,6 +283,7 @@ NR == 1 {
printf #endif /* _KERNEL */\n\n rumpcallshdr
printf #include sys/types.h /* typedefs */\n rumpcallshdr
printf #include sys/select.h /* typedefs */\n\n rumpcallshdr
+ printf #include sys/socket.h /* typedefs */\n\n rumpcallshdr
printf #include signal.h /* typedefs */\n\n rumpcallshdr
printf #include rump/rump_syscalls_compat.h\n\n rumpcallshdr
CVS commit: src/sys/kern
Module Name:src
Committed By: pooka
Date: Fri Jul 20 18:19:09 UTC 2012
Modified Files:
src/sys/kern: makesyscalls.sh
Log Message:
pretty pretty print
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/kern/makesyscalls.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.122 src/sys/kern/makesyscalls.sh:1.123
--- src/sys/kern/makesyscalls.sh:1.122 Fri Jul 20 18:17:26 2012
+++ src/sys/kern/makesyscalls.sh Fri Jul 20 18:19:09 2012
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.122 2012/07/20 18:17:26 pooka Exp $
+# $NetBSD: makesyscalls.sh,v 1.123 2012/07/20 18:19:09 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -282,7 +282,7 @@ NR == 1 {
printf #error Interface not supported inside kernel\n rumpcallshdr
printf #endif /* _KERNEL */\n\n rumpcallshdr
printf #include sys/types.h /* typedefs */\n rumpcallshdr
- printf #include sys/select.h /* typedefs */\n\n rumpcallshdr
+ printf #include sys/select.h /* typedefs */\n rumpcallshdr
printf #include sys/socket.h /* typedefs */\n\n rumpcallshdr
printf #include signal.h /* typedefs */\n\n rumpcallshdr
printf #include rump/rump_syscalls_compat.h\n\n rumpcallshdr
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Jul 20 18:19:45 UTC 2012 Modified Files: src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c Log Message: reregen To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.79 -r1.80 src/sys/rump/librump/rumpkern/rump_syscalls.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/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.57 src/sys/rump/include/rump/rump_syscalls.h:1.58 --- src/sys/rump/include/rump/rump_syscalls.h:1.57 Fri Jul 20 16:49:45 2012 +++ src/sys/rump/include/rump/rump_syscalls.h Fri Jul 20 18:19:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls.h,v 1.57 2012/07/20 16:49:45 pooka Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.58 2012/07/20 18:19:45 pooka Exp $ */ /* * System call protos in rump namespace. @@ -16,6 +16,7 @@ #include sys/types.h /* typedefs */ #include sys/select.h /* typedefs */ +#include sys/socket.h /* typedefs */ #include signal.h /* typedefs */ Index: src/sys/rump/librump/rumpkern/rump_syscalls.c diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.79 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.80 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.79 Fri Jul 20 16:49:46 2012 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Fri Jul 20 18:19:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls.c,v 1.79 2012/07/20 16:49:46 pooka Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.80 2012/07/20 18:19:45 pooka Exp $ */ /* * System call vector and marshalling for rump. @@ -8,7 +8,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.79 2012/07/20 16:49:46 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.80 2012/07/20 18:19:45 pooka Exp $); #include sys/param.h #include sys/fstypes.h
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Fri Jul 20 18:53:34 UTC 2012 Modified Files: src/sys/arch/arm/include: byte_swap.h Log Message: Use defined(_ARM_ARCH_[67]) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/include/byte_swap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/byte_swap.h diff -u src/sys/arch/arm/include/byte_swap.h:1.10 src/sys/arch/arm/include/byte_swap.h:1.11 --- src/sys/arch/arm/include/byte_swap.h:1.10 Sun Jul 15 19:59:48 2012 +++ src/sys/arch/arm/include/byte_swap.h Fri Jul 20 18:53:34 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: byte_swap.h,v 1.10 2012/07/15 19:59:48 matt Exp $ */ +/* $NetBSD: byte_swap.h,v 1.11 2012/07/20 18:53:34 matt Exp $ */ /*- * Copyright (c) 1997, 1999, 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #ifdef _LOCORE -#if (ARM_ARCH_6 + ARM_ARCH_7) 0 +#if defined(_ARM_ARCH_6) || defined(_ARM_ARCH_7) #define BSWAP16(_src, _dst, _tmp) \ rev16 _dst, _src
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Jul 20 18:57:27 UTC 2012 Modified Files: src/share/man/man4: tdvfb.4 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/tdvfb.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/tdvfb.4 diff -u src/share/man/man4/tdvfb.4:1.4 src/share/man/man4/tdvfb.4:1.5 --- src/share/man/man4/tdvfb.4:1.4 Fri Jul 20 17:32:40 2012 +++ src/share/man/man4/tdvfb.4 Fri Jul 20 18:57:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: tdvfb.4,v 1.4 2012/07/20 17:32:40 rkujawa Exp $ +.\ $NetBSD: tdvfb.4,v 1.5 2012/07/20 18:57:27 wiz Exp $ .\ .\ Copyright (c) 2012 Radoslaw Kujawa .\ All rights reserved. @@ -38,7 +38,7 @@ The .Nm driver provides support for the graphics cards based on 3Dfx Voodoo Graphics -(SST-1) and 3Dfx Voodoo2 (CVG) chipsets and provides an interface for the +(SST-1) and 3Dfx Voodoo2 (CVG) chipsets and provides an interface for the machine independent .Xr wscons 4 driver.
CVS commit: src/lib/libc/inet
Module Name:src Committed By: ginsbach Date: Fri Jul 20 19:18:09 UTC 2012 Modified Files: src/lib/libc/inet: inet.3 Log Message: - Add ERRORS section covering errno values set by inet_ntop() and inet_pton() To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/inet/inet.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/inet/inet.3 diff -u src/lib/libc/inet/inet.3:1.3 src/lib/libc/inet/inet.3:1.4 --- src/lib/libc/inet/inet.3:1.3 Fri Jul 20 14:25:38 2012 +++ src/lib/libc/inet/inet.3 Fri Jul 20 19:18:08 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: inet.3,v 1.3 2012/07/20 14:25:38 ginsbach Exp $ +.\ $NetBSD: inet.3,v 1.4 2012/07/20 19:18:08 ginsbach Exp $ .\ .\ Copyright (c) 1983, 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)inet.3 8.1 (Berkeley) 6/4/93 .\ -.Dd September 22, 2011 +.Dd July 20, 2012 .Dt INET 3 .Os .Sh NAME @@ -285,6 +285,33 @@ is returned by and .Fn inet_network for malformed requests. +.Sh ERRORS +The +.Fn inet_ntop +and +.Fn inet_pton +functions may fail with +.Bl -tag -width Er +.It Bq Er EAFNOSUPPORT +The value of +.Fa af +was not +.Dv AF_INET +or +.Dv AF_INET6 . +.El +.Pp +The +.Fn inet_ntop +function may fail with +.Bl -tag -width Er +.It Bq Er ENOSPC +The +.Fa size +indicated for +.Fa dst +was too small to store the presentation form of the network address. +.El .Sh SEE ALSO .Xr byteorder 3 , .Xr gethostbyname 3 , @@ -362,6 +389,7 @@ The string returned by .Fn inet_ntoa resides in a static memory area. .Pp +The function .Fn inet_addr should return a .Vt struct in_addr .
CVS commit: src/sys/arch/luna68k
Module Name:src
Committed By: tsutsui
Date: Fri Jul 20 19:31:54 UTC 2012
Modified Files:
src/sys/arch/luna68k/conf: GENERIC INSTALL
src/sys/arch/luna68k/dev: lunafb.c omrasops.c
Added Files:
src/sys/arch/luna68k/dev: omrasopsvar.h
Removed Files:
src/sys/arch/luna68k/dev: omron_rfont.h
Log Message:
Switch luna68k wscons framebuffer driver to using rasops(9) APIs instead of
deprecated rcons(4). This allows options FONT_foo in kernel config files.
Mostly taken from OpenBSD/luna88k, but unnecessary MI rasops(9) stuff is
omitted since omrasops.c has own raster wsdisplay_emulops functions.
Tested on LUNA with 4bpp fb and LUNA-II with 1bpp fb.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/conf/INSTALL
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/luna68k/dev/lunafb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/dev/omrasops.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/luna68k/dev/omrasopsvar.h
cvs rdiff -u -r1.1 -r0 src/sys/arch/luna68k/dev/omron_rfont.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.98 src/sys/arch/luna68k/conf/GENERIC:1.99
--- src/sys/arch/luna68k/conf/GENERIC:1.98 Sat Mar 10 21:51:53 2012
+++ src/sys/arch/luna68k/conf/GENERIC Fri Jul 20 19:31:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.98 2012/03/10 21:51:53 joerg Exp $
+# $NetBSD: GENERIC,v 1.99 2012/07/20 19:31:53 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include arch/luna68k/conf/std.luna68k
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident GENERIC-$Revision: 1.98 $
+#ident GENERIC-$Revision: 1.99 $
maxusers 8
@@ -137,6 +137,7 @@ options NFS_BOOT_DHCP # superset of BOO
# WS console uses SUN or VT100 terminal emulation
options WSEMUL_VT100
+options FONT_OMRON12x20
config netbsd root on ? type ?
Index: src/sys/arch/luna68k/conf/INSTALL
diff -u src/sys/arch/luna68k/conf/INSTALL:1.5 src/sys/arch/luna68k/conf/INSTALL:1.6
--- src/sys/arch/luna68k/conf/INSTALL:1.5 Sat Mar 10 21:51:53 2012
+++ src/sys/arch/luna68k/conf/INSTALL Fri Jul 20 19:31:53 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.5 2012/03/10 21:51:53 joerg Exp $
+# $NetBSD: INSTALL,v 1.6 2012/07/20 19:31:53 tsutsui Exp $
#
# config for installation ramdisk kernel
#
@@ -123,6 +123,7 @@ options NFS_BOOT_DHCP # superset of BOO
# WS console uses SUN or VT100 terminal emulation
options WSEMUL_VT100
+options FONT_OMRON12x20
config netbsd root on ? type ?
Index: src/sys/arch/luna68k/dev/lunafb.c
diff -u src/sys/arch/luna68k/dev/lunafb.c:1.25 src/sys/arch/luna68k/dev/lunafb.c:1.26
--- src/sys/arch/luna68k/dev/lunafb.c:1.25 Wed Jul 27 14:17:54 2011
+++ src/sys/arch/luna68k/dev/lunafb.c Fri Jul 20 19:31:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.25 2011/07/27 14:17:54 tsutsui Exp $ */
+/* $NetBSD: lunafb.c,v 1.26 2012/07/20 19:31:53 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.25 2011/07/27 14:17:54 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1.26 2012/07/20 19:31:53 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -47,14 +47,15 @@ __KERNEL_RCSID(0, $NetBSD: lunafb.c,v 1
#include uvm/uvm_extern.h
-#include dev/rcons/raster.h
#include dev/wscons/wsconsio.h
-#include dev/wscons/wscons_raster.h
#include dev/wscons/wsdisplayvar.h
+#include dev/rasops/rasops.h
#include machine/cpu.h
#include machine/autoconf.h
+#include arch/luna68k/dev/omrasopsvar.h
+
#include ioconf.h
struct bt454 {
@@ -88,8 +89,7 @@ struct om_hwdevconfig {
int dc_rowbytes; /* bytes in a FB scan line */
int dc_cmsize; /* colormap size */
vaddr_t dc_videobase; /* base of flat frame buffer */
- struct raster dc_raster; /* raster description */
- struct rcons dc_rcons; /* raster blitter control info */
+ struct rasops_info dc_ri; /* raster blitter variables */
};
struct hwcmap {
@@ -112,13 +112,8 @@ static int omsetcmap(struct omfb_softc
static struct om_hwdevconfig omfb_console_dc;
static void omfb_getdevconfig(paddr_t, struct om_hwdevconfig *);
-extern struct wsdisplay_emulops omfb_emulops;
-
static struct wsscreen_descr omfb_stdscreen = {
- std, 0, 0,
- omfb_emulops,
- 0, 0,
- 0
+ .name = std
};
static const struct wsscreen_descr *_omfb_scrlist[] = {
@@ -187,7 +182,7 @@ omfbattach(device_t parent, device_t sel
sc-nscreens = 1;
} else {
sc-sc_dc = malloc(sizeof(struct om_hwdevconfig),
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, M_WAITOK | M_ZERO);
omfb_getdevconfig(OMFB_FB_WADDR, sc-sc_dc);
}
aprint_normal(: %d x %d, %dbpp\n, sc-sc_dc-dc_wid, sc-sc_dc-dc_ht,
@@ -209,11 +204,12 @@
CVS commit: src/lib/libc/inet
Module Name:src Committed By: ginsbach Date: Fri Jul 20 19:44:39 UTC 2012 Modified Files: src/lib/libc/inet: inet_net.3 Log Message: - Add an ERRORS section rather than incompletely documenting the possible errno values in the DESCRIPTION section. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/inet/inet_net.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/inet/inet_net.3 diff -u src/lib/libc/inet/inet_net.3:1.3 src/lib/libc/inet/inet_net.3:1.4 --- src/lib/libc/inet/inet_net.3:1.3 Fri Jul 20 13:40:58 2012 +++ src/lib/libc/inet/inet_net.3 Fri Jul 20 19:44:39 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: inet_net.3,v 1.3 2012/07/20 13:40:58 ginsbach Exp $ +.\ $NetBSD: inet_net.3,v 1.4 2012/07/20 19:44:39 ginsbach Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 8, 2001 +.Dd July 20, 2012 .Dt INET_NET 3 .Os .Sh NAME @@ -58,7 +58,7 @@ argument is the number of bits in that are the network number. It returns .Dv NULL -if a system error occurs (in which case, +if an error occurs (in which case .Va errno will have been set), or it returns a pointer to the destination string. .Pp @@ -72,10 +72,7 @@ It returns the number of bits (either co specified with /CIDR), or \-1 if a failure occurred (in which case .Va errno -will have been set. -It will be set to -.Er ENOENT -if the Internet network number was not valid). +will have been set). .Pp The currently supported values for .Fa af @@ -141,6 +138,49 @@ otherwise, the number is interpreted as .\ .Sh NETWORK NUMBERS (IP VERSION 6) .\ XXX - document this! .\ +.Sh ERRORS +The +.Fn inet_net_ntop +and +.Fn inet_net_pton +functions may fail with +.Bl -tag -width Er +.It Bq Er EAFNOSUPPORT +The value of +.Fa af +was not +.Dv AF_INET +or +.Dv AF_INET6 . +.It Bq Er EMSGSIZE +The conversion of +.Fa src +overflows +.Fa size +of +.Fa dst. +.El +.Pp +The +.Fn inet_net_ntop +function may fail with +.Bl -tag -width Er +.It Bq Er EINVAL +The +.Fa bits +argument contains an invalid number of bits +for the requested address family. +.El +.Pp +The +.Fn inet_net_pton +function may fail with +.Bl -tag -width Er +.It Bq Er ENOENT +The +.Fa src +was not a valid Internet network number. +.El .Sh SEE ALSO .Xr byteorder 3 , .Xr inet 3 ,
CVS commit: src/lib/libc/inet
Module Name:src Committed By: wiz Date: Fri Jul 20 20:48:59 UTC 2012 Modified Files: src/lib/libc/inet: inet_net.3 Log Message: Whitespace fixes. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/inet/inet_net.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/inet/inet_net.3 diff -u src/lib/libc/inet/inet_net.3:1.4 src/lib/libc/inet/inet_net.3:1.5 --- src/lib/libc/inet/inet_net.3:1.4 Fri Jul 20 19:44:39 2012 +++ src/lib/libc/inet/inet_net.3 Fri Jul 20 20:48:59 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: inet_net.3,v 1.4 2012/07/20 19:44:39 ginsbach Exp $ +.\ $NetBSD: inet_net.3,v 1.5 2012/07/20 20:48:59 wiz Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -157,8 +157,8 @@ The conversion of .Fa src overflows .Fa size -of -.Fa dst. +of +.Fa dst . .El .Pp The
CVS commit: src/external/gpl3/gcc/dist/libobjc
Module Name:src
Committed By: joerg
Date: Fri Jul 20 21:18:00 UTC 2012
Modified Files:
src/external/gpl3/gcc/dist/libobjc: archive.c encoding.c sendmsg.c
Log Message:
Remove a bunch of broken inline qualifiers that break the -O0 build.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/libobjc/archive.c \
src/external/gpl3/gcc/dist/libobjc/encoding.c \
src/external/gpl3/gcc/dist/libobjc/sendmsg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libobjc/archive.c
diff -u src/external/gpl3/gcc/dist/libobjc/archive.c:1.1.1.1 src/external/gpl3/gcc/dist/libobjc/archive.c:1.2
--- src/external/gpl3/gcc/dist/libobjc/archive.c:1.1.1.1 Tue Jun 21 01:24:52 2011
+++ src/external/gpl3/gcc/dist/libobjc/archive.c Fri Jul 20 21:18:00 2012
@@ -365,7 +365,7 @@ __objc_write_extension (struct objc_type
}
}
-inline int
+int
__objc_write_object (struct objc_typed_stream *stream, id object)
{
unsigned char buf = '\0';
@@ -431,7 +431,7 @@ objc_write_object (struct objc_typed_str
}
}
-inline int
+int
__objc_write_class (struct objc_typed_stream *stream, struct objc_class *class)
{
__objc_write_extension (stream, _BX_CLASS);
@@ -460,7 +460,7 @@ objc_write_class (struct objc_typed_stre
}
-inline int
+int
__objc_write_selector (struct objc_typed_stream *stream, SEL selector)
{
const char *sel_name;
@@ -503,7 +503,7 @@ objc_write_selector (struct objc_typed_s
** Read operations
*/
-inline int
+int
objc_read_char (struct objc_typed_stream *stream, char *val)
{
unsigned char buf;
@@ -530,7 +530,7 @@ objc_read_char (struct objc_typed_stream
}
-inline int
+int
objc_read_unsigned_char (struct objc_typed_stream *stream, unsigned char *val)
{
unsigned char buf;
@@ -551,7 +551,7 @@ objc_read_unsigned_char (struct objc_typ
return len;
}
-inline int
+int
objc_read_short (struct objc_typed_stream *stream, short *value)
{
unsigned char buf[sizeof (short) + 1];
@@ -579,7 +579,7 @@ objc_read_short (struct objc_typed_strea
return len;
}
-inline int
+int
objc_read_unsigned_short (struct objc_typed_stream *stream,
unsigned short *value)
{
@@ -607,7 +607,7 @@ objc_read_unsigned_short (struct objc_ty
}
-inline int
+int
objc_read_int (struct objc_typed_stream *stream, int *value)
{
unsigned char buf[sizeof (int) + 1];
@@ -634,7 +634,7 @@ objc_read_int (struct objc_typed_stream
return len;
}
-inline int
+int
objc_read_long (struct objc_typed_stream *stream, long *value)
{
unsigned char buf[sizeof (long) + 1];
@@ -661,7 +661,7 @@ objc_read_long (struct objc_typed_stream
return len;
}
-inline int
+int
__objc_read_nbyte_uint (struct objc_typed_stream *stream,
unsigned int nbytes, unsigned int *val)
{
@@ -680,7 +680,7 @@ __objc_read_nbyte_uint (struct objc_type
}
-inline int
+int
objc_read_unsigned_int (struct objc_typed_stream *stream,
unsigned int *value)
{
@@ -717,7 +717,7 @@ __objc_read_nbyte_ulong (struct objc_typ
}
-inline int
+int
objc_read_unsigned_long (struct objc_typed_stream *stream,
unsigned long *value)
{
@@ -735,7 +735,7 @@ objc_read_unsigned_long (struct objc_typ
return len;
}
-inline int
+int
objc_read_string (struct objc_typed_stream *stream,
char **string)
{
Index: src/external/gpl3/gcc/dist/libobjc/encoding.c
diff -u src/external/gpl3/gcc/dist/libobjc/encoding.c:1.1.1.1 src/external/gpl3/gcc/dist/libobjc/encoding.c:1.2
--- src/external/gpl3/gcc/dist/libobjc/encoding.c:1.1.1.1 Tue Jun 21 01:24:52 2011
+++ src/external/gpl3/gcc/dist/libobjc/encoding.c Fri Jul 20 21:18:00 2012
@@ -544,7 +544,7 @@ objc_promoted_size (const char *type)
occurring in method prototype encodings.
*/
-inline const char *
+const char *
objc_skip_type_qualifiers (const char *type)
{
while (*type == _C_CONST
@@ -682,7 +682,7 @@ objc_skip_typespec (const char *type)
Skip an offset as part of a method encoding. This is prepended by a
'+' if the argument is passed in registers.
*/
-inline const char *
+const char *
objc_skip_offset (const char *type)
{
if (*type == '+')
Index: src/external/gpl3/gcc/dist/libobjc/sendmsg.c
diff -u src/external/gpl3/gcc/dist/libobjc/sendmsg.c:1.1.1.1 src/external/gpl3/gcc/dist/libobjc/sendmsg.c:1.2
--- src/external/gpl3/gcc/dist/libobjc/sendmsg.c:1.1.1.1 Tue Jun 21 01:24:52 2011
+++ src/external/gpl3/gcc/dist/libobjc/sendmsg.c Fri Jul 20 21:18:00 2012
@@ -90,7 +90,6 @@ Method_t search_for_method_in_list (Meth
id nil_method (id, SEL);
/* Given a selector, return the proper forwarding implementation. */
-inline
IMP
__objc_get_forward_imp (id rcv, SEL sel)
{
@@ -129,7 +128,6 @@ __objc_get_forward_imp (id rcv, SEL sel)
}
/* Given a class and selector, return the selector's implementation. */
-inline
IMP
get_imp (Class class, SEL sel)
{
@@ -190,7 +188,6 @@ get_imp
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: rkujawa
Date: Fri Jul 20 21:31:28 UTC 2012
Modified Files:
src/sys/dev/pci: tdvfb.c tdvfbreg.h
Log Message:
Preliminary blitter support for Voodoo2.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/tdvfb.c src/sys/dev/pci/tdvfbreg.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/tdvfb.c
diff -u src/sys/dev/pci/tdvfb.c:1.2 src/sys/dev/pci/tdvfb.c:1.3
--- src/sys/dev/pci/tdvfb.c:1.2 Fri Jul 20 12:03:32 2012
+++ src/sys/dev/pci/tdvfb.c Fri Jul 20 21:31:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tdvfb.c,v 1.2 2012/07/20 12:03:32 rkujawa Exp $ */
+/* $NetBSD: tdvfb.c,v 1.3 2012/07/20 21:31:28 rkujawa Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tdvfb.c,v 1.2 2012/07/20 12:03:32 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: tdvfb.c,v 1.3 2012/07/20 21:31:28 rkujawa Exp $);
#include sys/param.h
#include sys/systm.h
@@ -75,7 +75,7 @@ static void tdvfb_cvg_set(struct tdvfb_s
static void tdvfb_cvg_unset(struct tdvfb_softc *sc, uint32_t reg,
uint32_t bits);
static uint8_t tdvfb_cvg_dac_read(struct tdvfb_softc *sc, uint32_t reg);
-void tdvfb_cvg_dac_write(struct tdvfb_softc *sc, uint32_t reg,
+static void tdvfb_cvg_dac_write(struct tdvfb_softc *sc, uint32_t reg,
uint32_t val);
static void tdvfb_wait(struct tdvfb_softc *sc);
@@ -96,6 +96,15 @@ static void tdvfb_gendac_set_vid_timing(
static void tdvfb_init_screen(void *cookie, struct vcons_screen *scr,
int existing, long *defattr);
static void tdvfb_init_palette(struct tdvfb_softc *sc);
+/* blitter support */
+static void tdvfb_rectfill(struct tdvfb_softc *sc, int x, int y, int wi,
+ int he, uint32_t color);
+static void tdvfb_bitblt(struct tdvfb_softc *sc, int xs, int ys, int xd,
+ int yd, int wi, int he);
+/* accelerated raster ops */
+static void tdvfb_eraserows(void *cookie, int row, int nrows,
+ long fillattr);
+static void tdvfb_copyrows(void *cookie, int srcrow, int dstrow, int nrows);
CFATTACH_DECL_NEW(tdvfb, sizeof(struct tdvfb_softc),
tdvfb_match, tdvfb_attach, NULL, NULL);
@@ -180,7 +189,7 @@ tdvfb_attach(device_t parent, device_t s
/* Select video mode, 800x600 32bpp 60Hz by default... */
sc-sc_width = 800;
sc-sc_height = 600;
- sc-sc_bpp = 32;
+ sc-sc_bpp = 32; /* XXX: 16 would allow blitter use. */
sc-sc_linebytes = 1024 * (sc-sc_bpp / 8);
sc-sc_videomode = pick_mode_by_ref(sc-sc_width, sc-sc_height, 60);
@@ -263,6 +272,14 @@ tdvfb_init_screen(void *cookie, struct v
ri-ri_height = sc-sc_height;
ri-ri_stride = sc-sc_linebytes;
ri-ri_flg = RI_CENTER;
+
+#if BYTE_ORDER == BIG_ENDIAN
+#if 0 /* XXX: not yet :( */
+ if (sc-sc_bpp == 16)
+ ri-ri_flg |= RI_BITSWAP;
+#endif
+#endif
+
ri-ri_bits = (char *) bus_space_vaddr(sc-sc_cvgt, sc-sc_fbh);
scr-scr_flags |= VCONS_DONT_READ;
@@ -273,6 +290,13 @@ tdvfb_init_screen(void *cookie, struct v
sc-sc_width / ri-ri_font-fontwidth);
ri-ri_hw = scr;
+
+ /* If we are a Voodoo2 and running in 16 bits try to use blitter. */
+ if ((sc-sc_voodootype == TDV_VOODOO_2) (sc-sc_bpp == 16)) {
+ aprint_normal_dev(sc-sc_dev, using CVG blitter\n);
+ ri-ri_ops.eraserows = tdvfb_eraserows;
+ ri-ri_ops.copyrows = tdvfb_copyrows;
+ }
}
static bool
@@ -372,7 +396,12 @@ tdvfb_videomode_set(struct tdvfb_softc *
TDV_INITENABLE_EN_FIFO);
tdvfb_wait(sc);
- lfbmode = TDV_LFBMODE_;
+ if (sc-sc_bpp == 16)
+ lfbmode = TDV_LFBMODE_565;
+ else if (sc-sc_bpp == 32)
+ lfbmode = TDV_LFBMODE_;
+ else
+ return false;
#if BYTE_ORDER == BIG_ENDIAN
lfbmode |= TDV_LFBMODE_BSW_WR | TDV_LFBMODE_BSW_RD;
@@ -759,7 +788,7 @@ tdvfb_cvg_dac_read(struct tdvfb_softc *s
return rv 0xFF;
}
-void
+static void
tdvfb_cvg_dac_write(struct tdvfb_softc *sc, uint32_t reg, uint32_t val)
{
uint32_t wreg;
@@ -775,3 +804,88 @@ tdvfb_cvg_dac_write(struct tdvfb_softc *
tdvfb_wait(sc);
}
+static void
+tdvfb_rectfill(struct tdvfb_softc *sc, int x, int y, int wi, int he,
+uint32_t color)
+{
+ tdvfb_cvg_write(sc, TDV_OFF_BLTSRC, 0);
+ tdvfb_cvg_write(sc, TDV_OFF_BLTDST, 0);
+ tdvfb_cvg_write(sc, TDV_OFF_BLTROP, TDV_BLTROP_COPY);
+ tdvfb_cvg_write(sc, TDV_OFF_BLTXYSTRIDE,
+ sc-sc_linebytes | (sc-sc_linebytes 16));
+ tdvfb_cvg_write(sc, TDV_OFF_BLTDSTXY, x | (y 16));
+ tdvfb_cvg_write(sc, TDV_OFF_BLTSIZE, wi | (he 16));
+ tdvfb_cvg_write(sc, TDV_OFF_BLTCMD, TDV_BLTCMD_RECTFILL |
+ TDV_BLTCMD_LAUNCH | TDV_BLTCMD_FMT_565 3 | TDV_BLTCMD_DSTTILED |
+ TDV_BLTCMD_CLIPRECT );
+ tdvfb_wait(sc);
+}
+
+static void
+tdvfb_bitblt(struct tdvfb_softc *sc, int xs, int ys, int xd, int yd, int wi,
+int he)
+{
+ tdvfb_cvg_write(sc, TDV_OFF_BLTSRC, 0);
+ tdvfb_cvg_write(sc, TDV_OFF_BLTDST, 0);
+ tdvfb_cvg_write(sc, TDV_OFF_BLTROP, TDV_BLTROP_COPY);
+
CVS commit: src/sys/arch/arm/pic
Module Name:src Committed By: matt Date: Fri Jul 20 21:53:57 UTC 2012 Modified Files: src/sys/arch/arm/pic: pic.c Log Message: Fix botched change to use right value for ipl. Thanks jak To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/pic/pic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/pic/pic.c diff -u src/sys/arch/arm/pic/pic.c:1.11 src/sys/arch/arm/pic/pic.c:1.12 --- src/sys/arch/arm/pic/pic.c:1.11 Sat Jul 14 07:52:53 2012 +++ src/sys/arch/arm/pic/pic.c Fri Jul 20 21:53:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pic.c,v 1.11 2012/07/14 07:52:53 matt Exp $ */ +/* $NetBSD: pic.c,v 1.12 2012/07/20 21:53:57 matt Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.11 2012/07/14 07:52:53 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.12 2012/07/20 21:53:57 matt Exp $); #define _INTR_PRIVATE #include sys/param.h @@ -377,7 +377,7 @@ pic_do_pending_ints(register_t psw, int if (ipl = newipl) break; - pic_set_priority(ci, newipl); + pic_set_priority(ci, ipl); pic_list_deliver_irqs(psw, ipl, frame); pic_list_unblock_irqs(); }
CVS commit: [netbsd-6] src/sys/arch/dreamcast/conf
Module Name:src Committed By: riz Date: Fri Jul 20 23:07:58 UTC 2012 Modified Files: src/sys/arch/dreamcast/conf [netbsd-6]: GENERIC Log Message: Pull up following revision(s) (requested by abs in ticket #422): sys/arch/dreamcast/conf/GENERIC: revision 1.107 On a system with no default writable local media, the union file system can be handy To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.105.2.1 src/sys/arch/dreamcast/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/dreamcast/conf/GENERIC diff -u src/sys/arch/dreamcast/conf/GENERIC:1.105 src/sys/arch/dreamcast/conf/GENERIC:1.105.2.1 --- src/sys/arch/dreamcast/conf/GENERIC:1.105 Fri Dec 30 12:47:37 2011 +++ src/sys/arch/dreamcast/conf/GENERIC Fri Jul 20 23:07:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.105 2011/12/30 12:47:37 he Exp $ +# $NetBSD: GENERIC,v 1.105.2.1 2012/07/20 23:07:58 riz Exp $ # # GENERIC machine description file # @@ -84,7 +84,7 @@ file-system PROCFS # /proc #file-system NULLFS # loopback file system #file-system OVERLAY # overlay file system #file-system UMAPFS # NULLFS + uid and gid remapping -#file-system UNION # union file system +file-system UNION # union file system file-system PTYFS # /dev/pts/N support file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: riz
Date: Fri Jul 20 23:10:07 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: uipc_syscalls.c
Log Message:
Pull up following revision(s) (requested by njoly in ticket #423):
sys/kern/uipc_syscalls.c: revision 1.156
Avoid kmem_alloc KASSERT for 0 byte allocation, when tracing processes
that use empty messages with sendmsg/recvmsg.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.154.2.1 src/sys/kern/uipc_syscalls.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/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.154 src/sys/kern/uipc_syscalls.c:1.154.2.1
--- src/sys/kern/uipc_syscalls.c:1.154 Wed Jan 25 16:56:13 2012
+++ src/sys/kern/uipc_syscalls.c Fri Jul 20 23:10:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.154 2012/01/25 16:56:13 christos Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.154.2.1 2012/07/20 23:10:06 riz Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.154 2012/01/25 16:56:13 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.154.2.1 2012/07/20 23:10:06 riz Exp $);
#include opt_pipe.h
@@ -605,7 +605,7 @@ do_sys_sendmsg(struct lwp *l, int s, str
}
}
- if (ktrpoint(KTR_GENIO)) {
+ if (ktrpoint(KTR_GENIO) iovsz 0) {
ktriov = kmem_alloc(iovsz, KM_SLEEP);
memcpy(ktriov, auio.uio_iov, iovsz);
}
@@ -640,9 +640,10 @@ do_sys_sendmsg(struct lwp *l, int s, str
*retsize = len - auio.uio_resid;
bad:
- if (ktriov != NULL) {
+ if (ktrpoint(KTR_GENIO)) {
ktrgeniov(s, UIO_WRITE, ktriov, *retsize, error);
- kmem_free(ktriov, iovsz);
+ if (ktriov != NULL)
+ kmem_free(ktriov, iovsz);
}
if (iov != aiov)
@@ -826,7 +827,7 @@ int
do_sys_recvmsg(struct lwp *l, int s, struct msghdr *mp, struct mbuf **from,
struct mbuf **control, register_t *retsize)
{
- struct iovec aiov[UIO_SMALLIOV], *iov = aiov, *tiov, *ktriov;
+ struct iovec aiov[UIO_SMALLIOV], *iov = aiov, *tiov, *ktriov = NULL;
struct socket *so;
struct uio auio;
size_t len, iovsz;
@@ -880,8 +881,7 @@ do_sys_recvmsg(struct lwp *l, int s, str
}
}
- ktriov = NULL;
- if (ktrpoint(KTR_GENIO)) {
+ if (ktrpoint(KTR_GENIO) iovsz 0) {
ktriov = kmem_alloc(iovsz, KM_SLEEP);
memcpy(ktriov, auio.uio_iov, iovsz);
}
@@ -897,9 +897,10 @@ do_sys_recvmsg(struct lwp *l, int s, str
/* Some data transferred */
error = 0;
- if (ktriov != NULL) {
+ if (ktrpoint(KTR_GENIO)) {
ktrgeniov(s, UIO_READ, ktriov, len, error);
- kmem_free(ktriov, iovsz);
+ if (ktriov != NULL)
+ kmem_free(ktriov, iovsz);
}
if (error != 0) {
CVS commit: [netbsd-6] src/sys/compat/linux32/arch/amd64
Module Name:src
Committed By: riz
Date: Fri Jul 20 23:12:48 UTC 2012
Modified Files:
src/sys/compat/linux32/arch/amd64 [netbsd-6]: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
syscalls.master
Log Message:
Pull up following revision(s) (requested by christos in ticket #424):
sys/compat/linux32/arch/amd64/linux32_syscallargs.h: revision 1.67
sys/compat/linux32/arch/amd64/syscalls.master: revision 1.62
sys/compat/linux32/arch/amd64/linux32_syscall.h: revision 1.67
sys/compat/linux32/arch/amd64/linux32_sysent.c: revision 1.67
sys/compat/linux32/arch/amd64/linux32_syscalls.c: revision 1.67
add xattr stubs
regen
To generate a diff of this commit:
cvs rdiff -u -r1.65.6.1 -r1.65.6.2 \
src/sys/compat/linux32/arch/amd64/linux32_syscall.h \
src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \
src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \
src/sys/compat/linux32/arch/amd64/linux32_sysent.c
cvs rdiff -u -r1.60.6.1 -r1.60.6.2 \
src/sys/compat/linux32/arch/amd64/syscalls.master
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/linux32/arch/amd64/linux32_syscall.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65.6.1 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65.6.2
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.65.6.1 Sat May 19 15:19:42 2012
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Fri Jul 20 23:12:47 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.65.6.1 2012/05/19 15:19:42 riz Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.65.6.2 2012/07/20 23:12:47 riz Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2012/05/10 19:40:46 christos Exp
+ * created from NetBSD: syscalls.master,v 1.62 2012/07/13 18:21:33 christos Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -564,6 +564,42 @@
/* syscall: gettid ret: pid_t args: */
#define LINUX32_SYS_gettid 224
+/* syscall: setxattr ret: int args: char * char * void * size_t int */
+#define LINUX32_SYS_setxattr 226
+
+/* syscall: lsetxattr ret: int args: char * char * void * size_t int */
+#define LINUX32_SYS_lsetxattr 227
+
+/* syscall: fsetxattr ret: int args: int char * void * size_t int */
+#define LINUX32_SYS_fsetxattr 228
+
+/* syscall: getxattr ret: ssize_t args: char * char * void * size_t */
+#define LINUX32_SYS_getxattr 229
+
+/* syscall: lgetxattr ret: ssize_t args: char * char * void * size_t */
+#define LINUX32_SYS_lgetxattr 230
+
+/* syscall: fgetxattr ret: ssize_t args: int char * void * size_t */
+#define LINUX32_SYS_fgetxattr 231
+
+/* syscall: listxattr ret: ssize_t args: char * char * size_t */
+#define LINUX32_SYS_listxattr 232
+
+/* syscall: llistxattr ret: ssize_t args: char * char * size_t */
+#define LINUX32_SYS_llistxattr 233
+
+/* syscall: flistxattr ret: ssize_t args: int char * size_t */
+#define LINUX32_SYS_flistxattr 234
+
+/* syscall: removexattr ret: int args: char * char * */
+#define LINUX32_SYS_removexattr 235
+
+/* syscall: lremovexattr ret: int args: char * char * */
+#define LINUX32_SYS_lremovexattr 236
+
+/* syscall: fremovexattr ret: int args: int char * */
+#define LINUX32_SYS_fremovexattr 237
+
/* syscall: tkill ret: int args: int int */
#define LINUX32_SYS_tkill 238
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65.6.1 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65.6.2
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.65.6.1 Sat May 19 15:19:42 2012
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Fri Jul 20 23:12:47 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.65.6.1 2012/05/19 15:19:42 riz Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.65.6.2 2012/07/20 23:12:47 riz Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2012/05/10 19:40:46 christos Exp
+ * created from NetBSD: syscalls.master,v 1.62 2012/07/13 18:21:33 christos Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -768,6 +768,30 @@ check_syscall_args(linux32_sys_getdents6
struct linux32_sys_fcntl64_args;
+struct linux_sys_setxattr_args;
+
+struct linux_sys_lsetxattr_args;
+
+struct linux_sys_fsetxattr_args;
+
+struct linux_sys_getxattr_args;
+
+struct linux_sys_lgetxattr_args;
+
+struct linux_sys_fgetxattr_args;
+
+struct linux_sys_listxattr_args;
+
+struct linux_sys_llistxattr_args;
+
+struct linux_sys_flistxattr_args;
+
+struct linux_sys_removexattr_args;
+
+struct linux_sys_lremovexattr_args;
+
+struct linux_sys_fremovexattr_args;
+
struct linux32_sys_tkill_args {
syscallarg(int) tid;
syscallarg(int) sig;
@@ -1260,6
CVS commit: [netbsd-6] src/usr.bin/tftp
Module Name:src
Committed By: riz
Date: Fri Jul 20 23:14:23 UTC 2012
Modified Files:
src/usr.bin/tftp [netbsd-6]: main.c tftp.c
Log Message:
Pull up following revision(s) (requested by he in ticket #425):
usr.bin/tftp/main.c: revision 1.32
usr.bin/tftp/tftp.c: revision 1.34
Undo the non-sharing of the toplevel jmp_buf between main.c and tftp.c,
so that we don't get a core dump if a transfer time-out is experienced.
Also, get rid of an extranous newline printed in the case of time-out.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.2.1 src/usr.bin/tftp/main.c
cvs rdiff -u -r1.32 -r1.32.4.1 src/usr.bin/tftp/tftp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tftp/main.c
diff -u src/usr.bin/tftp/main.c:1.30 src/usr.bin/tftp/main.c:1.30.2.1
--- src/usr.bin/tftp/main.c:1.30 Mon Jan 16 17:38:16 2012
+++ src/usr.bin/tftp/main.c Fri Jul 20 23:14:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.30 2012/01/16 17:38:16 christos Exp $ */
+/* $NetBSD: main.c,v 1.30.2.1 2012/07/20 23:14:23 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)main.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: main.c,v 1.30 2012/01/16 17:38:16 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.30.2.1 2012/07/20 23:14:23 riz Exp $);
#endif
#endif /* not lint */
@@ -87,6 +87,8 @@ u_int rexmtval = TIMEOUT;
ushort mcmasterslave;
int maxtimeout = 5 * TIMEOUT;
+jmp_buf toplevel;
+
static int connected;
static char mode[32];
static char line[LBUFLEN];
@@ -94,7 +96,6 @@ static int margc;
static char *margv[20];
static const char *prompt = tftp;
static charhostname[MAXHOSTNAMELEN];
-static jmp_buf toplevel;
static void get(int, char **);
static void help(int, char **);
Index: src/usr.bin/tftp/tftp.c
diff -u src/usr.bin/tftp/tftp.c:1.32 src/usr.bin/tftp/tftp.c:1.32.4.1
--- src/usr.bin/tftp/tftp.c:1.32 Sat Sep 17 15:15:46 2011
+++ src/usr.bin/tftp/tftp.c Fri Jul 20 23:14:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tftp.c,v 1.32 2011/09/17 15:15:46 christos Exp $ */
+/* $NetBSD: tftp.c,v 1.32.4.1 2012/07/20 23:14:23 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)tftp.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: tftp.c,v 1.32 2011/09/17 15:15:46 christos Exp $);
+__RCSID($NetBSD: tftp.c,v 1.32.4.1 2012/07/20 23:14:23 riz Exp $);
#endif
#endif /* not lint */
@@ -67,9 +67,10 @@ __RCSID($NetBSD: tftp.c,v 1.32 2011/09/
#include extern.h
#include tftpsubs.h
+extern jmp_buf toplevel;
+
charackbuf[PKTSIZE];
int timeout;
-jmp_buf toplevel;
jmp_buf timeoutbuf;
static void nak __P((int, struct sockaddr *));
@@ -761,7 +762,7 @@ timer(sig)
timeout += rexmtval;
if (timeout = maxtimeout) {
- (void)printf(Transfer timed out.\n);
+ (void)printf(Transfer timed out.);
longjmp(toplevel, -1);
}
longjmp(timeoutbuf, 1);
CVS commit: [netbsd-6] src/etc
Module Name:src Committed By: riz Date: Fri Jul 20 23:16:29 UTC 2012 Modified Files: src/etc [netbsd-6]: master.passwd Log Message: Pull up following revision(s) (requested by gson in ticket #426): etc/master.passwd: revision 1.46 Change root's default shell to /bin/sh, to provide a default which has command line editing, tab completion, and other features users have come to expect from a modern OS. Discussed on current-users approximately two weeks ago. Should be pulled up for NetBSD 6.0. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.2.1 src/etc/master.passwd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/master.passwd diff -u src/etc/master.passwd:1.45 src/etc/master.passwd:1.45.2.1 --- src/etc/master.passwd:1.45 Sat Jan 28 02:17:29 2012 +++ src/etc/master.passwd Fri Jul 20 23:16:29 2012 @@ -1,4 +1,4 @@ -root::0:0::0:0:Charlie :/root:/bin/csh +root::0:0::0:0:Charlie :/root:/bin/sh toor:*:0:0::0:0:Bourne-again Superuser:/root:/bin/sh daemon:*:1:1::0:0:The devil himself:/:/sbin/nologin operator:*:2:5::0:0:System :/usr/guest/operator:/sbin/nologin
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Jul 20 23:18:03 UTC 2012 Modified Files: src/sys/dev/usb: usb.c Log Message: now that the task threads are created earlier, move the call to usb_create_event_thread() back into usb_doattach(), so that eg, usb_discover() never operates when the root_hub is not setup. fixes a crash joerg@ reported. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/dev/usb/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/dev/usb/usb.c diff -u src/sys/dev/usb/usb.c:1.134 src/sys/dev/usb/usb.c:1.135 --- src/sys/dev/usb/usb.c:1.134 Fri Jul 20 07:31:14 2012 +++ src/sys/dev/usb/usb.c Fri Jul 20 23:18:02 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: usb.c,v 1.134 2012/07/20 07:31:14 mrg Exp $ */ +/* $NetBSD: usb.c,v 1.135 2012/07/20 23:18:02 mrg Exp $ */ /* * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.134 2012/07/20 07:31:14 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.135 2012/07/20 23:18:02 mrg Exp $); #include opt_compat_netbsd.h #include opt_usb.h @@ -205,7 +205,6 @@ usb_attach(device_t parent, device_t sel sc-sc_bus-methods-get_lock(sc-sc_bus, sc-sc_bus-lock); else sc-sc_bus-lock = NULL; - usb_create_event_thread(self); RUN_ONCE(init_control, usb_once_init); config_interrupts(self, usb_doattach); @@ -297,6 +296,7 @@ usb_doattach(device_t self) return; } sc-sc_bus-root_hub = dev; + usb_create_event_thread(self); #if 1 /* * Turning this code off will delay attachment of USB devices
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Fri Jul 20 23:20:34 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 422-426 To generate a diff of this commit: cvs rdiff -u -r1.1.2.156 -r1.1.2.157 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.156 src/doc/CHANGES-6.0:1.1.2.157 --- src/doc/CHANGES-6.0:1.1.2.156 Mon Jul 16 22:14:19 2012 +++ src/doc/CHANGES-6.0 Fri Jul 20 23:20:34 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.156 2012/07/16 22:14:19 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.157 2012/07/20 23:20:34 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6369,3 +6369,34 @@ usr.sbin/npf/npftest/libnpftest/npf_tabl Rework NPF tables and fix support for IPv6. [rmind, ticket #421] +sys/arch/dreamcast/conf/GENERIC 1.107 + + Add UNION to dreamcast GENERIC. + [abs, ticket #422] + +sys/kern/uipc_syscalls.c 1.156 via patch + + Don't crash when tracing processes that use empty messages with + sendmsg/recvmsg. + [njoly, ticket #423] + +sys/compat/linux32/arch/amd64/linux32_syscall.h 1.67 +sys/compat/linux32/arch/amd64/linux32_syscallargs.h 1.67 +sys/compat/linux32/arch/amd64/linux32_syscalls.c 1.67 +sys/compat/linux32/arch/amd64/linux32_sysent.c 1.67 +sys/compat/linux32/arch/amd64/syscalls.master 1.62 + + Add xattr stubs to linux32 compat. + [christos, ticket #424] + +usr.bin/tftp/main.c1.32 +usr.bin/tftp/tftp.c1.34 + + Avoid core dump if a transfer time-out is experienced. + [he, ticket #425] + +etc/master.passwd1.46 + + Change root's default shell to /bin/sh. + [gson, ticket #426] +
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: riz
Date: Fri Jul 20 23:49:32 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-6]: ukbd.c
Log Message:
Pull up following revision(s) (requested by khorben in ticket #427):
sys/dev/usb/ukbd.c: revision 1.118
Fixed a potential out-of-bounds array access when translating keycodes
for the gdium keyboard.
Reviewed by macallan@
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.115.2.1 src/sys/dev/usb/ukbd.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/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.115 src/sys/dev/usb/ukbd.c:1.115.2.1
--- src/sys/dev/usb/ukbd.c:1.115 Fri Dec 23 00:51:47 2011
+++ src/sys/dev/usb/ukbd.c Fri Jul 20 23:49:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.115 2011/12/23 00:51:47 jakllsch Exp $*/
+/* $NetBSD: ukbd.c,v 1.115.2.1 2012/07/20 23:49:31 riz Exp $*/
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.115 2011/12/23 00:51:47 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.115.2.1 2012/07/20 23:49:31 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -169,7 +169,8 @@ Static const struct ukbd_keycodetrans tr
#endif
{ 76, 71 }, /* delete - scroll lock */
{ 81, 78 }, /* down - page down */
- { 82, 75 } /* up - page up */
+ { 82, 75 }, /* up - page up */
+ { 0, 0 }
};
#endif
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: riz
Date: Fri Jul 20 23:55:54 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-6]: ukbd.c
Log Message:
Pull up following revision(s) (requested by khorben in ticket #428):
sys/dev/usb/ukbd.c: revision 1.120
Convert keycodes 0x7f, 0x80 and 0x81 to PMF events VOLUME_TOGGLE,
VOLUME_UP and VOLUME_DOWN as observed on my Sun Type 7 USB keyboard, and
according to the documentation mentioned above.
quot;works herequot; macallan@ and myself
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.1 -r1.115.2.2 src/sys/dev/usb/ukbd.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/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.115.2.1 src/sys/dev/usb/ukbd.c:1.115.2.2
--- src/sys/dev/usb/ukbd.c:1.115.2.1 Fri Jul 20 23:49:31 2012
+++ src/sys/dev/usb/ukbd.c Fri Jul 20 23:55:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.115.2.1 2012/07/20 23:49:31 riz Exp $*/
+/* $NetBSD: ukbd.c,v 1.115.2.2 2012/07/20 23:55:54 riz Exp $*/
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.115.2.1 2012/07/20 23:49:31 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.115.2.2 2012/07/20 23:55:54 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -174,6 +174,13 @@ Static const struct ukbd_keycodetrans tr
};
#endif
+Static const struct ukbd_keycodetrans trtab_generic[] = {
+ { 0x7f, IS_PMF | PMFE_AUDIO_VOLUME_TOGGLE },
+ { 0x80, IS_PMF | PMFE_AUDIO_VOLUME_UP },
+ { 0x81, IS_PMF | PMFE_AUDIO_VOLUME_DOWN },
+ { 0x00, 0x00 }
+};
+
#if defined(__NetBSD__) defined(WSDISPLAY_COMPAT_RAWKBD)
#define NN 0 /* no translation */
/*
@@ -669,6 +676,8 @@ ukbd_intr(struct uhidev *addr, void *ibu
}
#endif
+ ukbd_translate_keycodes(sc, ud, trtab_generic);
+
if ((sc-sc_flags FLAG_DEBOUNCE) !(sc-sc_flags FLAG_POLLING)) {
/*
* Some keyboards have a peculiar quirk. They sometimes
CVS commit: [netbsd-6] src/sys/arch/x86/x86
Module Name:src
Committed By: riz
Date: Fri Jul 20 23:57:39 UTC 2012
Modified Files:
src/sys/arch/x86/x86 [netbsd-6]: x86_autoconf.c
Log Message:
Pull up following revision(s) (requested by mhitch in ticket #429):
sys/arch/x86/x86/x86_autoconf.c: revision 1.64
fix the comparison to determine if a biosdev is a cdrom (from mhitch)
To generate a diff of this commit:
cvs rdiff -u -r1.62.8.1 -r1.62.8.2 src/sys/arch/x86/x86/x86_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.62.8.1 src/sys/arch/x86/x86/x86_autoconf.c:1.62.8.2
--- src/sys/arch/x86/x86/x86_autoconf.c:1.62.8.1 Thu Jul 5 18:12:47 2012
+++ src/sys/arch/x86/x86/x86_autoconf.c Fri Jul 20 23:57:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.62.8.1 2012/07/05 18:12:47 riz Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.62.8.2 2012/07/20 23:57:38 riz Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.62.8.1 2012/07/05 18:12:47 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.62.8.2 2012/07/20 23:57:38 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -454,14 +454,20 @@ findroot(void)
* No booted device found; check CD-ROM boot at last.
*
* Our bootloader assumes CD-ROM boot if biosdev is larger
- * than the number of hard drives recognized by the BIOS.
- * The number of drives can be found in BTINFO_BIOSGEOM here.
+ * or equal than the number of hard drives recognized by the
+ * BIOS. The number of drives can be found in BTINFO_BIOSGEOM
+ * here. For example, if we have wd0, wd1, and cd0:
+ *
+ * big-num = 2 (for wd0 and wd1)
+ * bid-biosdev = 0x80 (wd0)
+ * bid-biosdev = 0x81 (wd1)
+ * bid-biosdev = 0x82 (cd0)
*
* See src/sys/arch/i386/stand/boot/devopen.c and
* src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c .
*/
if ((big = lookup_bootinfo(BTINFO_BIOSGEOM)) != NULL
- bid-biosdev 0x80 + big-num) {
+ bid-biosdev = 0x80 + big-num) {
/*
* XXX
* There is no proper way to detect which unit is
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: riz
Date: Sat Jul 21 00:00:14 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: sys_sig.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #430):
sys/kern/sys_sig.c: revision 1.38
From Roger Pau Monne: kill(2) called for a zombie process should return 0,
according to:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/kill.html
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.6.1 src/sys/kern/sys_sig.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/kern/sys_sig.c
diff -u src/sys/kern/sys_sig.c:1.36 src/sys/kern/sys_sig.c:1.36.6.1
--- src/sys/kern/sys_sig.c:1.36 Fri Nov 18 03:34:13 2011
+++ src/sys/kern/sys_sig.c Sat Jul 21 00:00:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_sig.c,v 1.36 2011/11/18 03:34:13 christos Exp $ */
+/* $NetBSD: sys_sig.c,v 1.36.6.1 2012/07/21 00:00:13 riz Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.36 2011/11/18 03:34:13 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.36.6.1 2012/07/21 00:00:13 riz Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -242,10 +242,11 @@ kill1(struct lwp *l, pid_t pid, ksiginfo
if (pid 0) {
/* kill single process */
mutex_enter(proc_lock);
- p = proc_find(pid);
- if (p == NULL) {
+ p = proc_find_raw(pid);
+ if (p == NULL || (p-p_stat != SACTIVE p-p_stat != SSTOP)) {
mutex_exit(proc_lock);
- return ESRCH;
+ /* IEEE Std 1003.1-2001: return success for zombies */
+ return p ? 0 : ESRCH;
}
mutex_enter(p-p_lock);
error = kauth_authorize_process(l-l_cred,
CVS commit: [netbsd-6] src/sys/compat/netbsd32
Module Name:src Committed By: riz Date: Sat Jul 21 00:01:45 UTC 2012 Modified Files: src/sys/compat/netbsd32 [netbsd-6]: netbsd32_lwp.c Log Message: Pull up following revision(s) (requested by christos in ticket #431): sys/compat/netbsd32/netbsd32_lwp.c: revision 1.14 always allocate a full ucontext structure so that we don't corrupt memory. XXX: needs pullup to 6? To generate a diff of this commit: cvs rdiff -u -r1.12.10.1 -r1.12.10.2 src/sys/compat/netbsd32/netbsd32_lwp.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/compat/netbsd32/netbsd32_lwp.c diff -u src/sys/compat/netbsd32/netbsd32_lwp.c:1.12.10.1 src/sys/compat/netbsd32/netbsd32_lwp.c:1.12.10.2 --- src/sys/compat/netbsd32/netbsd32_lwp.c:1.12.10.1 Mon May 21 15:25:59 2012 +++ src/sys/compat/netbsd32/netbsd32_lwp.c Sat Jul 21 00:01:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_lwp.c,v 1.12.10.1 2012/05/21 15:25:59 riz Exp $ */ +/* $NetBSD: netbsd32_lwp.c,v 1.12.10.2 2012/07/21 00:01:45 riz Exp $ */ /* * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation. @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_lwp.c,v 1.12.10.1 2012/05/21 15:25:59 riz Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_lwp.c,v 1.12.10.2 2012/07/21 00:01:45 riz Exp $); #include sys/types.h #include sys/param.h @@ -60,7 +60,7 @@ netbsd32__lwp_create(struct lwp *l, cons KASSERT(p-p_emul-e_ucsize == sizeof(*newuc)); - newuc = kmem_alloc(sizeof(ucontext32_t), KM_SLEEP); + newuc = kmem_alloc(sizeof(ucontext_t), KM_SLEEP); error = copyin(SCARG_P32(uap, ucp), newuc, p-p_emul-e_ucsize); if (error) goto fail; @@ -85,7 +85,7 @@ netbsd32__lwp_create(struct lwp *l, cons return copyout(lid, SCARG_P32(uap, new_lwp), sizeof(lid)); fail: - kmem_free(newuc, sizeof(*newuc)); + kmem_free(newuc, sizeof(ucontext_t)); return error; }
CVS commit: [netbsd-6] src/sys/arch/i386/stand/lib
Module Name:src
Committed By: riz
Date: Sat Jul 21 00:03:19 UTC 2012
Modified Files:
src/sys/arch/i386/stand/lib [netbsd-6]: biosdisk.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #432):
sys/arch/i386/stand/lib/biosdisk.c: revision 1.42
Apply patch:
PR/46583: BIOS bootloader problems with partitions that start above 1TB
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.40.2.1 -r1.40.2.2 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.40.2.1 src/sys/arch/i386/stand/lib/biosdisk.c:1.40.2.2
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.40.2.1 Sun Jun 24 16:17:40 2012
+++ src/sys/arch/i386/stand/lib/biosdisk.c Sat Jul 21 00:03:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.40.2.1 2012/06/24 16:17:40 jdc Exp $ */
+/* $NetBSD: biosdisk.c,v 1.40.2.2 2012/07/21 00:03:19 riz Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -416,7 +416,7 @@ read_minix_subp(struct biosdisk *d, stru
if (readsects(d-ll, sector, 1, d-buf, 0)) {
#ifdef DISK_DEBUG
- printf(Error reading MFS sector %d\n, sector);
+ printf(Error reading MFS sector %PRId64\n, sector);
#endif
return EIO;
}
@@ -445,10 +445,11 @@ read_label(struct biosdisk *d)
struct disklabel dflt_lbl;
struct mbr_partition mbr[MBR_PART_COUNT];
struct partition *p;
- int sector, i;
+ uint32_t sector;
+ int i;
int error;
int typ;
- int ext_base, this_ext, next_ext;
+ uint32_t ext_base, this_ext, next_ext;
#ifdef COMPAT_386BSD_MBRPART
int sector_386bsd = -1;
#endif
@@ -473,7 +474,7 @@ read_label(struct biosdisk *d)
next_ext = 0;
if (readsects(d-ll, this_ext, 1, d-buf, 0)) {
#ifdef DISK_DEBUG
- printf(error reading MBR sector %d\n, this_ext);
+ printf(error reading MBR sector %u\n, this_ext);
#endif
return EIO;
}
@@ -486,7 +487,7 @@ read_label(struct biosdisk *d)
continue;
sector = this_ext + mbr[i].mbrp_start;
#ifdef DISK_DEBUG
- printf(ptn type %d in sector %d\n, typ, sector);
+ printf(ptn type %d in sector %u\n, typ, sector);
#endif
if (typ == MBR_PTYPE_MINIX_14B) {
if (!read_minix_subp(d, dflt_lbl,
CVS commit: [netbsd-6] src/sys/arch/sparc/stand/ofwboot
Module Name:src
Committed By: riz
Date: Sat Jul 21 00:04:56 UTC 2012
Modified Files:
src/sys/arch/sparc/stand/ofwboot [netbsd-6]: net.c net.h ofdev.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #433):
sys/arch/sparc/stand/ofwboot/net.h: revision 1.3
sys/arch/sparc/stand/ofwboot/net.c: revision 1.8
sys/arch/sparc/stand/ofwboot/ofdev.c: revision 1.33
Fix tftpboot which was broken by my botched WARNSfy in last year.
Also add comments that mention libsa tftp requires network device socket
in f_devdata in struct open_file, from spz@ in PR port-sparc64/46652.
Briefly tested tftpboot and nfsboot on Ultra5.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.10.1 src/sys/arch/sparc/stand/ofwboot/net.c
cvs rdiff -u -r1.2 -r1.2.14.1 src/sys/arch/sparc/stand/ofwboot/net.h
cvs rdiff -u -r1.32 -r1.32.10.1 src/sys/arch/sparc/stand/ofwboot/ofdev.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/sparc/stand/ofwboot/net.c
diff -u src/sys/arch/sparc/stand/ofwboot/net.c:1.7 src/sys/arch/sparc/stand/ofwboot/net.c:1.7.10.1
--- src/sys/arch/sparc/stand/ofwboot/net.c:1.7 Sat May 21 15:50:42 2011
+++ src/sys/arch/sparc/stand/ofwboot/net.c Sat Jul 21 00:04:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.7 2011/05/21 15:50:42 tsutsui Exp $ */
+/* $NetBSD: net.c,v 1.7.10.1 2012/07/21 00:04:56 riz Exp $ */
/*
* Copyright (C) 1995 Wolfgang Solfrank.
@@ -180,14 +180,28 @@ net_mountroot_bootp(void)
return (0);
}
+/*
+ * libsa's tftp_open expects a pointer to netdev_sock, i.e. an (int *),
+ * in f_devdata, a pointer to which gets handed down from devopen().
+ *
+ * Do not expect booting via different methods to have the same
+ * requirements or semantics.
+ *
+ * net_tftp_bootp uses net_mountroot_bootp because that incidentially does
+ * most of what it needs to do. It of course in no manner actually mounts
+ * anything, all that routine actually does is prepare the socket for the
+ * necessary net access, and print info for the user.
+ */
+
int
-net_tftp_bootp(struct of_dev *op)
+net_tftp_bootp(int **sock)
{
net_mountroot_bootp();
if (myip.s_addr == 0)
return(ENOENT);
+ *sock = netdev_sock;
return (0);
}
Index: src/sys/arch/sparc/stand/ofwboot/net.h
diff -u src/sys/arch/sparc/stand/ofwboot/net.h:1.2 src/sys/arch/sparc/stand/ofwboot/net.h:1.2.14.1
--- src/sys/arch/sparc/stand/ofwboot/net.h:1.2 Sat May 21 15:50:42 2011
+++ src/sys/arch/sparc/stand/ofwboot/net.h Sat Jul 21 00:04:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: net.h,v 1.2 2011/05/21 15:50:42 tsutsui Exp $ */
+/* $NetBSD: net.h,v 1.2.14.1 2012/07/21 00:04:56 riz Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
int net_open(struct of_dev *);
int net_close(struct of_dev *);
-int net_tftp_bootp(struct of_dev *);
+int net_tftp_bootp(int **);
int net_mountroot(void);
#endif /* _OFWBOOT_NET_H */
Index: src/sys/arch/sparc/stand/ofwboot/ofdev.c
diff -u src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.32 src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.32.10.1
--- src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.32 Wed Jun 1 11:42:18 2011
+++ src/sys/arch/sparc/stand/ofwboot/ofdev.c Sat Jul 21 00:04:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdev.c,v 1.32 2011/06/01 11:42:18 tsutsui Exp $ */
+/* $NetBSD: ofdev.c,v 1.32.10.1 2012/07/21 00:04:56 riz Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -536,7 +536,7 @@ open_again:
if (!strncmp(*file,/tftp:,6)) {
*file += 6;
memcpy(file_system[0], file_system_tftp, sizeof file_system[0]);
- if (net_tftp_bootp(of-f_devdata)) {
+ if (net_tftp_bootp((int **)of-f_devdata)) {
net_close(ofdev);
goto bad;
}
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat Jul 21 00:05:42 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 427-433. To generate a diff of this commit: cvs rdiff -u -r1.1.2.157 -r1.1.2.158 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.157 src/doc/CHANGES-6.0:1.1.2.158 --- src/doc/CHANGES-6.0:1.1.2.157 Fri Jul 20 23:20:34 2012 +++ src/doc/CHANGES-6.0 Sat Jul 21 00:05:42 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.157 2012/07/20 23:20:34 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.158 2012/07/21 00:05:42 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6400,3 +6400,43 @@ etc/master.passwd1.46 Change root's default shell to /bin/sh. [gson, ticket #426] +sys/dev/usb/ukbd.c1.118 + + Fix a potential out-of-bounds array access when translating keycodes + for the gdium keyboard. + [khorben, ticket #427] + +sys/dev/usb/ukbd.c1.120 via patch + + Convert keycodes to PMF events. + [khorben, ticket #428] + +sys/arch/x86/x86/x86_autoconf.c 1.64 + + Fix the comparison to determine if a biosdev is a cdrom. + [mhitch, ticket #429] + +sys/kern/sys_sig.c1.38 + + Make kill(2) called for a zombie process return 0. + [christos, ticket #430] + +sys/compat/netbsd32/netbsd32_lwp.c 1.14 + + Fix memory corruption issue with compat32 threads. + [christos, ticket #431] + +sys/arch/i386/stand/lib/biosdisk.c 1.42 + + Fix BIOS bootloader problems with partitions that start above 1TB. + PR#46583. + [tsutsui, ticket #432] + +sys/arch/sparc/stand/ofwboot/net.c 1.8 +sys/arch/sparc/stand/ofwboot/net.h 1.3 +sys/arch/sparc/stand/ofwboot/ofdev.c 1.33 + + Fix tftpboot failure of sparc/sparc64 ofwboot as mentioned in + PR#46652. + [tsutsui, ticket #433] +
CVS commit: src/sys/dev/marvell
Module Name:src
Committed By: kiyohara
Date: Sat Jul 21 04:21:14 UTC 2012
Modified Files:
src/sys/dev/marvell: gttwsi.c
Log Message:
Don't send a stop bit immediately after start bit transmission.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/marvell/gttwsi.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/marvell/gttwsi.c
diff -u src/sys/dev/marvell/gttwsi.c:1.5 src/sys/dev/marvell/gttwsi.c:1.6
--- src/sys/dev/marvell/gttwsi.c:1.5 Sun Oct 10 04:49:48 2010
+++ src/sys/dev/marvell/gttwsi.c Sat Jul 21 04:21:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: gttwsi.c,v 1.5 2010/10/10 04:49:48 kiyohara Exp $ */
+/* $NetBSD: gttwsi.c,v 1.6 2012/07/21 04:21:14 kiyohara Exp $ */
/*
* Copyright (c) 2008 Eiji Kawauchi.
* All rights reserved.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gttwsi.c,v 1.5 2010/10/10 04:49:48 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: gttwsi.c,v 1.6 2012/07/21 04:21:14 kiyohara Exp $);
#include locators.h
#include sys/param.h
@@ -391,9 +391,16 @@ gttwsi_wait(struct gttwsi_softc *sc, uin
return EIO;
}
- if ((flags I2C_F_STOP) expect != STAT_RSCT
- expect != STAT_MRRD_AT expect != STAT_ARBT_AR)
- error = gttwsi_send_stop(sc, flags);
+ if (flags I2C_F_STOP)
+ switch (expect) {
+ case STAT_SCT:
+ case STAT_RSCT:
+ case STAT_MRRD_AT:
+ case STAT_ARBT_AR:
+ break;
+ default:
+ error = gttwsi_send_stop(sc, flags);
+ }
return error;
}
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: kiyohara Date: Sat Jul 21 04:23:16 UTC 2012 Modified Files: src/sys/dev/marvell: gttwsireg.h Log Message: TWSI size is 0x100. Not 0x1000. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/marvell/gttwsireg.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/marvell/gttwsireg.h diff -u src/sys/dev/marvell/gttwsireg.h:1.1 src/sys/dev/marvell/gttwsireg.h:1.2 --- src/sys/dev/marvell/gttwsireg.h:1.1 Wed Apr 28 13:51:56 2010 +++ src/sys/dev/marvell/gttwsireg.h Sat Jul 21 04:23:16 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: gttwsireg.h,v 1.1 2010/04/28 13:51:56 kiyohara Exp $ */ +/* $NetBSD: gttwsireg.h,v 1.2 2012/07/21 04:23:16 kiyohara Exp $ */ /* * Copyright (c) 2008 Eiji Kawauchi. @@ -27,7 +27,7 @@ #ifndef _GTTWSIREG_H_ #define _GTTWSIREG_H_ -#define GTTWSI_SIZE 0x1000 +#define GTTWSI_SIZE 0x100 #define TWSI_SLAVEADDR 0x00 #define TWSI_EXTEND_SLAVEADDR 0x10
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: kiyohara Date: Sat Jul 21 04:30:34 UTC 2012 Modified Files: src/sys/arch/arm/marvell: kirkwoodreg.h Log Message: Add some comments of 88F6282 and TWSI column. Add IRQ and BASE for TWSI1. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/marvell/kirkwoodreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/marvell/kirkwoodreg.h diff -u src/sys/arch/arm/marvell/kirkwoodreg.h:1.2 src/sys/arch/arm/marvell/kirkwoodreg.h:1.3 --- src/sys/arch/arm/marvell/kirkwoodreg.h:1.2 Wed Jul 18 09:51:23 2012 +++ src/sys/arch/arm/marvell/kirkwoodreg.h Sat Jul 21 04:30:34 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kirkwoodreg.h,v 1.2 2012/07/18 09:51:23 kiyohara Exp $ */ +/* $NetBSD: kirkwoodreg.h,v 1.3 2012/07/21 04:30:34 kiyohara Exp $ */ /* * Copyright (c) 2007, 2008 KIYOHARA Takashi * All rights reserved. @@ -32,11 +32,14 @@ #include dev/marvell/mvgbereg.h /* - *MHz TCLK GbE SATA TDMI Audio MTS GPIO - * 6180: 600/800, 166, x1, -,-, o, -, 30 - * 6190: 600, 166, *x2, x1,-, -, -, 36 * GbEx1+100BTx1 - * 6192: 800, 166, x2, x2,o, o, o, 36 - * 6281: 1.0/1.2/1.5, 200, x2, x2,o, o, o, 50 + *MHz TCLK GbE SATA TDMI Audio MTS GPIO TSens TWSI + * 6180: 600/800, 166, x1, -, -,o, -, 30,-, x1 + * 6190: 600, 166, *x2, x1, -,-, -, 36,-, x1 + * 6192: 800, 166, x2, x2, o,o, o, 36,-, x1 + * 6281: 1.0/1.2/1.5, 200, x2, x2, o,o, o, 50,-, x1 + * 6282: ?-2.0, 200, x2, x2, o,o, o, 50,o, x2 + * + * * GbE x1 + 100BT x1 */ #define KIRKWOOD_UNITID_DDR MVSOC_UNITID_DDR @@ -92,6 +95,7 @@ #define KIRKWOOD_IRQ_TWSI 29 /* TWSI interrupt */ #define KIRKWOOD_IRQ_AVBINT 30 /* AVB Interrupt */ #define KIRKWOOD_IRQ_TDMINT 31 /* TDM Interrupt */ +#define KIRKWOOD_IRQ_TWSI1 32 /* TWSI1 interrupt */ #define KIRKWOOD_IRQ_UART0INT 33 /* UART0 */ #define KIRKWOOD_IRQ_UART1INT 34 /* UART1 */ #define KIRKWOOD_IRQ_GPIOLO7_0 35 /* GPIO Low[7:0] */ @@ -162,6 +166,11 @@ /* + * Two-Wire Serial Interface Registers + */ +#define KIRKWOOD_TWSI1_BASE (MVSOC_TWSI_BASE + 0x0100) + +/* * PCI-Express Interface Registers */ #define KIRKWOOD_PEX1_BASE (MVSOC_PEX_BASE + 0x4000)
CVS commit: src/sys/arch/arm/marvell
Module Name:src
Committed By: kiyohara
Date: Sat Jul 21 05:11:45 UTC 2012
Modified Files:
src/sys/arch/arm/marvell: mvsoc.c
Log Message:
Add 88F6282 parameters.
Use MVSOC_UNITID_PEX instead of {ORION,KIRKWOOD}_UNITID_PEX. This PEX UNITID
is generic UNITID for MVSoC maybe.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/marvell/mvsoc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/marvell/mvsoc.c
diff -u src/sys/arch/arm/marvell/mvsoc.c:1.5 src/sys/arch/arm/marvell/mvsoc.c:1.6
--- src/sys/arch/arm/marvell/mvsoc.c:1.5 Sun Feb 12 16:34:07 2012
+++ src/sys/arch/arm/marvell/mvsoc.c Sat Jul 21 05:11:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsoc.c,v 1.5 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: mvsoc.c,v 1.6 2012/07/21 05:11:45 kiyohara Exp $ */
/*
* Copyright (c) 2007, 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.5 2012/02/12 16:34:07 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mvsoc.c,v 1.6 2012/07/21 05:11:45 kiyohara Exp $);
#include opt_cputypes.h
#include opt_mvsoc.h
@@ -90,9 +90,9 @@ static struct {
{ ORION_TAG_FLASH_CS,
ORION_ATTR_FLASH_CS, MVSOC_UNITID_DEVBUS },
{ ORION_TAG_PEX0_MEM,
- ORION_ATTR_PEX_MEM, ORION_UNITID_PEX },
+ ORION_ATTR_PEX_MEM, MVSOC_UNITID_PEX },
{ ORION_TAG_PEX0_IO,
- ORION_ATTR_PEX_IO, ORION_UNITID_PEX },
+ ORION_ATTR_PEX_IO, MVSOC_UNITID_PEX },
{ ORION_TAG_PEX1_MEM,
ORION_ATTR_PEX_MEM, ORION_UNITID_PEX1 },
{ ORION_TAG_PEX1_IO,
@@ -113,9 +113,13 @@ static struct {
{ KIRKWOOD_TAG_BOOTROM,
KIRKWOOD_ATTR_BOOTROM, MVSOC_UNITID_DEVBUS },
{ KIRKWOOD_TAG_PEX_MEM,
- KIRKWOOD_ATTR_PEX_MEM, KIRKWOOD_UNITID_PEX },
+ KIRKWOOD_ATTR_PEX_MEM, MVSOC_UNITID_PEX },
{ KIRKWOOD_TAG_PEX_IO,
- KIRKWOOD_ATTR_PEX_IO, KIRKWOOD_UNITID_PEX },
+ KIRKWOOD_ATTR_PEX_IO, MVSOC_UNITID_PEX },
+ { KIRKWOOD_TAG_PEX1_MEM,
+ KIRKWOOD_ATTR_PEX1_MEM, MVSOC_UNITID_PEX },
+ { KIRKWOOD_TAG_PEX1_IO,
+ KIRKWOOD_ATTR_PEX1_IO, MVSOC_UNITID_PEX },
{ KIRKWOOD_TAG_CRYPT,
KIRKWOOD_ATTR_CRYPT, KIRKWOOD_UNITID_CRYPT },
#endif
@@ -170,12 +174,15 @@ static struct {
#if defined(KIRKWOOD)
{ KIRKWOOD(88F6180), 2, 88F6180, A0, Kirkwood },
+ { KIRKWOOD(88F6180), 3, 88F6180, A1, Kirkwood },
{ KIRKWOOD(88F6192), 0, 88F619x, Z0, Kirkwood },
{ KIRKWOOD(88F6192), 2, 88F619x, A0, Kirkwood },
{ KIRKWOOD(88F6192), 3, 88F619x, A1, Kirkwood },
{ KIRKWOOD(88F6281), 0, 88F6281, Z0, Kirkwood },
{ KIRKWOOD(88F6281), 2, 88F6281, A0, Kirkwood },
{ KIRKWOOD(88F6281), 3, 88F6281, A1, Kirkwood },
+ { KIRKWOOD(88F6282), 0, 88F6282, A0, Kirkwood },
+ { KIRKWOOD(88F6282), 1, 88F6282, A1, Kirkwood },
#endif
#if defined(MV78XX0)
@@ -342,6 +349,23 @@ static const struct mvsoc_periph {
{ KIRKWOOD(88F6281),mvpex, 0, MVSOC_PEX_BASE, KIRKWOOD_IRQ_PEX0INT },
{ KIRKWOOD(88F6281),mvsata, 0, KIRKWOOD_SATAHC_BASE,KIRKWOOD_IRQ_SATA },
{ KIRKWOOD(88F6281),mvsdio, 0, KIRKWOOD_SDIO_BASE,KIRKWOOD_IRQ_SDIOINT },
+
+{ KIRKWOOD(88F6282),mvsoctmr,0, MVSOC_TMR_BASE, IRQ_DEFAULT },
+{ KIRKWOOD(88F6282),mvsocgpp,0, MVSOC_GPP_BASE, KIRKWOOD_IRQ_GPIOLO7_0},
+{ KIRKWOOD(88F6282),mvsocrtc,0, KIRKWOOD_RTC_BASE,IRQ_DEFAULT },
+{ KIRKWOOD(88F6282),com, 0, MVSOC_COM0_BASE, KIRKWOOD_IRQ_UART0INT },
+{ KIRKWOOD(88F6282),com, 1, MVSOC_COM1_BASE, KIRKWOOD_IRQ_UART1INT },
+{ KIRKWOOD(88F6282),ehci,0, KIRKWOOD_USB_BASE,KIRKWOOD_IRQ_USB0CNT },
+// { KIRKWOOD(88F6282),gtidmac, 0, KIRKWOOD_IDMAC_BASE,? },
+{ KIRKWOOD(88F6282),gttwsi, 0, MVSOC_TWSI_BASE, KIRKWOOD_IRQ_TWSI },
+{ KIRKWOOD(88F6282),gttwsi, 1, KIRKWOOD_TWSI1_BASE,KIRKWOOD_IRQ_TWSI1 },
+{ KIRKWOOD(88F6282),mvcesa, 0, KIRKWOOD_CESA_BASE,KIRKWOOD_IRQ_SECURITYINT},
+{ KIRKWOOD(88F6282),mvgbec, 0, KIRKWOOD_GBE0_BASE,IRQ_DEFAULT },
+{ KIRKWOOD(88F6282),mvgbec, 1, KIRKWOOD_GBE1_BASE,IRQ_DEFAULT },
+{ KIRKWOOD(88F6282),mvpex, 0, MVSOC_PEX_BASE, KIRKWOOD_IRQ_PEX0INT },
+{ KIRKWOOD(88F6282),mvpex, 1, KIRKWOOD_PEX1_BASE,KIRKWOOD_IRQ_PEX1INT },
+{ KIRKWOOD(88F6282),mvsata, 0, KIRKWOOD_SATAHC_BASE,KIRKWOOD_IRQ_SATA },
+{ KIRKWOOD(88F6282),mvsdio, 0, KIRKWOOD_SDIO_BASE,KIRKWOOD_IRQ_SDIOINT },
#endif
#if defined(MV78XX0)
CVS commit: src
Module Name:src
Committed By: manu
Date: Sat Jul 21 05:17:11 UTC 2012
Modified Files:
src/lib/libpuffs: dispatcher.c puffs.h
src/sys/fs/puffs: puffs_msgif.c puffs_msgif.h puffs_sys.h
puffs_vfsops.c puffs_vnops.c
Log Message:
- Improve PUFFS_KFLAG_CACHE_FS_TTL by reclaiming older inactive nodes.
The normal kernel behavior is to retain inactive nodes in the freelist
until it runs out of vnodes. This has some merit for local filesystems,
where the cost of an allocation is about the same as the cost of a
lookup. But that situation is not true for distributed filesystems.
On the other hand, keeping inactive nodes for a long time hold memory
in the file server process, and when the kernel runs out of vnodes, it
produce reclaim avalanches that increase lattency for other operations.
We do not reclaim inactive vnodes immediatly either, as they may be
looked up again shortly. Instead we introduce a grace time and we
reclaim nodes that have been inactive beyond the grace time.
- Fix lookup/reclaim race condition.
The above improvement undercovered a race condition between lookup and
reclaim. If we reclaimed a vnode associated with a userland cookie while
a lookup returning that same cookiewas inprogress, then the kernel ends
up with a vnode associated with a cookie that has been reclaimed in
userland. Next operation on the cookie will crash (or at least confuse)
the filesystem.
We fix this by introducing a lookup count in kernel and userland. On
reclaim, the kernel sends the count, which enable userland to detect
situation where it initiated a lookup that is not completed in kernel.
In such a situation, the reclaim must be ignored, as the node is about
to be looked up again.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/lib/libpuffs/dispatcher.c
cvs rdiff -u -r1.122 -r1.123 src/lib/libpuffs/puffs.h
cvs rdiff -u -r1.89 -r1.90 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.78 -r1.79 src/sys/fs/puffs/puffs_msgif.h
cvs rdiff -u -r1.79 -r1.80 src/sys/fs/puffs/puffs_sys.h
cvs rdiff -u -r1.101 -r1.102 src/sys/fs/puffs/puffs_vfsops.c
cvs rdiff -u -r1.166 -r1.167 src/sys/fs/puffs/puffs_vnops.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/libpuffs/dispatcher.c
diff -u src/lib/libpuffs/dispatcher.c:1.41 src/lib/libpuffs/dispatcher.c:1.42
--- src/lib/libpuffs/dispatcher.c:1.41 Wed Jun 27 13:25:23 2012
+++ src/lib/libpuffs/dispatcher.c Sat Jul 21 05:17:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatcher.c,v 1.41 2012/06/27 13:25:23 manu Exp $ */
+/* $NetBSD: dispatcher.c,v 1.42 2012/07/21 05:17:10 manu Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: dispatcher.c,v 1.41 2012/06/27 13:25:23 manu Exp $);
+__RCSID($NetBSD: dispatcher.c,v 1.42 2012/07/21 05:17:10 manu Exp $);
#endif /* !lint */
#include sys/types.h
@@ -301,6 +301,12 @@ dispatch(struct puffs_cc *pcc)
pcn.pcn_po_full);
}
}
+
+ if (!error) {
+if (pn == NULL)
+ pn = PU_CMAP(pu, auxt-pvnr_newnode);
+pn-pn_nlookup++;
+ }
break;
}
@@ -810,12 +816,28 @@ dispatch(struct puffs_cc *pcc)
case PUFFS_VN_RECLAIM:
{
-
+ struct puffs_vnmsg_reclaim *auxt = auxbuf;
+ struct puffs_node *pn;
+
if (pops-puffs_node_reclaim == NULL) {
error = 0;
break;
}
+ /*
+ * This fixes a race condition,
+ * where a node in reclaimed by kernel
+ * after a lookup request is sent,
+ * but before the reply, leaving the kernel
+ * with a invalid vnode/cookie reference.
+ */
+ pn = PU_CMAP(pu, opcookie);
+ pn-pn_nlookup -= auxt-pvnr_nlookup;
+ if (pn-pn_nlookup = 1) {
+error = 0;
+break;
+ }
+
error = pops-puffs_node_reclaim(pu, opcookie);
break;
}
Index: src/lib/libpuffs/puffs.h
diff -u src/lib/libpuffs/puffs.h:1.122 src/lib/libpuffs/puffs.h:1.123
--- src/lib/libpuffs/puffs.h:1.122 Wed Jun 27 13:25:23 2012
+++ src/lib/libpuffs/puffs.h Sat Jul 21 05:17:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.h,v 1.122 2012/06/27 13:25:23 manu Exp $ */
+/* $NetBSD: puffs.h,v 1.123 2012/07/21 05:17:10 manu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -79,6 +79,7 @@ struct puffs_kcache {
struct puffs_node {
off_t pn_size;
int pn_flags;
+ int pn_nlookup;
struct vattr pn_va;
void *pn_data; /* private data */
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.89 src/sys/fs/puffs/puffs_msgif.c:1.90
--- src/sys/fs/puffs/puffs_msgif.c:1.89 Wed Oct 19 01:39:29 2011
+++ src/sys/fs/puffs/puffs_msgif.c Sat Jul 21 05:17:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.89 2011/10/19 01:39:29 manu Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.90 2012/07/21 05:17:10 manu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti
