d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace the guts of usbmodule() with calls to the new kld(3) functions.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 2006-02-18 11:26:36 +00:00
parent 501092bbc8
commit c134d8cc31
1 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
usr.sbin/moused/moused.c
View File

@ -49,8 +49,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/consio.h>
#include <sys/linker.h>
#include <sys/module.h>
#include <sys/mouse.h>
#include <sys/socket.h>
#include <sys/stat.h>
@ -901,38 +899,7 @@ main(int argc, char *argv[])
static int
usbmodule(void)
{
struct kld_file_stat fstat;
struct module_stat mstat;
int fileid, modid;
int loaded;
for (loaded = 0, fileid = kldnext(0); !loaded && fileid > 0;
fileid = kldnext(fileid)) {
fstat.version = sizeof(fstat);
if (kldstat(fileid, &fstat) < 0)
continue;
if (strncmp(fstat.name, "uhub/ums", 8) == 0) {
loaded = 1;
break;
}
for (modid = kldfirstmod(fileid); modid > 0;
modid = modfnext(modid)) {
mstat.version = sizeof(mstat);
if (modstat(modid, &mstat) < 0)
continue;
if (strncmp(mstat.name, "uhub/ums", 8) == 0) {
loaded = 1;
break;
}
}
}
if (!loaded) {
if (kldload("ums") != -1)
return 1;
if (errno != EEXIST)
logerr(1, "unable to load USB mouse driver");
}
return 0;
return (kld_isloaded("uhub/ums") || kld_load("ums") != -1);
}
static void