i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a warning for drivers which don't export the api_version.

Browse Source 
Now returns ENXIO if dev_publish_devices() returns an error (instead of
B_OK).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1317 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2002-09-30 21:59:09 +00:00
parent 1419ae2b19
commit d0286a7395
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/drivers/dev.c
+19 -15
View File
@@ -4,6 +4,7 @@
** Copyright 2001, Travis Geiselbrecht. All rights reserved. ** Copyright 2001, Travis Geiselbrecht. All rights reserved.
** Distributed under the terms of the NewOS License. ** Distributed under the terms of the NewOS License.
*/ */
#include <kernel.h> #include <kernel.h>
#include <stage2.h> #include <stage2.h>
#include <dev.h> #include <dev.h>
@@ -16,7 +17,7 @@
#include <memheap.h> #include <memheap.h>
#ifdef ARCH_x86 #ifdef ARCH_x86
#include <arch/x86/console_dev.h> # include <arch/x86/console_dev.h>
#endif #endif
#include <fb_console.h> #include <fb_console.h>
@@ -41,7 +42,7 @@ int dev_init(kernel_args *ka)
dprintf("dev_init: entry\n"); dprintf("dev_init: entry\n");
for (ptr = device_paths; (*ptr); ptr++) { for (ptr = device_paths; (*ptr); ptr++) {
fd = sys_open_dir(*ptr); fd = sys_open_dir(*ptr);
if (fd >= 0) { if (fd >= 0) {
ssize_t len; ssize_t len;
@@ -51,6 +52,7 @@ int dev_init(kernel_args *ka)
while ((len = sys_read_dir(fd, dirent, sizeof(buf), 1)) > 0) { while ((len = sys_read_dir(fd, dirent, sizeof(buf), 1)) > 0) {
dprintf("loading '%s' dev module\n", dirent->d_name); dprintf("loading '%s' dev module\n", dirent->d_name);
dev_load_dev_module(dirent->d_name, *ptr); dev_load_dev_module(dirent->d_name, *ptr);
dprintf("loaded dev module!\n");
} }
sys_close(fd); sys_close(fd);
} }
@@ -67,7 +69,9 @@ int dev_init(kernel_args *ka)
return 0; return 0;
} }
image_id dev_load_dev_module(const char *name, const char *dirpath)
image_id
dev_load_dev_module(const char *name, const char *dirpath)
{ {
image_id id; image_id id;
char path[SYS_MAX_PATH_LEN]; char path[SYS_MAX_PATH_LEN];
@@ -84,7 +88,7 @@ image_id dev_load_dev_module(const char *name, const char *dirpath)
/* Load the module, return error if unable */ /* Load the module, return error if unable */
id = elf_load_kspace(path, ""); id = elf_load_kspace(path, "");
if(id < 0) if (id < 0)
return id; return id;
/* Don't get all the symbols we will require initially. Just get the /* Don't get all the symbols we will require initially. Just get the
@@ -106,7 +110,12 @@ image_id dev_load_dev_module(const char *name, const char *dirpath)
dprintf("DEV: %s: mandatory driver symbol(s) missing! :(\n", name); dprintf("DEV: %s: mandatory driver symbol(s) missing! :(\n", name);
id = EINVAL; id = EINVAL;
goto error; goto error;
} }
/* ToDo: we should fail if the driver doesn't export the api_version,
* but right now, there are some drivers in our tree that doesn't...
*/
if (api_version == NULL)
dprintf("driver \"%s\" has no api_version set!\n", name);
/* Next, do we have an init_hardware function? If we do run it and /* Next, do we have an init_hardware function? If we do run it and
* if it fails simply fall through to the exit... * if it fails simply fall through to the exit...
@@ -151,7 +160,7 @@ image_id dev_load_dev_module(const char *name, const char *dirpath)
keep_loaded = true; keep_loaded = true;
} }
} }
/* If we've managed to publish at least one of the device entry /* If we've managed to publish at least one of the device entry
* points that the driver wished us to then we MUST keep the driver in * points that the driver wished us to then we MUST keep the driver in
* memory or the pointer that devfs has will become invalid. * memory or the pointer that devfs has will become invalid.
@@ -159,7 +168,7 @@ image_id dev_load_dev_module(const char *name, const char *dirpath)
*/ */
if (keep_loaded) if (keep_loaded)
return id; return id;
/* If the function gets here then the following has happenned... /* If the function gets here then the following has happenned...
* - the driver has been loaded * - the driver has been loaded
* - it has appeared valid * - it has appeared valid
@@ -167,19 +176,14 @@ image_id dev_load_dev_module(const char *name, const char *dirpath)
* - init_driver has been run OK * - init_driver has been run OK
* - publish_devices return empty paths list or * - publish_devices return empty paths list or
* devfs_publish_device has for some reason failed on each path. * devfs_publish_device has for some reason failed on each path.
*
* The error value we're about to return is 0, which probably
* means we're loosing error information here :(
* XXX - what error code should we be returning
*
* However, before we unload ourselves we will try to find and run
* the uninit routine.
*/ */
uninit_driver = (void *) elf_lookup_symbol(id, "uninit_driver"); uninit_driver = (void *) elf_lookup_symbol(id, "uninit_driver");
if (uninit_driver) if (uninit_driver)
uninit_driver(); uninit_driver();
id = 0;
// ToDo: That might not be the best error code
id = ENXIO;
error: error:
/* If we've gotten here then the driver will be unloaded and an /* If we've gotten here then the driver will be unloaded and an