Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced 386BSD conditionals with a NetBSD ones. Fixed a bug in 386BSD 

support.  Cast arguments to tsleep() and wakeup() to avoid compiler
warnings.
This commit is contained in:
andrew 1993-06-27 05:39:44 +00:00
parent d75ed5fc23
commit 0bffd21fdb
3 changed files with 49 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/arch/i386/isa/lms.c
View File

@ -39,9 +39,6 @@
* Andrew Herbert - 12 June 1993
*/
/* define this if you're using 386BSD rather than NetBSD */
/* #define 386BSD_KERNEL */
#include "lms.h"
#if NLMS > 0
@ -54,7 +51,7 @@
#include "ioctl.h"
#include "tty.h"
#include "file.h"
#ifndef 386BSD_KERNEL
#ifdef NetBSD
#include "select.h"
#endif
#include "proc.h"
@ -90,10 +87,10 @@ struct ringbuf {
static struct lms_softc { /* Driver status information */
struct ringbuf inq; /* Input queue */
#ifdef 386BSD_KERNEL
pid_t rsel; /* Process selecting for Input */
#else
#ifdef NetBSD
struct selinfo rsel;
#else
pid_t rsel; /* Process selecting for Input */
#endif
unsigned char state; /* Mouse driver state */
unsigned char status; /* Mouse button status */
@ -183,11 +180,11 @@ int lmsopen(dev_t dev, int flag, int fmt, struct proc *p)
/* Initialize state */
sc->state |= OPEN;
#ifdef 386BSD_KERNEL
sc->rsel = 0;
#else
#ifdef NetBSD
sc->rsel.si_pid = 0;
sc->rsel.si_coll = 0;
#else
sc->rsel = 0;
#endif
sc->status = 0;
sc->button = 0;
@ -253,7 +250,7 @@ int lmsread(dev_t dev, struct uio *uio, int flag)
return(EWOULDBLOCK);
}
sc->state |= ASLP;
error = tsleep(sc, PZERO | PCATCH, "lmsrea", 0);
error = tsleep((caddr_t)sc, PZERO | PCATCH, "lmsrea", 0);
if (error != 0) {
splx(s);
return(error);
@ -405,17 +402,17 @@ void lmsintr(unit)
if (sc->state & ASLP) {
sc->state &= ~ASLP;
wakeup(sc);
wakeup((caddr_t)sc);
}
#ifdef 386BSD_KERNEL
#ifdef NetBSD
selwakeup(&sc->rsel);
#else
if (sc->rsel) {
selwakeup(&sc->rsel, 0);
selwakeup(sc->rsel, 0);
sc->rsel = 0;
}
#else
selwakeup(&sc->rsel);
#endif
}
}
}
int lmsselect(dev_t dev, int rw, struct proc *p)
@ -434,10 +431,10 @@ int lmsselect(dev_t dev, int rw, struct proc *p)
if (sc->inq.count)
ret = 1;
else {
#ifdef 386BSD_KERNEL
sc->rsel = p->p_pid;
#else
#ifdef NetBSD
selrecord(p, &sc->rsel);
#else
sc->rsel = p->p_pid;
#endif
ret = 0;
}

35
sys/arch/i386/isa/mms.c
View File

