CVS commit: src/sys/dev/pci/bktr
Module Name:src Committed By: skrll Date: Sun Feb 23 10:30:43 UTC 2020 Modified Files: src/sys/dev/pci/bktr: bktr_core.c Log Message: typo in comment To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/bktr/bktr_core.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/bktr/bktr_core.c diff -u src/sys/dev/pci/bktr/bktr_core.c:1.56 src/sys/dev/pci/bktr/bktr_core.c:1.57 --- src/sys/dev/pci/bktr/bktr_core.c:1.56 Sun Feb 3 03:19:27 2019 +++ src/sys/dev/pci/bktr/bktr_core.c Sun Feb 23 10:30:43 2020 @@ -1,6 +1,6 @@ /* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */ -/* $NetBSD: bktr_core.c,v 1.56 2019/02/03 03:19:27 mrg Exp $ */ +/* $NetBSD: bktr_core.c,v 1.57 2020/02/23 10:30:43 skrll Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */ /* @@ -98,7 +98,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.56 2019/02/03 03:19:27 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.57 2020/02/23 10:30:43 skrll Exp $"); #include "opt_bktr.h" /* Include any kernel config options */ @@ -2977,7 +2977,7 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, i buffer = target_buffer; - /* contruct sync : for video packet format */ + /* construct sync : for video packet format */ *dma_prog++ = htole32(OP_SYNC | BKTR_RESYNC | BKTR_FM1); /* sync, mode indicator packed data */ @@ -3132,7 +3132,7 @@ yuvpack_prog(bktr_ptr_t bktr, char i_fla buffer = target_buffer; - /* contruct sync : for video packet format */ + /* construct sync : for video packet format */ /* sync, mode indicator packed data */ *dma_prog++ = htole32(OP_SYNC | BKTR_RESYNC | BKTR_FM1); *dma_prog++ = htole32(0); /* NULL WORD */ @@ -3255,7 +3255,7 @@ yuv422_prog(bktr_ptr_t bktr, char i_flag t1 = buffer; - /* contruct sync : for video packet format */ + /* construct sync : for video packet format */ *dma_prog++ = htole32(OP_SYNC | BKTR_RESYNC | BKTR_FM3); /*sync, mode indicator packed data*/ *dma_prog++ = htole32(0); /* NULL WORD */
CVS commit: src/sys/dev/pci/bktr
Module Name:src
Committed By: jdolecek
Date: Sun Dec 9 11:22:35 UTC 2018
Modified Files:
src/sys/dev/pci/bktr: bktr_os.c
Log Message:
use pci_intr_establish_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/pci/bktr/bktr_os.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/bktr/bktr_os.c
diff -u src/sys/dev/pci/bktr/bktr_os.c:1.67 src/sys/dev/pci/bktr/bktr_os.c:1.68
--- src/sys/dev/pci/bktr/bktr_os.c:1.67 Thu Jul 14 10:19:06 2016
+++ src/sys/dev/pci/bktr/bktr_os.c Sun Dec 9 11:22:35 2018
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */
-/* $NetBSD: bktr_os.c,v 1.67 2016/07/14 10:19:06 msaitoh Exp $ */
+/* $NetBSD: bktr_os.c,v 1.68 2018/12/09 11:22:35 jdolecek Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.67 2016/07/14 10:19:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.68 2018/12/09 11:22:35 jdolecek Exp $");
#ifdef __FreeBSD__
#include "bktr.h"
@@ -1506,8 +1506,8 @@ bktr_attach(device_t parent, device_t se
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- bktr->ih = pci_intr_establish(pa->pa_pc, ih, IPL_VIDEO,
- bktr_intr, bktr);
+ bktr->ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_VIDEO,
+ bktr_intr, bktr, device_xname(bktr->bktr_dev));
if (bktr->ih == NULL) {
aprint_error("%s: couldn't establish interrupt",
bktr_name(bktr));
CVS commit: src/sys/dev/pci/bktr
Module Name:src Committed By: dholland Date: Sat Aug 10 18:14:21 UTC 2013 Modified Files: src/sys/dev/pci/bktr: bktr_os.c Log Message: Redo -r1.53 correctly. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/bktr/bktr_os.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/bktr/bktr_os.c diff -u src/sys/dev/pci/bktr/bktr_os.c:1.61 src/sys/dev/pci/bktr/bktr_os.c:1.62 --- src/sys/dev/pci/bktr/bktr_os.c:1.61 Sat Oct 27 17:18:36 2012 +++ src/sys/dev/pci/bktr/bktr_os.c Sat Aug 10 18:14:21 2013 @@ -1,6 +1,6 @@ /* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */ -/* $NetBSD: bktr_os.c,v 1.61 2012/10/27 17:18:36 chs Exp $ */ +/* $NetBSD: bktr_os.c,v 1.62 2013/08/10 18:14:21 dholland Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */ /* @@ -51,7 +51,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bktr_os.c,v 1.61 2012/10/27 17:18:36 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: bktr_os.c,v 1.62 2013/08/10 18:14:21 dholland Exp $); #ifdef __FreeBSD__ #include bktr.h @@ -165,7 +165,7 @@ SYSCTL_INT(_hw_bt848, OID_AUTO, slow_msp #define BKTR_DEBUG #ifdef BKTR_DEBUG int bktr_debug = 0; -#define DPR(x) if (bktr_debug) printf x +#define DPR(x) (bktr_debug ? printf x : (void)0) #else #define DPR(x) #endif
CVS commit: src/sys/dev/pci/bktr
Module Name:src
Committed By: joerg
Date: Fri Dec 14 19:38:36 UTC 2012
Modified Files:
src/sys/dev/pci/bktr: bktr_core.c
Log Message:
bt848_format is only defined in a __FreeBSD__ section of bktr_os.c and
overriding the local (static) definition with extern is bogus.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/bktr/bktr_core.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/bktr/bktr_core.c
diff -u src/sys/dev/pci/bktr/bktr_core.c:1.53 src/sys/dev/pci/bktr/bktr_core.c:1.54
--- src/sys/dev/pci/bktr/bktr_core.c:1.53 Sat Oct 27 17:18:36 2012
+++ src/sys/dev/pci/bktr/bktr_core.c Fri Dec 14 19:38:36 2012
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.c,v 1.53 2012/10/27 17:18:36 chs Exp $ */
+/* $NetBSD: bktr_core.c,v 1.54 2012/12/14 19:38:36 joerg Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -98,7 +98,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bktr_core.c,v 1.53 2012/10/27 17:18:36 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: bktr_core.c,v 1.54 2012/12/14 19:38:36 joerg Exp $);
#include opt_bktr.h /* Include any kernel config options */
@@ -969,7 +969,6 @@ bktr_softintr(void *cookie)
/*
*
*/
-extern int bt848_format; /* used to set the default format, PAL or NTSC */
int
video_open(bktr_ptr_t bktr)
{
CVS commit: src/sys/dev/pci/bktr
Module Name:src
Committed By: msaitoh
Date: Fri Dec 7 05:56:30 UTC 2012
Modified Files:
src/sys/dev/pci/bktr: bktr_audio.c
Log Message:
- sprintf() - snprintf()
- Fix typo in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/bktr/bktr_audio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/bktr/bktr_audio.c
diff -u src/sys/dev/pci/bktr/bktr_audio.c:1.18 src/sys/dev/pci/bktr/bktr_audio.c:1.19
--- src/sys/dev/pci/bktr/bktr_audio.c:1.18 Wed Jan 16 13:08:54 2008
+++ src/sys/dev/pci/bktr/bktr_audio.c Fri Dec 7 05:56:30 2012
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_audio.c,v 1.6 2003/03/11 23:11:20 thomasklausner Exp $ */
-/* $NetBSD: bktr_audio.c,v 1.18 2008/01/16 13:08:54 jmcneill Exp $ */
+/* $NetBSD: bktr_audio.c,v 1.19 2012/12/07 05:56:30 msaitoh Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.8 2000/10/31 13:09:56 roger Exp$ */
/*
* This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -71,7 +71,7 @@
#ifdef __NetBSD__
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bktr_audio.c,v 1.18 2008/01/16 13:08:54 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: bktr_audio.c,v 1.19 2012/12/07 05:56:30 msaitoh Exp $);
#include sys/proc.h
#include dev/ic/bt8xx.h /* NetBSD location of .h files */
@@ -465,8 +465,9 @@ void msp_read_id(bktr_ptr_t bktr) {
rev1 = msp_dpl_read(bktr, bktr-msp_addr, 0x12, 0x001e);
rev2 = msp_dpl_read(bktr, bktr-msp_addr, 0x12, 0x001f);
-sprintf(bktr-msp_version_string, 34%02d%c-%c%d,
- (rev28)0xff, (rev10xff)+'@', ((rev18)0xff)+'@', rev20x1f);
+snprintf(bktr-msp_version_string, sizeof bktr-msp_version_string,
+ 34%02d%c-%c%d, (rev28)0xff, (rev10xff)+'@', ((rev18)0xff)+'@',
+ rev20x1f);
}
@@ -475,7 +476,7 @@ void msp_read_id(bktr_ptr_t bktr) {
* For the MSP3430G, we use fast autodetect mode
* For the MSP3410/3415 there are two schemes for this
* a) Fast autodetection - the chip is put into autodetect mode, and the function
- * returns immediatly. This works in most cases and is the Default Mode.
+ * returns immediately. This works in most cases and is the Default Mode.
* b) Slow mode. The function sets the MSP3410/3415 chip, then waits for feedback from
* the chip and re-programs it if needed.
*/
@@ -613,8 +614,9 @@ void dpl_read_id(bktr_ptr_t bktr) {
rev1 = msp_dpl_read(bktr, bktr-dpl_addr, 0x12, 0x001e);
rev2 = msp_dpl_read(bktr, bktr-dpl_addr, 0x12, 0x001f);
-sprintf(bktr-dpl_version_string, 34%02d%c-%c%d,
- ((rev28)0xff)-1, (rev10xff)+'@', ((rev18)0xff)+'@', rev20x1f);
+snprintf(bktr-dpl_version_string, sizeof bktr-dpl_version_string,
+ 34%02d%c-%c%d, ((rev28)0xff)-1, (rev10xff)+'@',
+ ((rev18)0xff)+'@', rev20x1f);
}
/* Configure the DPL chip to Auto-detect the audio format */
CVS commit: src/sys/dev/pci/bktr
Module Name:src
Committed By: dyoung
Date: Wed Jan 26 00:54:36 UTC 2011
Modified Files:
src/sys/dev/pci/bktr: bktr_reg.h
Log Message:
unifdef -U__bsdi__ -U__FreeBSD__ -D__NetBSD__. No functional change
intended.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/bktr/bktr_reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/bktr/bktr_reg.h
diff -u src/sys/dev/pci/bktr/bktr_reg.h:1.20 src/sys/dev/pci/bktr/bktr_reg.h:1.21
--- src/sys/dev/pci/bktr/bktr_reg.h:1.20 Wed May 6 10:34:33 2009
+++ src/sys/dev/pci/bktr/bktr_reg.h Wed Jan 26 00:54:35 2011
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_reg.h,v 1.3 2003/03/11 23:11:27 thomasklausner Exp $ */
-/* $NetBSD: bktr_reg.h,v 1.20 2009/05/06 10:34:33 cegger Exp $ */
+/* $NetBSD: bktr_reg.h,v 1.21 2011/01/26 00:54:35 dyoung Exp $ */
/*
* $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp$
*
@@ -37,55 +37,17 @@
*
*/
-#ifdef __FreeBSD__
-# if (__FreeBSD_version = 31)
-#include smbus.h
-# else
-#define NSMBUS 0 /* FreeBSD before 3.1 does not have SMBUS */
-# endif
-# if (NSMBUS 0)
-#define BKTR_USE_FREEBSD_SMBUS
-# endif
-#endif
-#ifdef __NetBSD__
#include sys/bus.h
#include sys/device.h /* device_t */
#include sys/select.h /* struct selinfo */
#include sys/reboot.h /* AB_* for bootverbose */
-#endif
/*
* The kernel options for the driver now all begin with BKTR.
* Support the older kernel options on FreeBSD and OpenBSD.
*
*/
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-#if defined(BROOKTREE_ALLOC_PAGES)
-#define BKTR_ALLOC_PAGES BROOKTREE_ALLOC_PAGES
-#endif
-
-#if defined(BROOKTREE_SYSTEM_DEFAULT)
-#define BKTR_SYSTEM_DEFAULT BROOKTREE_SYSTEM_DEFAULT
-#endif
-
-#if defined(OVERRIDE_CARD)
-#define BKTR_OVERRIDE_CARD OVERRIDE_CARD
-#endif
-
-#if defined(OVERRIDE_TUNER)
-#define BKTR_OVERRIDE_TUNER OVERRIDE_TUNER
-#endif
-
-#if defined(OVERRIDE_DBX)
-#define BKTR_OVERRIDE_DBX OVERRIDE_DBX
-#endif
-
-#if defined(OVERRIDE_MSP)
-#define BKTR_OVERRIDE_MSP OVERRIDE_MSP
-#endif
-
-#endif
#ifndef PCI_LATENCY_TIMER
@@ -95,25 +57,6 @@
/*
* Definitions for the Brooktree 848/878 video capture to pci interface.
*/
-#ifndef __NetBSD__
-#define PCI_VENDOR_SHIFT0
-#define PCI_VENDOR_MASK 0x
-#define PCI_VENDOR(id) \
-(((id) PCI_VENDOR_SHIFT) PCI_VENDOR_MASK)
-
-#define PCI_PRODUCT_SHIFT 16
-#define PCI_PRODUCT_MASK0x
-#define PCI_PRODUCT(id) \
-(((id) PCI_PRODUCT_SHIFT) PCI_PRODUCT_MASK)
-
-/* PCI vendor ID */
-#define PCI_VENDOR_BROOKTREE0x109e/* Brooktree */
-/* Brooktree products */
-#define PCI_PRODUCT_BROOKTREE_BT848 0x0350/* Bt848 Video Capture */
-#define PCI_PRODUCT_BROOKTREE_BT849 0x0351/* Bt849 Video Capture */
-#define PCI_PRODUCT_BROOKTREE_BT878 0x036e/* Bt878 Video Capture */
-#define PCI_PRODUCT_BROOKTREE_BT879 0x036f/* Bt879 Video Capture */
-#endif
#define BROOKTREE_848 1
#define BROOKTREE_848A 2
@@ -469,10 +412,6 @@
* memory mapped structure method only works on 32 bit processors
* with the right type of endianness.
*/
-#if defined(__NetBSD__) || (defined(__FreeBSD__) (__FreeBSD_version =30))
-
-#if defined(__NetBSD__)
-
struct bktr_softc;
u_int8_t bktr_INB(struct bktr_softc *, int);
@@ -489,27 +428,6 @@
#define OUTW(bktr,offset,value) bktr_OUTW(bktr,offset,value)
#define OUTL(bktr,offset,value) bktr_OUTL(bktr,offset,value)
-#else
-
-#define INB(bktr,offset) bus_space_read_1((bktr)-memt,(bktr)-memh,(offset))
-#define INW(bktr,offset) bus_space_read_2((bktr)-memt,(bktr)-memh,(offset))
-#define INL(bktr,offset) bus_space_read_4((bktr)-memt,(bktr)-memh,(offset))
-#define OUTB(bktr,offset,value) bus_space_write_1((bktr)-memt,(bktr)-memh,(offset),(value))
-#define OUTW(bktr,offset,value) bus_space_write_2((bktr)-memt,(bktr)-memh,(offset),(value))
-#define OUTL(bktr,offset,value) bus_space_write_4((bktr)-memt,(bktr)-memh,(offset),(value))
-
-#endif /* __NetBSD__ */
-
-#else
-#define INB(bktr,offset) *(volatile unsigned char*) ((int)((bktr)-memh)+(offset))
-#define INW(bktr,offset) *(volatile unsigned short*)((int)((bktr)-memh)+(offset))
-#define INL(bktr,offset) *(volatile unsigned int*) ((int)((bktr)-memh)+(offset))
-#define OUTB(bktr,offset,value) *(volatile unsigned char*) ((int)((bktr)-memh)+(offset)) = (value)
-#define OUTW(bktr,offset,value) *(volatile unsigned short*)((int)((bktr)-memh)+(offset)) = (value)
-#define OUTL(bktr,offset,value) *(volatile unsigned int*) ((int)((bktr)-memh)+(offset)) = (value)
-#endif
-
-
typedef struct bktr_clip bktr_clip_t;
/*
@@ -517,14 +435,7 @@
*/
struct bktr_softc {
-#if defined (__bsdi__)
-struct device bktr_dev;
CVS commit: src/sys/dev/pci/bktr
Module Name:src
Committed By: macallan
Date: Fri Apr 23 19:27:35 UTC 2010
Modified Files:
src/sys/dev/pci/bktr: bktr_os.c
Log Message:
don't try to print a bus_space_handle_t
now this at least compiles on sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/bktr/bktr_os.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/bktr/bktr_os.c
diff -u src/sys/dev/pci/bktr/bktr_os.c:1.58 src/sys/dev/pci/bktr/bktr_os.c:1.59
--- src/sys/dev/pci/bktr/bktr_os.c:1.58 Mon Mar 22 22:41:59 2010
+++ src/sys/dev/pci/bktr/bktr_os.c Fri Apr 23 19:27:35 2010
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */
-/* $NetBSD: bktr_os.c,v 1.58 2010/03/22 22:41:59 dyoung Exp $ */
+/* $NetBSD: bktr_os.c,v 1.59 2010/04/23 19:27:35 macallan Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bktr_os.c,v 1.58 2010/03/22 22:41:59 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: bktr_os.c,v 1.59 2010/04/23 19:27:35 macallan Exp $);
#ifdef __FreeBSD__
#include bktr.h
@@ -1470,8 +1470,8 @@
| PCI_MAPREG_MEM_TYPE_32BIT, 0,
bktr-memt, bktr-memh, NULL,
bktr-obmemsz);
- DPR((pci_mapreg_map: memh %x, size %x\n,
- (u_int)bktr-memh, (u_int)bktr-obmemsz));
+ DPR((pci_mapreg_map: size %lx\n,
+ (unsigned long)bktr-obmemsz));
if (retval) {
printf(%s: couldn't map memory\n, bktr_name(bktr));
return;
