oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't panic on missing drivers.

Browse Source
This commit is contained in:
Ben Gras 2005-10-21 19:31:38 +00:00
parent 9270710246
commit bbcecf5e6d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
servers/fs/device.c
View File

@ -49,10 +49,12 @@ int flags; /* mode bits and flags */
major = (dev >> MAJOR) & BYTE; major = (dev >> MAJOR) & BYTE;
if (major >= NR_DEVICES) major = 0; if (major >= NR_DEVICES) major = 0;
dp = &dmap[major]; dp = &dmap[major];
if (dp->dmap_driver == NONE) {
printf("FS: open: no driver for dev %x\n", dev);
return EIO;
}
r = (*dp->dmap_opcl)(DEV_OPEN, dev, proc, flags); r = (*dp->dmap_opcl)(DEV_OPEN, dev, proc, flags);
if (r == SUSPEND) panic(__FILE__,"suspend on open from", dp->dmap_driver); if (r == SUSPEND) panic(__FILE__,"suspend on open from", dp->dmap_driver);
if (r == OK && dp->dmap_driver == NONE)
panic(__FILE__, "no driver for dev", dev);
return(r); return(r);
} }
@ -62,6 +64,10 @@ int flags; /* mode bits and flags */
PUBLIC void dev_close(dev) PUBLIC void dev_close(dev)
dev_t dev; /* device to close */ dev_t dev; /* device to close */
{ {
/* See if driver is roughly valid. */
if (dmap[(dev >> MAJOR)].dmap_driver == NONE) {
return;
}
(void) (*dmap[(dev >> MAJOR) & BYTE].dmap_opcl)(DEV_CLOSE, dev, 0, 0); (void) (*dmap[(dev >> MAJOR) & BYTE].dmap_opcl)(DEV_CLOSE, dev, 0, 0);
} }
@ -131,8 +137,10 @@ int flags; /* special flags, like O_NONBLOCK */
dp = &dmap[(dev >> MAJOR) & BYTE]; dp = &dmap[(dev >> MAJOR) & BYTE];
/* See if driver is roughly valid. */ /* See if driver is roughly valid. */
if (dp->dmap_driver == NONE) if (dp->dmap_driver == NONE) {
panic(__FILE__, "no driver for i/o on dev", dev); printf("FS: dev_io: no driver for dev %x\n", dev);
return EIO;
}
/* Set up the message passed to task. */ /* Set up the message passed to task. */
dev_mess.m_type = op; dev_mess.m_type = op;
@ -364,6 +372,7 @@ message *mess_ptr; /* pointer to message for task */
if (r == EDEADSRCDST) return; /* give up */ if (r == EDEADSRCDST) return; /* give up */
if (r == EDSTDIED) return; if (r == EDSTDIED) return;
if (r == ESRCDIED) return; if (r == ESRCDIED) return;
if (r == ELOCKED) return;
else panic(__FILE__,"call_task: can't send/receive", r); else panic(__FILE__,"call_task: can't send/receive", r);
} }