@ -36,9 +36,6 @@
* Andrew Herbert <andrew@werple.apana.org.au> - 8 June 1993
*/
/* define this if you're using 386BSD rather than NetBSD */
/* #define 386BSD_KERNEL */
#include "mms.h"
#if NMMS > 0
@ -51,7 +48,7 @@
#include "ioctl.h"
#include "tty.h"
#include "file.h"
#ifndef 386BSD_KERNEL
#ifdef NetBSD
#include "select.h"
#endif
#include "proc.h"
@ -85,10 +82,10 @@ struct ringbuf {
static struct mms_softc { /* Driver status information */
struct ringbuf inq; /* Input queue */
#ifdef 386BSD_KERNEL
pid_t rsel; /* Process selecting for Input */
#else
#ifdef NetBSD
struct selinfo rsel;
#else
pid_t rsel; /* Process selecting for Input */
#endif
unsigned char state; /* Mouse driver state */
unsigned char status; /* Mouse button status */
@ -163,11 +160,11 @@ int mmsopen(dev_t dev, int flag, int fmt, struct proc *p)
/* Initialize state */
sc->state |= OPEN;
#ifdef 386BSD_KERNEL
sc->rsel = 0;
#else
#ifdef NetBSD
sc->rsel.si_pid = 0;
sc->rsel.si_coll = 0;
#else
sc->rsel = 0;
#endif
sc->status = 0;
sc->x = 0;
@ -231,7 +228,7 @@ int mmsread(dev_t dev, struct uio *uio, int flag)
return(EWOULDBLOCK);
}
sc->state |= ASLP;
error = tsleep(sc, PZERO | PCATCH, "mmsrea", 0);
error = tsleep((caddr_t)sc, PZERO | PCATCH, "mmsrea", 0);
if (error != 0) {
splx(s);
return(error);
@ -396,15 +393,15 @@ void mmsintr(unit)
if (sc->state & ASLP) {
sc->state &= ~ASLP;
wakeup(sc);
wakeup((caddr_t)sc);
}
#ifdef 386BSD_KERNEL
#ifdef NetBSD
selwakeup(&sc->rsel);
#else
if (sc->rsel) {
selwakeup(&sc->rsel, 0);
selwakeup(sc->rsel, 0);
sc->rsel = 0;
}
#else
selwakeup(&sc->rsel);
#endif
}
}
@ -425,10 +422,10 @@ int mmsselect(dev_t dev, int rw, struct proc *p)
if (sc->inq.count)
ret = 1;
else {
#ifdef 386BSD_KERNEL
sc->rsel = p->p_pid;
#else
#ifdef NetBSD
selrecord(p, &sc->rsel);
#else
sc->rsel = p->p_pid;
#endif
ret = 0;
}

35
sys/arch/i386/isa/pms.c
View File

@ -42,9 +42,6 @@
* - 13 June 1993
*/
/* define this if you're using 386BSD rather than NetBSD */
/* #define 386BSD_KERNEL */
#include "pms.h"
#if NPMS > 0
@ -57,7 +54,7 @@
#include "ioctl.h"
#include "tty.h"
#include "file.h"
#ifndef 386BSD_KERNEL
#ifdef NetBSD
#include "select.h"
#endif
#include "proc.h"
@ -109,10 +106,10 @@ struct ringbuf {
static struct pms_softc { /* Driver status information */
struct ringbuf inq; /* Input queue */
#ifdef 386BSD_KERNEL
pid_t rsel; /* Process selecting for Input */
#else
#ifdef NetBSD
struct selinfo rsel;
#else
pid_t rsel; /* Process selecting for Input */
#endif
unsigned char state; /* Mouse driver state */
unsigned char status; /* Mouse button status */
@ -209,11 +206,11 @@ int pmsopen(dev_t dev, int flag, int fmt, struct proc *p)
/* Initialize state */
sc->state |= OPEN;
#ifdef 386BSD_KERNEL
sc->rsel = 0;
#else
#ifdef NetBSD
sc->rsel.si_pid = 0;
sc->rsel.si_coll = 0;
#else
sc->rsel = 0;
#endif
sc->status = 0;
sc->button = 0;
@ -287,7 +284,7 @@ int pmsread(dev_t dev, struct uio *uio, int flag)
return(EWOULDBLOCK);
}
sc->state |= ASLP;
error = tsleep(sc, PZERO | PCATCH, "pmsrea", 0);
error = tsleep((caddr_t)sc, PZERO | PCATCH, "pmsrea", 0);
if (error != 0) {
splx(s);
return(error);
@ -448,15 +445,15 @@ void pmsintr(unit)
if (sc->state & ASLP) {
sc->state &= ~ASLP;
wakeup(sc);
wakeup((caddr_t)sc);
}
#ifdef 386BSD_KERNEL
#ifdef NetBSD
selwakeup(&sc->rsel);
#else
if (sc->rsel) {
selwakeup(&sc->rsel, 0);
selwakeup(sc->rsel, 0);
sc->rsel = 0;
}
#else
selwakeup(&sc->rsel);
#endif
}
@ -480,10 +477,10 @@ int pmsselect(dev_t dev, int rw, struct proc *p)
if (sc->inq.count)
ret = 1;
else {
#ifdef 386BSD_KERNEL
sc->rsel = p->p_pid;
#else
#ifdef NetBSD
selrecord(p, &sc->rsel);
#else
sc->rsel = p->p_pid;
#endif
ret = 0;
}