diff options
| author | jhb <jhb@FreeBSD.org> | 2001-03-07 03:42:42 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-03-07 03:42:42 +0000 |
| commit | f75a181b19d1c3a7bc52017f779a09ea9c8cecb0 (patch) | |
| tree | 266befdb6654334a95fa9dcc960fb8c47db367d9 | |
| parent | 9cd254601baefc2dc9c953abe9747717374ff8b1 (diff) | |
| download | FreeBSD-src-f75a181b19d1c3a7bc52017f779a09ea9c8cecb0.zip FreeBSD-src-f75a181b19d1c3a7bc52017f779a09ea9c8cecb0.tar.gz | |
- Lock the process while sending it a signal.
- Attempt to define empty PROC_LOCK/UNLOCK when needed to help keep
this driver portable.
| -rw-r--r-- | sys/dev/bktr/bktr_core.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index d0402e4..ecc0041 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -116,6 +116,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/proc.h> #include <sys/signalvar.h> #include <sys/vnode.h> @@ -130,6 +131,8 @@ #if (__FreeBSD_version < 500000) #include <machine/clock.h> /* for DELAY */ +#define PROC_LOCK(p) +#define PROC_UNLOCK(p) #endif #include <pci/pcivar.h> @@ -177,6 +180,8 @@ typedef unsigned int uintptr_t; /* *** BSDI *** */ /****************/ #ifdef __bsdi__ +#define PROC_LOCK(p) +#define PROC_UNLOCK(p) #endif /* __bsdi__ */ @@ -217,6 +222,9 @@ bktr_name(bktr_ptr_t bktr) return (bktr->bktr_dev.dv_xname); } +#define PROC_LOCK(p) +#define PROC_UNLOCK(p) + #endif /* __NetBSD__ || __OpenBSD__ */ @@ -895,9 +903,12 @@ common_bktr_intr( void *arg ) * let them know the frame is complete. */ - if (bktr->proc && !(bktr->signal & METEOR_SIG_MODE_MASK)) + if (bktr->proc && !(bktr->signal & METEOR_SIG_MODE_MASK)) { + PROC_LOCK(bktr->proc); psignal( bktr->proc, bktr->signal&(~METEOR_SIG_MODE_MASK) ); + PROC_UNLOCK(bktr->proc); + } /* * Reset the want flags if in continuous or @@ -1023,7 +1034,7 @@ video_open( bktr_ptr_t bktr ) bktr->frames_captured = 0; bktr->even_fields_captured = 0; bktr->odd_fields_captured = 0; - bktr->proc = (struct proc *)0; + bktr->proc = NULL; set_fps(bktr, frame_rate); bktr->video.addr = 0; bktr->video.width = 0; |
