Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now uses a driver/device exploration like R5; when a directory is looked

Browse Source 
up for the first time, it will try to load all drivers that may export
devices there. Those devices will currently stay loaded, though - this
will only be changed when load_kernel_add_on() is able to cache add-ons.
Renamed pnp_devfs_probe() to pnp_devfs_register_device().
Fixed debug output for devfs_create().


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10838 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-01-18 16:51:21 +00:00
parent f43c430864
commit dcbf2cb678
1 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/kernel/core/fs/devfs.cpp
View File

@ -81,9 +81,10 @@ struct devfs_vnode {
struct devfs { struct devfs {
mount_id id; mount_id id;
mutex lock; mutex lock;
int next_vnode_id; int32 next_vnode_id;
hash_table *vnode_list_hash; hash_table *vnode_list_hash;
struct devfs_vnode *root_vnode; struct devfs_vnode *root_vnode;
bool root_scanned;
}; };
struct devfs_cookie { struct devfs_cookie {
@ -109,6 +110,9 @@ enum {
ITERATION_STATE_BEGIN = ITERATION_STATE_DOT, ITERATION_STATE_BEGIN = ITERATION_STATE_DOT,
}; };
// The boot device, if already present
extern dev_t gBootDevice;
/* the one and only allowed devfs instance */ /* the one and only allowed devfs instance */
static struct devfs *sDeviceFileSystem = NULL; static struct devfs *sDeviceFileSystem = NULL;
@ -684,6 +688,7 @@ devfs_mount(mount_id id, const char *devfs, uint32 flags, const char *args,
fs->id = id; fs->id = id;
fs->next_vnode_id = 0; fs->next_vnode_id = 0;
fs->root_scanned = false;
err = mutex_init(&fs->lock, "devfs_mutex"); err = mutex_init(&fs->lock, "devfs_mutex");
if (err < B_OK) if (err < B_OK)
@ -742,7 +747,7 @@ devfs_unmount(fs_volume _fs)
// delete all of the vnodes // delete all of the vnodes
hash_open(fs->vnode_list_hash, &i); hash_open(fs->vnode_list_hash, &i);
while((v = (struct devfs_vnode *)hash_next(fs->vnode_list_hash, &i)) != NULL) { while ((v = (struct devfs_vnode *)hash_next(fs->vnode_list_hash, &i)) != NULL) {
devfs_delete_vnode(fs, v, true); devfs_delete_vnode(fs, v, true);
} }
hash_close(fs->vnode_list_hash, &i, false); hash_close(fs->vnode_list_hash, &i, false);
@ -779,12 +784,39 @@ devfs_lookup(fs_volume _fs, fs_vnode _dir, const char *name, vnode_id *_id, int
mutex_lock(&fs->lock); mutex_lock(&fs->lock);
if (!fs->root_scanned && gBootDevice >= 0) {
fs->root_scanned = true;
mutex_unlock(&fs->lock);
// scan for drivers at root level on first contact
probe_for_device_type("");
mutex_lock(&fs->lock);
}
// look it up // look it up
vnode = devfs_find_in_dir(dir, name); vnode = devfs_find_in_dir(dir, name);
if (!vnode) { if (vnode == NULL) {
// scan for drivers in the given directory (that indicates the type of the driver)
KPath path;
get_device_name(dir, path.LockBuffer(), path.BufferSize());
path.UnlockBuffer();
path.Append(name);
dprintf("lookup: \"%s\"\n", path.Path());
mutex_unlock(&fs->lock);
// scan for drivers of this type
probe_for_device_type(path.Path());
mutex_lock(&fs->lock);
vnode = devfs_find_in_dir(dir, name);
if (vnode == NULL) {
err = B_ENTRY_NOT_FOUND; err = B_ENTRY_NOT_FOUND;
goto err; goto err;
} }
}
err = get_vnode(fs->id, vnode->id, (fs_vnode *)&vdummy); err = get_vnode(fs->id, vnode->id, (fs_vnode *)&vdummy);
if (err < 0) if (err < 0)
@ -884,7 +916,7 @@ devfs_create(fs_volume _fs, fs_vnode _dir, const char *name, int openMode, int p
struct devfs_vnode *vnode, *vdummy; struct devfs_vnode *vnode, *vdummy;
status_t status = B_OK; status_t status = B_OK;
TRACE(("devfs_create: vnode %p, oflags 0x%x, fs_cookie %p \n", vnode, openMode, _cookie)); TRACE(("devfs_create: dir %p, name \"%s\", oflags 0x%x, fs_cookie %p \n", dir, name, openMode, _cookie));
mutex_lock(&fs->lock); mutex_lock(&fs->lock);
@ -1503,7 +1535,7 @@ static const device_attr pnp_devfs_attrs[] =
/** someone registered a device */ /** someone registered a device */
static status_t static status_t
pnp_devfs_probe(device_node_handle parent) pnp_devfs_register_device(device_node_handle parent)
{ {
char *str = NULL, *filename = NULL; char *str = NULL, *filename = NULL;
device_node_handle node; device_node_handle node;
@ -1640,7 +1672,7 @@ driver_module_info gDeviceForDriversModule = {
NULL, NULL,
NULL, NULL,
pnp_devfs_probe, pnp_devfs_register_device,
pnp_devfs_device_removed pnp_devfs_device_removed
}; };