aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/bktr
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2016-05-03 03:41:25 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2016-05-03 03:41:25 +0000
commit453130d9bfc1c6d68b366dfcb041689d69f81295 (patch)
treefe36ef227324b313676d43aef9a4d97c9a09675a /sys/dev/bktr
parent7860c0c3843dbb1cf8f4f2c20ee526e8dd2661da (diff)
Notes
Diffstat (limited to 'sys/dev/bktr')
-rw-r--r--sys/dev/bktr/CHANGELOG.TXT4
-rw-r--r--sys/dev/bktr/bktr_audio.c10
-rw-r--r--sys/dev/bktr/bktr_card.c2
-rw-r--r--sys/dev/bktr/bktr_core.c8
-rw-r--r--sys/dev/bktr/bktr_os.c6
-rw-r--r--sys/dev/bktr/bktr_os.h2
-rw-r--r--sys/dev/bktr/msp34xx.c4
7 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/bktr/CHANGELOG.TXT b/sys/dev/bktr/CHANGELOG.TXT
index 5cd1929ed696..bead697f04d0 100644
--- a/sys/dev/bktr/CHANGELOG.TXT
+++ b/sys/dev/bktr/CHANGELOG.TXT
@@ -356,7 +356,7 @@
BSDI code removed. Will be restored later.
1.70 12 July 1999 Roger Hardiman <roger@freebsd.org>
- Reorganise OS device dependant parts (based on a port to
+ Reorganise OS device dependent parts (based on a port to
linux by Brad Parker).
Make the driver compile on FreeBSD 2.2.x systems again.
Change number of VBI lines from 16 to 12 for NTSC formats.
@@ -368,7 +368,7 @@
Matt Brown <matt@dqc.org> added MSP3430G DBX initialisation.
1.71 30 Aug 1999 Roger Hardiman <roger@freebsd.org>
- Small cleanup of OS dependant code. Remove NPCI usage.
+ Small cleanup of OS dependent code. Remove NPCI usage.
Fix bug in AVerMedia detection.
Update VBI support for the AleVT Teletext package. Parts
from Juha Nurmela's driver <Juha.Nurmela@quicknet.inet.fi>
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index 6cfe5769e2d4..ea2b45869444 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -132,7 +132,7 @@ set_audio( bktr_ptr_t bktr, int cmd )
else
#endif /* AUDIOMUX_DISCOVER */
- /* check for existance of audio MUXes */
+ /* check for existence of audio MUXes */
if ( !bktr->card.audiomuxs[ 4 ] )
return( -1 );
@@ -308,7 +308,7 @@ init_BTSC( bktr_ptr_t bktr )
/*
* setup the dbx chip
- * XXX FIXME: alot of work to be done here, this merely unmutes it.
+ * XXX FIXME: a lot of work to be done here, this merely unmutes it.
*/
int
set_BTSC( bktr_ptr_t bktr, int control )
@@ -471,7 +471,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.
*/
@@ -561,7 +561,7 @@ void msp_autodetect( bktr_ptr_t bktr ) {
msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008,0x0020);/* Loudspeaker set stereo*/
/*
set spatial effect strength to 50% enlargement
- set spatial effect mode b, stereo basewidth enlargment only
+ set spatial effect mode b, stereo basewidth enlargement only
*/
msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0005,0x3f28);
} else if (stereo > 0x8000) { /* bilingual mode */
@@ -573,7 +573,7 @@ void msp_autodetect( bktr_ptr_t bktr ) {
msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0008,0x0030);/* Loudspeaker */
/*
set spatial effect strength to 50% enlargement
- set spatial effect mode a, stereo basewidth enlargment
+ set spatial effect mode a, stereo basewidth enlargement
and pseudo stereo effect with automatic high-pass filter
*/
msp_dpl_write(bktr, bktr->msp_addr, 0x12, 0x0005,0x3f08);
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index e59ebbef06bf..be76fb304d46 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -1217,7 +1217,7 @@ checkTuner:
} /* end switch(card) */
- /* At this point, a goto checkDBX has not occured */
+ /* At this point, a goto checkDBX has not occurred */
/* We have not been able to select a Tuner */
/* Some cards make use of the tuner address to */
/* identify the make/model of tuner */
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 67f3ab1896f0..e069778da185 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -256,7 +256,7 @@ typedef u_char bool_t;
*/
#define MAX_VBI_LINES 16 /* Maximum for all vidoe formats */
-#define VBI_LINE_SIZE 2048 /* Store upto 2048 bytes per line */
+#define VBI_LINE_SIZE 2048 /* Store up to 2048 bytes per line */
#define VBI_BUFFER_ITEMS 20 /* Number of frames we buffer */
#define VBI_DATA_SIZE (VBI_LINE_SIZE * MAX_VBI_LINES * 2)
#define VBI_BUFFER_SIZE (VBI_DATA_SIZE * VBI_BUFFER_ITEMS)
@@ -626,7 +626,7 @@ bktr_store_address(unit, BKTR_MEM_BUF, buf);
init_audio_devices( bktr );
#ifdef BKTR_NEW_MSP34XX_DRIVER
- /* setup the kenrel thread */
+ /* setup the kernel thread */
err = msp_attach( bktr );
if ( err != 0 ) /* error doing kernel thread stuff, disable msp3400c */
bktr->card.msp3400c = 0;
@@ -1786,7 +1786,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thr
&& bktr->video.addr == 0) {
/*****************************/
-/* *** OS Dependant code *** */
+/* *** OS Dependent code *** */
/*****************************/
#if defined(__NetBSD__) || defined(__OpenBSD__)
bus_dmamap_t dmamap;
@@ -2369,7 +2369,7 @@ common_ioctl( bktr_ptr_t bktr, ioctl_cmd_t cmd, caddr_t arg )
/* Tuner is MUX0, RCA is MUX1, S-Video is MUX2 */
/* On the Hauppauge bt878 boards, */
/* Tuner is MUX0, RCA is MUX3 */
- /* Unfortunatly Meteor driver codes DEV_RCA as DEV_0, so we */
+ /* Unfortunately Meteor driver codes DEV_RCA as DEV_0, so we */
/* stick with this system in our Meteor Emulation */
switch(*(unsigned long *)arg & METEOR_DEV_MASK) {
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index e8c0f7bc8418..aa41454f0cab 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
* chipset.
* Copyright Roger Hardiman and Amancio Hasty.
*
- * bktr_os : This has all the Operating System dependant code,
+ * bktr_os : This has all the Operating System dependent code,
* probe/attach and open/close/ioctl/read/mmap
* memory allocation
* PCI bus interfacing
@@ -395,12 +395,12 @@ bktr_attach( device_t dev )
fun = fun | 1; /* Enable writes to the sub-system vendor ID */
#if defined( BKTR_430_FX_MODE )
- if (bootverbose) printf("Using 430 FX chipset compatibilty mode\n");
+ if (bootverbose) printf("Using 430 FX chipset compatibility mode\n");
fun = fun | 2; /* Enable Intel 430 FX compatibility mode */
#endif
#if defined( BKTR_SIS_VIA_MODE )
- if (bootverbose) printf("Using SiS/VIA chipset compatibilty mode\n");
+ if (bootverbose) printf("Using SiS/VIA chipset compatibility mode\n");
fun = fun | 4; /* Enable SiS/VIA compatibility mode (useful for
OPTi chipset motherboards too */
#endif
diff --git a/sys/dev/bktr/bktr_os.h b/sys/dev/bktr/bktr_os.h
index 1cd708df3c6a..6456616be281 100644
--- a/sys/dev/bktr/bktr_os.h
+++ b/sys/dev/bktr/bktr_os.h
@@ -6,7 +6,7 @@
* chipset.
* Copyright Roger Hardiman and Amancio Hasty.
*
- * bktr_os : This has all the Operating System dependant code.
+ * bktr_os : This has all the Operating System dependent code.
*
*/
diff --git a/sys/dev/bktr/msp34xx.c b/sys/dev/bktr/msp34xx.c
index 65cf0e109c46..8c45e6723a97 100644
--- a/sys/dev/bktr/msp34xx.c
+++ b/sys/dev/bktr/msp34xx.c
@@ -39,7 +39,7 @@
*
* FM-Mono
* should work. The stereo modes are backward compatible to FM-mono,
- * therefore FM-Mono should be allways available.
+ * therefore FM-Mono should be always available.
*
* FM-Stereo (B/G, used in germany)
* should work, with autodetect
@@ -226,7 +226,7 @@ static struct MSP_INIT_DATA_DEM {
MSP_CARRIER(10.7), MSP_CARRIER(10.7),
0x00d0, 0x0480, 0x0020, 0x3000 },
- /* Terrestial FM-mono + FM-stereo */
+ /* Terrestrial FM-mono + FM-stereo */
{ { 3, 18, 27, 48, 66, 72 }, { 3, 18, 27, 48, 66, 72 },
MSP_CARRIER(5.5), MSP_CARRIER(5.5),
0x00d0, 0x0480, 0x0030, 0x3000},