diff options
| author | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2001-09-16 05:30:59 +0000 |
|---|---|---|
| committer | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2001-09-16 05:30:59 +0000 |
| commit | accd559318008428cebbd71fb798aef681e6a52c (patch) | |
| tree | 495428d771099041bfd25a4ea4aec47f99cb85af | |
| parent | f058eb7562d4a13a427e8ea90fb356e9a134556c (diff) | |
Notes
| -rw-r--r-- | sys/pc98/pc98/pcaudio.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c index 17c73bb50bc2..f9257d580ddc 100644 --- a/sys/pc98/pc98/pcaudio.c +++ b/sys/pc98/pc98/pcaudio.c @@ -315,7 +315,7 @@ pca_continue(void) pca_status.oldval = inb(IO_PPI) & ~0x08; acquire_timer1(TIMER_LSB|TIMER_ONESHOT); #else - pca_status.oldval = inb(IO_PPI) | 0x03; + pca_status.oldval = inb(IO_PPI) | 0x03; acquire_timer2(TIMER_LSB|TIMER_ONESHOT); #endif acquire_timer0(INTERRUPT_RATE, pcaintr); @@ -359,10 +359,7 @@ pcaprobe(device_t dev) int error; /* Check isapnp ids */ - error = ISA_PNP_PROBE(device_get_parent(dev), dev, pca_ids); - if (error == ENXIO) - return ENXIO; - return 0; + return(ISA_PNP_PROBE(device_get_parent(dev), dev, pca_ids)); } @@ -605,7 +602,6 @@ static int pcapoll(dev_t dev, int events, struct thread *td) { int s; - struct proc *p1; int revents = 0; s = spltty(); @@ -614,14 +610,8 @@ pcapoll(dev_t dev, int events, struct thread *td) if (!pca_status.in_use[0] || !pca_status.in_use[1] || !pca_status.in_use[2]) revents |= events & (POLLOUT | POLLWRNORM); - else { - if (pca_status.wsel.si_pid && - (p1=pfind(pca_status.wsel.si_pid)) - && p1->p_wchan == (caddr_t)&selwait) - pca_status.wsel.si_flags = SI_COLL; - else - pca_status.wsel.si_pid = td->p_pid; - } + else + selrecord(td, &pca_status.wsel); } splx(s); return (revents); |