Module Name: src
Committed By: pooka
Date: Sun Oct 4 13:29:36 UTC 2009
Modified Files:
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs rump_vfs.c
Log Message:
Include firmload. Although it may be used by devices, it's pure
vfs in nature, and therefore it belongs here (can't load a firmware
from a file system without file system support, right?). Rename
rump_cwdi to cwdi0, since firmload depends on that name (naughty
firmload).
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/librump/rumpvfs/rump_vfs.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/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.13 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.14
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.13 Sun Sep 6 20:42:25 2009
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Sun Oct 4 13:29:36 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.13 2009/09/06 20:42:25 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.14 2009/10/04 13:29:36 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -9,7 +9,8 @@
${RUMPTOP}/../kern \
${RUMPTOP}/../miscfs/genfs ${RUMPTOP}/../miscfs/syncfs \
${RUMPTOP}/../miscfs/specfs ${RUMPTOP}/../miscfs/deadfs \
- ${RUMPTOP}/../compat/common ${RUMPTOP}/../uvm
+ ${RUMPTOP}/../compat/common ${RUMPTOP}/../uvm \
+ ${RUMPTOP}/../dev
#
# Source modules, first the ones specifically implemented for librump.
@@ -42,6 +43,10 @@
SRCS+= subr_bufq.c bufq_disksort.c bufq_fcfs.c bufq_priocscan.c \
bufq_readprio.c
+# dev
+# firmload is technically part of rumpdev, but it's pure vfs in nature.
+SRCS+= firmload.c
+
# compat syscalls
SRCS+= vfs_syscalls_50.c compat.c
Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.25 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.26
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.25 Fri Oct 2 18:50:15 2009
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Sun Oct 4 13:29:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.25 2009/10/02 18:50:15 elad Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.26 2009/10/04 13:29:36 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.25 2009/10/02 18:50:15 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.26 2009/10/04 13:29:36 pooka Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -54,7 +54,7 @@
#include "rump_private.h"
#include "rump_vfs_private.h"
-static struct cwdinfo rump_cwdi;
+struct cwdinfo cwdi0;
static void rump_rcvp_lwpset(struct vnode *, struct vnode *, struct lwp *);
@@ -103,10 +103,10 @@
rump_proc_vfs_release = pvfs_rele;
/* bootstrap cwdi */
- rw_init(&rump_cwdi.cwdi_lock);
- rump_cwdi.cwdi_cdir = rootvnode;
- vref(rump_cwdi.cwdi_cdir);
- proc0.p_cwdi = &rump_cwdi;
+ rw_init(&cwdi0.cwdi_lock);
+ cwdi0.cwdi_cdir = rootvnode;
+ vref(cwdi0.cwdi_cdir);
+ proc0.p_cwdi = &cwdi0;
proc0.p_cwdi = cwdinit();
if (rump_threads) {
@@ -175,9 +175,9 @@
{
/* See rcvp XXX above */
- rump_cwdi.cwdi_rdir = NULL;
+ cwdi0.cwdi_rdir = NULL;
vref(rootvnode);
- rump_cwdi.cwdi_cdir = rootvnode;
+ cwdi0.cwdi_cdir = rootvnode;
mount_finispecific(mp);
kmem_free(mp, sizeof(*mp));
