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

Fix lptopen() and lptclose() to not trash the state of the HAVEBUS flag

Browse Source 
in 'sc_state'.  This allows the lpt_release_ppbus() calls in those two
routines to actually release the ppbus and thus fixes the hangs noticed
with the lpt(4) driver since the recent ppbus changes.  The old lpt(4)
driver didn't actually check the HAVEBUS flag in lpt_release_ppbus() which
is why these bugs weren't noticed before.
This commit is contained in:
John Baldwin 2009-02-11 14:25:09 +00:00
parent d0e723a10c
commit 84f9a0e5c5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=188484
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/ppbus/lpt.c
View File

@ -544,10 +544,10 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td)
do {
/* ran out of waiting for the printer */
if (trys++ >= LPINITRDY*4) {
sc->sc_state = 0;
lprintf(("status %x\n", ppb_rstr(ppbus)));
lpt_release_ppbus(lptdev);
sc->sc_state = 0;
ppb_unlock(ppbus);
return (EBUSY);
}
@ -555,9 +555,8 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td)
/* wait 1/4 second, give up if we get a signal */
if (ppb_sleep(ppbus, lptdev, LPPRI | PCATCH, "lptinit",
hz / 4) != EWOULDBLOCK) {
sc->sc_state = 0;
lpt_release_ppbus(lptdev);
sc->sc_state = 0;
ppb_unlock(ppbus);
return (EBUSY);
}
@ -577,7 +576,8 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td)
ppb_wctr(ppbus, sc->sc_control);
sc->sc_state = OPEN;
sc->sc_state &= ~LPTINIT;
sc->sc_state |= OPEN;
sc->sc_xfercnt = 0;
/* only use timeout if using interrupt */
@ -611,11 +611,8 @@ lptclose(struct cdev *dev, int flags, int fmt, struct thread *td)
int err;
ppb_lock(ppbus);
if (sc->sc_flags & LP_BYPASS) {
sc->sc_state = 0;
ppb_unlock(ppbus);
if (sc->sc_flags & LP_BYPASS)
goto end_close;
}
if ((err = lpt_request_ppbus(lptdev, PPB_WAIT|PPB_INTR)) != 0) {
ppb_unlock(ppbus);
@ -635,16 +632,16 @@ lptclose(struct cdev *dev, int flags, int fmt, struct thread *td)
sc->sc_state &= ~OPEN;
callout_stop(&sc->sc_timer);
ppb_wctr(ppbus, LPC_NINIT);
sc->sc_state = 0;
sc->sc_xfercnt = 0;
/*
* unregistration of interrupt forced by release
*/
lpt_release_ppbus(lptdev);
ppb_unlock(ppbus);
end_close:
sc->sc_state = 0;
sc->sc_xfercnt = 0;
ppb_unlock(ppbus);
lprintf(("closed.\n"));
return(0);
}