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

- improve timeout handling in fwmem.c

Browse Source 
- stop processing of TX db if we reaches the end of active db.
This commit is contained in:
simokawa 2003-03-07 02:51:59 +00:00
parent c015426a41
commit 1b3633143f
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/dev/firewire/fwmem.c
View File

@ -304,11 +304,12 @@ fwmem_read (dev_t dev, struct uio *uio, int ioflag)
err = EINVAL;
break;
}
err = tsleep((caddr_t)xfer, FWPRI, "fwmrq", hz);
if (err !=0 || xfer->resp != 0
|| xfer->recv.buf == NULL)
err = tsleep((caddr_t)xfer, FWPRI, "fwmrq", 0);
if (xfer->recv.buf == NULL)
err = EIO;
else
else if (xfer->resp != 0)
err = xfer->resp;
else if (err == 0)
err = uiomove(xfer->recv.buf
+ xfer->recv.off + 4*3, 4, uio);
} else {
@ -320,11 +321,12 @@ fwmem_read (dev_t dev, struct uio *uio, int ioflag)
err = EINVAL;
break;
}
err = tsleep((caddr_t)xfer, FWPRI, "fwmrb", hz);
if (err != 0 || xfer->resp != 0
|| xfer->recv.buf == NULL)
err = tsleep((caddr_t)xfer, FWPRI, "fwmrb", 0);
if (xfer->recv.buf == NULL)
err = EIO;
else
else if (xfer->resp != 0)
err = xfer->resp;
else if (err == 0)
err = uiomove(xfer->recv.buf
+ xfer->recv.off + 4*4, len, uio);
}
@ -372,9 +374,9 @@ fwmem_write (dev_t dev, struct uio *uio, int ioflag)
err = EINVAL;
break;
}
err = tsleep((caddr_t)xfer, FWPRI, "fwmwq", hz);
if (err !=0 || xfer->resp != 0)
err = EIO;
err = tsleep((caddr_t)xfer, FWPRI, "fwmwq", 0);
if (xfer->resp != 0)
err = xfer->resp;
} else {
if (len > MAXLEN)
len = MAXLEN;
@ -387,9 +389,9 @@ fwmem_write (dev_t dev, struct uio *uio, int ioflag)
err = EINVAL;
break;
}
err = tsleep((caddr_t)xfer, FWPRI, "fwmwb", hz);
if (err != 0 || xfer->resp != 0)
err = EIO;
err = tsleep((caddr_t)xfer, FWPRI, "fwmwb", 0);
if (xfer->resp != 0)
err = xfer->resp;
}
fw_xfer_free(xfer);
}

6
sys/dev/firewire/fwohci.c
View File

@ -1075,6 +1075,12 @@ fwohci_txd(struct fwohci_softc *sc, struct fwohci_dbch *dbch)
packets ++;
tr = STAILQ_NEXT(tr, link);
dbch->bottom = tr;
if (dbch->bottom == dbch->top) {
/* we reaches the end of context program */
if (firewire_debug && dbch->xferq.queued > 0)
printf("queued > 0\n");
break;
}
}
out:
if ((dbch->flags & FWOHCI_DBCH_FULL) && packets > 0) {