summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorroger <roger@FreeBSD.org>1999-09-01 14:09:53 +0000
committerroger <roger@FreeBSD.org>1999-09-01 14:09:53 +0000
commit207d3101f44c416e94f1d79c087abb2644c8ba16 (patch)
tree85606cec5994e3ac5986660c4c34252ebbc5a5c7 /sys
parent7def0bc767d035b930e9193ee5e772ff85fc1766 (diff)
downloadFreeBSD-src-207d3101f44c416e94f1d79c087abb2644c8ba16.zip
FreeBSD-src-207d3101f44c416e94f1d79c087abb2644c8ba16.tar.gz
Update to driver 1.72.
Fix a bug where video capture locks up on channel changes. Many thanks to Juha for solving this. Submitted by: Juha Nurmela <Juha.Nurmela@quicknet.inet.fi>
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/bktr/bktr_core.c4
-rw-r--r--sys/pci/brooktree848.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index bbb18fc..0a0011a 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -449,6 +449,9 @@ They are unrelated to Revision Control numbering of FreeBSD or any other system.
by Maurice Castro <maurice@atum.castro.aus.net>
Tom Jansen <tom@unhooked.net> added BSDi support again.
+1.72 31 Aug 1999 Juha Nurmela <Juha.Nurmela@quicknet.inet.fi>
+ Clear cap_ctl register when restarting the RISC program.
+ This fixes the freezes experienced when changing changes.
*/
#ifdef __FreeBSD__
@@ -1612,6 +1615,7 @@ common_bktr_intr( void *arg )
u_short tdec_save = bt848->tdec;
bt848->gpio_dma_ctl = FIFO_RISC_DISABLED;
+ bt848->cap_ctl = CAPTURE_OFF;
bt848->int_mask = ALL_INTS_DISABLED;
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index bbb18fc..0a0011a 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -449,6 +449,9 @@ They are unrelated to Revision Control numbering of FreeBSD or any other system.
by Maurice Castro <maurice@atum.castro.aus.net>
Tom Jansen <tom@unhooked.net> added BSDi support again.
+1.72 31 Aug 1999 Juha Nurmela <Juha.Nurmela@quicknet.inet.fi>
+ Clear cap_ctl register when restarting the RISC program.
+ This fixes the freezes experienced when changing changes.
*/
#ifdef __FreeBSD__
@@ -1612,6 +1615,7 @@ common_bktr_intr( void *arg )
u_short tdec_save = bt848->tdec;
bt848->gpio_dma_ctl = FIFO_RISC_DISABLED;
+ bt848->cap_ctl = CAPTURE_OFF;
bt848->int_mask = ALL_INTS_DISABLED;
OpenPOWER on IntegriCloud