mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
V4L/DVB (12858): go7007: whitespacing cleanups
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
dd694441e3
commit
028d4c989a
4 changed files with 86 additions and 84 deletions
|
@ -1034,7 +1034,8 @@ static int brctrl_to_package(struct go7007 *go,
|
|||
0xBF1B, framelen[7],
|
||||
0, 0,
|
||||
|
||||
#if 0 /* Remove once we don't care about matching */
|
||||
#if 0
|
||||
/* Remove once we don't care about matching */
|
||||
0x200e, 0x0000,
|
||||
0xBF56, 4,
|
||||
0xBF57, 0,
|
||||
|
|
|
@ -27,7 +27,7 @@ below.
|
|||
The README files from the original package appears below:
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
WIS GO7007SB Public Linux Driver
|
||||
WIS GO7007SB Public Linux Driver
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
@ -78,23 +78,23 @@ All vendor-built kernels should already be configured properly. However,
|
|||
for custom-built kernels, the following options need to be enabled in the
|
||||
kernel as built-in or modules:
|
||||
|
||||
CONFIG_HOTPLUG - Support for hot-pluggable devices
|
||||
CONFIG_MODULES - Enable loadable module support
|
||||
CONFIG_KMOD - Automatic kernel module loading
|
||||
CONFIG_FW_LOADER - Hotplug firmware loading support
|
||||
CONFIG_I2C - I2C support
|
||||
CONFIG_VIDEO_DEV - Video For Linux
|
||||
CONFIG_SOUND - Sound card support
|
||||
CONFIG_SND - Advanced Linux Sound Architecture
|
||||
CONFIG_USB - Support for Host-side USB
|
||||
CONFIG_USB_DEVICEFS - USB device filesystem
|
||||
CONFIG_USB_EHCI_HCD - EHCI HCD (USB 2.0) support
|
||||
CONFIG_HOTPLUG - Support for hot-pluggable devices
|
||||
CONFIG_MODULES - Enable loadable module support
|
||||
CONFIG_KMOD - Automatic kernel module loading
|
||||
CONFIG_FW_LOADER - Hotplug firmware loading support
|
||||
CONFIG_I2C - I2C support
|
||||
CONFIG_VIDEO_DEV - Video For Linux
|
||||
CONFIG_SOUND - Sound card support
|
||||
CONFIG_SND - Advanced Linux Sound Architecture
|
||||
CONFIG_USB - Support for Host-side USB
|
||||
CONFIG_USB_DEVICEFS - USB device filesystem
|
||||
CONFIG_USB_EHCI_HCD - EHCI HCD (USB 2.0) support
|
||||
|
||||
Additionally, to use the example application, the following options need to
|
||||
be enabled in the ALSA section:
|
||||
|
||||
CONFIG_SND_MIXER_OSS - OSS Mixer API
|
||||
CONFIG_SND_PCM_OSS - OSS PCM (digital audio) API
|
||||
CONFIG_SND_MIXER_OSS - OSS Mixer API
|
||||
CONFIG_SND_PCM_OSS - OSS PCM (digital audio) API
|
||||
|
||||
The hotplug scripts, along with the fxload utility, must also be installed.
|
||||
These scripts can be obtained from <http://linux-hotplug.sourceforge.net/>.
|
||||
|
@ -107,7 +107,7 @@ fxload and for loading firmware into the driver using the firmware agent.
|
|||
|
||||
Most users should be able to compile the driver by simply running:
|
||||
|
||||
$ make
|
||||
$ make
|
||||
|
||||
in the top-level directory of the driver kit. First the kernel modules
|
||||
will be built, followed by the example applications.
|
||||
|
@ -117,12 +117,12 @@ currently-running kernel, or if the module should be built for a kernel
|
|||
other than the currently-running kernel, an additional parameter will need
|
||||
to be passed to make to specify the appropriate kernel source directory:
|
||||
|
||||
$ make KERNELSRC=/usr/src/linux-2.6.10-custom3
|
||||
$ make KERNELSRC=/usr/src/linux-2.6.10-custom3
|
||||
|
||||
Once the compile completes, the driver and firmware files should be
|
||||
installed by running:
|
||||
|
||||
$ make install
|
||||
$ make install
|
||||
|
||||
The kernel modules will be placed in "/lib/modules/<KERNEL VERSION>/extra"
|
||||
and the firmware files will be placed in the appropriate hotplug firmware
|
||||
|
@ -200,7 +200,7 @@ stereo audio broadcasts on the A2 carrier.
|
|||
To verify that the configuration has been placed in the correct location,
|
||||
execute:
|
||||
|
||||
$ modprobe -c | grep wis-sony-tuner
|
||||
$ modprobe -c | grep wis-sony-tuner
|
||||
|
||||
If the configuration line appears, then modprobe will pass the parameters
|
||||
correctly the next time the wis-sony-tuner module is loaded into the
|
||||
|
@ -223,7 +223,7 @@ This application will auto-detect the V4L2 and ALSA/OSS device names of the
|
|||
hardware and will record video and audio to an AVI file for a specified
|
||||
number of seconds. For example:
|
||||
|
||||
$ apps/gorecord -duration 60 capture.avi
|
||||
$ apps/gorecord -duration 60 capture.avi
|
||||
|
||||
If this application does not successfully record an AVI file, the error
|
||||
messages produced by gorecord and recorded in the system log (usually in
|
||||
|
@ -286,35 +286,35 @@ features of the GO7007SB encoder, which are described below:
|
|||
|
||||
Fields in struct go7007_comp_params:
|
||||
|
||||
__u32 The maximum number of frames in each
|
||||
gop_size Group Of Pictures; i.e. the maximum
|
||||
number of frames minus one between
|
||||
each key frame.
|
||||
__u32 The maximum number of frames in each
|
||||
gop_size Group Of Pictures; i.e. the maximum
|
||||
number of frames minus one between
|
||||
each key frame.
|
||||
|
||||
__u32 The maximum number of sequential
|
||||
max_b_frames bidirectionally-predicted frames.
|
||||
(B-frames are not yet supported.)
|
||||
__u32 The maximum number of sequential
|
||||
max_b_frames bidirectionally-predicted frames.
|
||||
(B-frames are not yet supported.)
|
||||
|
||||
enum go7007_aspect_ratio The aspect ratio to be encoded in the
|
||||
aspect_ratio meta-data of the compressed format.
|
||||
enum go7007_aspect_ratio The aspect ratio to be encoded in the
|
||||
aspect_ratio meta-data of the compressed format.
|
||||
|
||||
Choices are:
|
||||
GO7007_ASPECT_RATIO_1_1
|
||||
GO7007_ASPECT_RATIO_4_3_NTSC
|
||||
GO7007_ASPECT_RATIO_4_3_PAL
|
||||
GO7007_ASPECT_RATIO_16_9_NTSC
|
||||
GO7007_ASPECT_RATIO_16_9_PAL
|
||||
Choices are:
|
||||
GO7007_ASPECT_RATIO_1_1
|
||||
GO7007_ASPECT_RATIO_4_3_NTSC
|
||||
GO7007_ASPECT_RATIO_4_3_PAL
|
||||
GO7007_ASPECT_RATIO_16_9_NTSC
|
||||
GO7007_ASPECT_RATIO_16_9_PAL
|
||||
|
||||
__u32 Bit-wise OR of control flags (below)
|
||||
flags
|
||||
__u32 Bit-wise OR of control flags (below)
|
||||
flags
|
||||
|
||||
Flags in struct go7007_comp_params:
|
||||
|
||||
GO7007_COMP_CLOSED_GOP Only produce self-contained GOPs, used
|
||||
to produce streams appropriate for
|
||||
random seeking.
|
||||
GO7007_COMP_CLOSED_GOP Only produce self-contained GOPs, used
|
||||
to produce streams appropriate for
|
||||
random seeking.
|
||||
|
||||
GO7007_COMP_OMIT_SEQ_HEADER Omit the stream sequence header.
|
||||
GO7007_COMP_OMIT_SEQ_HEADER Omit the stream sequence header.
|
||||
|
||||
|
||||
GO7007IOC_S_MPEG_PARAMS, GO7007IOC_G_MPEG_PARAMS
|
||||
|
@ -337,56 +337,56 @@ features of the GO7007SB encoder, which are described below:
|
|||
|
||||
Fields in struct go7007_mpeg_params:
|
||||
|
||||
enum go7007_mpeg_video_standard
|
||||
mpeg_video_standard The MPEG video standard in which to
|
||||
compress the video.
|
||||
enum go7007_mpeg_video_standard
|
||||
mpeg_video_standard The MPEG video standard in which to
|
||||
compress the video.
|
||||
|
||||
Choices are:
|
||||
GO7007_MPEG_VIDEO_MPEG1
|
||||
GO7007_MPEG_VIDEO_MPEG2
|
||||
GO7007_MPEG_VIDEO_MPEG4
|
||||
Choices are:
|
||||
GO7007_MPEG_VIDEO_MPEG1
|
||||
GO7007_MPEG_VIDEO_MPEG2
|
||||
GO7007_MPEG_VIDEO_MPEG4
|
||||
|
||||
__u32 Bit-wise OR of control flags (below)
|
||||
flags
|
||||
__u32 Bit-wise OR of control flags (below)
|
||||
flags
|
||||
|
||||
__u32 The profile and level indication to be
|
||||
pali stored in the sequence header. This
|
||||
is only used as an indicator to the
|
||||
decoder, and does not affect the MPEG
|
||||
features used in the video stream.
|
||||
Not valid for MPEG1.
|
||||
__u32 The profile and level indication to be
|
||||
pali stored in the sequence header. This
|
||||
is only used as an indicator to the
|
||||
decoder, and does not affect the MPEG
|
||||
features used in the video stream.
|
||||
Not valid for MPEG1.
|
||||
|
||||
Choices for MPEG2 are:
|
||||
GO7007_MPEG2_PROFILE_MAIN_MAIN
|
||||
Choices for MPEG2 are:
|
||||
GO7007_MPEG2_PROFILE_MAIN_MAIN
|
||||
|
||||
Choices for MPEG4 are:
|
||||
GO7007_MPEG4_PROFILE_S_L0
|
||||
GO7007_MPEG4_PROFILE_S_L1
|
||||
GO7007_MPEG4_PROFILE_S_L2
|
||||
GO7007_MPEG4_PROFILE_S_L3
|
||||
GO7007_MPEG4_PROFILE_ARTS_L1
|
||||
GO7007_MPEG4_PROFILE_ARTS_L2
|
||||
GO7007_MPEG4_PROFILE_ARTS_L3
|
||||
GO7007_MPEG4_PROFILE_ARTS_L4
|
||||
GO7007_MPEG4_PROFILE_AS_L0
|
||||
GO7007_MPEG4_PROFILE_AS_L1
|
||||
GO7007_MPEG4_PROFILE_AS_L2
|
||||
GO7007_MPEG4_PROFILE_AS_L3
|
||||
GO7007_MPEG4_PROFILE_AS_L4
|
||||
GO7007_MPEG4_PROFILE_AS_L5
|
||||
Choices for MPEG4 are:
|
||||
GO7007_MPEG4_PROFILE_S_L0
|
||||
GO7007_MPEG4_PROFILE_S_L1
|
||||
GO7007_MPEG4_PROFILE_S_L2
|
||||
GO7007_MPEG4_PROFILE_S_L3
|
||||
GO7007_MPEG4_PROFILE_ARTS_L1
|
||||
GO7007_MPEG4_PROFILE_ARTS_L2
|
||||
GO7007_MPEG4_PROFILE_ARTS_L3
|
||||
GO7007_MPEG4_PROFILE_ARTS_L4
|
||||
GO7007_MPEG4_PROFILE_AS_L0
|
||||
GO7007_MPEG4_PROFILE_AS_L1
|
||||
GO7007_MPEG4_PROFILE_AS_L2
|
||||
GO7007_MPEG4_PROFILE_AS_L3
|
||||
GO7007_MPEG4_PROFILE_AS_L4
|
||||
GO7007_MPEG4_PROFILE_AS_L5
|
||||
|
||||
Flags in struct go7007_mpeg_params:
|
||||
|
||||
GO7007_MPEG_FORCE_DVD_MODE Force all compression parameters and
|
||||
bitrate control settings to comply
|
||||
with DVD MPEG2 stream requirements.
|
||||
This overrides most compression and
|
||||
bitrate settings!
|
||||
GO7007_MPEG_FORCE_DVD_MODE Force all compression parameters and
|
||||
bitrate control settings to comply
|
||||
with DVD MPEG2 stream requirements.
|
||||
This overrides most compression and
|
||||
bitrate settings!
|
||||
|
||||
GO7007_MPEG_OMIT_GOP_HEADER Omit the GOP header.
|
||||
GO7007_MPEG_OMIT_GOP_HEADER Omit the GOP header.
|
||||
|
||||
GO7007_MPEG_REPEAT_SEQHEADER Repeat the MPEG sequence header at
|
||||
the start of each GOP.
|
||||
GO7007_MPEG_REPEAT_SEQHEADER Repeat the MPEG sequence header at
|
||||
the start of each GOP.
|
||||
|
||||
|
||||
GO7007IOC_S_BITRATE, GO7007IOC_G_BITRATE
|
||||
|
@ -404,7 +404,7 @@ features of the GO7007SB encoder, which are described below:
|
|||
|
||||
|
||||
----------------------------------------------------------------------------
|
||||
Installing the WIS PCI Voyager Driver
|
||||
Installing the WIS PCI Voyager Driver
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
The WIS PCI Voyager driver requires several patches to the Linux 2.6.11.x
|
||||
|
|
|
@ -34,7 +34,7 @@ extern void s2250loader_cleanup(void);
|
|||
#define VPX322_ADDR_CONTRAST0 0x0128
|
||||
#define VPX322_ADDR_CONTRAST1 0x0132
|
||||
#define VPX322_ADDR_HUE 0x00dc
|
||||
#define VPX322_ADDR_SAT 0x0030
|
||||
#define VPX322_ADDR_SAT 0x0030
|
||||
|
||||
struct go7007_usb_board {
|
||||
unsigned int flags;
|
||||
|
|
|
@ -111,7 +111,8 @@ static int wis_tw9903_command(struct i2c_client *client,
|
|||
i2c_smbus_write_byte_data(client, 0x02, 0x40 | (*input << 1));
|
||||
break;
|
||||
}
|
||||
#if 0 /* The scaler on this thing seems to be horribly broken */
|
||||
#if 0
|
||||
/* The scaler on this thing seems to be horribly broken */
|
||||
case DECODER_SET_RESOLUTION:
|
||||
{
|
||||
struct video_decoder_resolution *res = arg;
|
||||
|
|
Loading…
Reference in a new issue