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

reorg ioctl code to simplify adding new requests

Browse Source
This commit is contained in:
Sam Leffler 2009-02-03 19:07:41 +00:00
parent 22f8f5fe92
commit 3a114d1f92
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/dev/cfi/cfi_dev.c
View File

@ -252,26 +252,31 @@ cfi_devioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
int error;
u_char val;
if (cmd != CFIOCQRY)
return (ENOIOCTL);
sc = dev->si_drv1;
error = 0;
error = (sc->sc_writing) ? cfi_block_finish(sc) : 0;
if (error)
return (error);
switch(cmd) {
case CFIOCQRY:
if (sc->sc_writing) {
error = cfi_block_finish(sc);
if (error)
break;
}
rq = (struct cfiocqry *)data;
rq = (struct cfiocqry *)data;
if (rq->offset >= sc->sc_size / sc->sc_width)
return (ESPIPE);
if (rq->offset + rq->count > sc->sc_size / sc->sc_width)
return (ENOSPC);
if (rq->offset >= sc->sc_size / sc->sc_width)
return (ESPIPE);
if (rq->offset + rq->count > sc->sc_size / sc->sc_width)
return (ENOSPC);
while (!error && rq->count--) {
val = cfi_read_qry(sc, rq->offset++);
error = copyout(&val, rq->buffer++, 1);
while (!error && rq->count--) {
val = cfi_read_qry(sc, rq->offset++);
error = copyout(&val, rq->buffer++, 1);
}
break;
default:
error = ENOIOCTL;
break;
}
return (error);
}