diff options
| author | bp <bp@FreeBSD.org> | 2000-05-01 17:41:25 +0000 |
|---|---|---|
| committer | bp <bp@FreeBSD.org> | 2000-05-01 17:41:25 +0000 |
| commit | 816e92565a65b81ec26724758fea6f694964d18f (patch) | |
| tree | 1dc1dbf863d6b27d97804bdaca0c1d05f196c481 /sys/boot/common/pnp.c | |
| parent | 222439bc50eba6251adfdfbf06fc7474d33911ad (diff) | |
| download | FreeBSD-src-816e92565a65b81ec26724758fea6f694964d18f.zip FreeBSD-src-816e92565a65b81ec26724758fea6f694964d18f.tar.gz | |
Update loader logic to distinguish modules vs. files.
Add support for module metadata. The old way of dependancy
handling will be supported for a while.
Reviewed by: peter
Diffstat (limited to 'sys/boot/common/pnp.c')
| -rw-r--r-- | sys/boot/common/pnp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/boot/common/pnp.c b/sys/boot/common/pnp.c index 21c07a2..bb3695b 100644 --- a/sys/boot/common/pnp.c +++ b/sys/boot/common/pnp.c @@ -1,5 +1,7 @@ /* * mjs copyright + * + * $FreeBSD$ */ /* * "Plug and Play" functionality. @@ -113,7 +115,7 @@ pnp_load(int argc, char *argv[]) /* try to load any modules that have been nominated */ for (pi = pnp_devices.stqh_first; pi != NULL; pi = pi->pi_link.stqe_next) { /* Already loaded? */ - if ((pi->pi_module != NULL) && (mod_findmodule(pi->pi_module, NULL) == NULL)) { + if ((pi->pi_module != NULL) && (file_findfile(pi->pi_module, NULL) == NULL)) { modfname = malloc(strlen(pi->pi_module) + 4); sprintf(modfname, "%s.ko", pi->pi_module); /* XXX implicit knowledge of KLD module filenames */ if (mod_load(pi->pi_module, pi->pi_argc, pi->pi_argv)) |
