aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-15 10:06:04 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 23:13:36 -0400
commit028d4c989ab9e839471739332d185f8f158b0043 (patch)
tree4cf4646c3b6cd38dea2720e51343d9a8dcb75abd
parentdd694441e31ebdabc439874c7eca4af0fa8ab338 (diff)
V4L/DVB (12858): go7007: whitespacing cleanups
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat
-rw-r--r--drivers/staging/go7007/go7007-fw.c3
-rw-r--r--drivers/staging/go7007/go7007.txt172
-rw-r--r--drivers/staging/go7007/s2250-board.c2
-rw-r--r--drivers/staging/go7007/wis-tw9903.c3
4 files changed, 91 insertions, 89 deletions
diff --git a/drivers/staging/go7007/go7007-fw.c b/drivers/staging/go7007/go7007-fw.c
index 871ed43e4e05..a8bb264e0074 100644
--- a/drivers/staging/go7007/go7007-fw.c
+++ b/drivers/staging/go7007/go7007-fw.c
@@ -1034,7 +1034,8 @@ static int brctrl_to_package(struct go7007 *go,
1034 0xBF1B, framelen[7], 1034 0xBF1B, framelen[7],
1035 0, 0, 1035 0, 0,
1036 1036
1037#if 0 /* Remove once we don't care about matching */ 1037#if 0
1038 /* Remove once we don't care about matching */
1038 0x200e, 0x0000, 1039 0x200e, 0x0000,
1039 0xBF56, 4, 1040 0xBF56, 4,
1040 0xBF57, 0, 1041 0xBF57, 0,
diff --git a/drivers/staging/go7007/go7007.txt b/drivers/staging/go7007/go7007.txt
index 1c2907c1dc81..7656c0833c54 100644
--- a/drivers/staging/go7007/go7007.txt
+++ b/drivers/staging/go7007/go7007.txt
@@ -27,7 +27,7 @@ below.
27The README files from the original package appears below: 27The README files from the original package appears below:
28 28
29--------------------------------------------------------------------------- 29---------------------------------------------------------------------------
30 WIS GO7007SB Public Linux Driver 30 WIS GO7007SB Public Linux Driver
31--------------------------------------------------------------------------- 31---------------------------------------------------------------------------
32 32
33 33
@@ -78,23 +78,23 @@ All vendor-built kernels should already be configured properly. However,
78for custom-built kernels, the following options need to be enabled in the 78for custom-built kernels, the following options need to be enabled in the
79kernel as built-in or modules: 79kernel as built-in or modules:
80 80
81 CONFIG_HOTPLUG - Support for hot-pluggable devices 81 CONFIG_HOTPLUG - Support for hot-pluggable devices
82 CONFIG_MODULES - Enable loadable module support 82 CONFIG_MODULES - Enable loadable module support
83 CONFIG_KMOD - Automatic kernel module loading 83 CONFIG_KMOD - Automatic kernel module loading
84 CONFIG_FW_LOADER - Hotplug firmware loading support 84 CONFIG_FW_LOADER - Hotplug firmware loading support
85 CONFIG_I2C - I2C support 85 CONFIG_I2C - I2C support
86 CONFIG_VIDEO_DEV - Video For Linux 86 CONFIG_VIDEO_DEV - Video For Linux
87 CONFIG_SOUND - Sound card support 87 CONFIG_SOUND - Sound card support
88 CONFIG_SND - Advanced Linux Sound Architecture 88 CONFIG_SND - Advanced Linux Sound Architecture
89 CONFIG_USB - Support for Host-side USB 89 CONFIG_USB - Support for Host-side USB
90 CONFIG_USB_DEVICEFS - USB device filesystem 90 CONFIG_USB_DEVICEFS - USB device filesystem
91 CONFIG_USB_EHCI_HCD - EHCI HCD (USB 2.0) support 91 CONFIG_USB_EHCI_HCD - EHCI HCD (USB 2.0) support
92 92
93Additionally, to use the example application, the following options need to 93Additionally, to use the example application, the following options need to
94be enabled in the ALSA section: 94be enabled in the ALSA section:
95 95
96 CONFIG_SND_MIXER_OSS - OSS Mixer API 96 CONFIG_SND_MIXER_OSS - OSS Mixer API
97 CONFIG_SND_PCM_OSS - OSS PCM (digital audio) API 97 CONFIG_SND_PCM_OSS - OSS PCM (digital audio) API
98 98
99The hotplug scripts, along with the fxload utility, must also be installed. 99The hotplug scripts, along with the fxload utility, must also be installed.
100These scripts can be obtained from <http://linux-hotplug.sourceforge.net/>. 100These 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.
107 107
108Most users should be able to compile the driver by simply running: 108Most users should be able to compile the driver by simply running:
109 109
110 $ make 110 $ make
111 111
112in the top-level directory of the driver kit. First the kernel modules 112in the top-level directory of the driver kit. First the kernel modules
113will be built, followed by the example applications. 113will be built, followed by the example applications.
@@ -117,12 +117,12 @@ currently-running kernel, or if the module should be built for a kernel
117other than the currently-running kernel, an additional parameter will need 117other than the currently-running kernel, an additional parameter will need
118to be passed to make to specify the appropriate kernel source directory: 118to be passed to make to specify the appropriate kernel source directory:
119 119
120 $ make KERNELSRC=/usr/src/linux-2.6.10-custom3 120 $ make KERNELSRC=/usr/src/linux-2.6.10-custom3
121 121
122Once the compile completes, the driver and firmware files should be 122Once the compile completes, the driver and firmware files should be
123installed by running: 123installed by running:
124 124
125 $ make install 125 $ make install
126 126
127The kernel modules will be placed in "/lib/modules/<KERNEL VERSION>/extra" 127The kernel modules will be placed in "/lib/modules/<KERNEL VERSION>/extra"
128and the firmware files will be placed in the appropriate hotplug firmware 128and the firmware files will be placed in the appropriate hotplug firmware
@@ -200,7 +200,7 @@ stereo audio broadcasts on the A2 carrier.
200To verify that the configuration has been placed in the correct location, 200To verify that the configuration has been placed in the correct location,
201execute: 201execute:
202 202
203 $ modprobe -c | grep wis-sony-tuner 203 $ modprobe -c | grep wis-sony-tuner
204 204
205If the configuration line appears, then modprobe will pass the parameters 205If the configuration line appears, then modprobe will pass the parameters
206correctly the next time the wis-sony-tuner module is loaded into the 206correctly 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
223hardware and will record video and audio to an AVI file for a specified 223hardware and will record video and audio to an AVI file for a specified
224number of seconds. For example: 224number of seconds. For example:
225 225
226 $ apps/gorecord -duration 60 capture.avi 226 $ apps/gorecord -duration 60 capture.avi
227 227
228If this application does not successfully record an AVI file, the error 228If this application does not successfully record an AVI file, the error
229messages produced by gorecord and recorded in the system log (usually in 229messages produced by gorecord and recorded in the system log (usually in
@@ -286,35 +286,35 @@ features of the GO7007SB encoder, which are described below:
286 286
287 Fields in struct go7007_comp_params: 287 Fields in struct go7007_comp_params:
288 288
289 __u32 The maximum number of frames in each 289 __u32 The maximum number of frames in each
290 gop_size Group Of Pictures; i.e. the maximum 290 gop_size Group Of Pictures; i.e. the maximum
291 number of frames minus one between 291 number of frames minus one between
292 each key frame. 292 each key frame.
293 293
294 __u32 The maximum number of sequential 294 __u32 The maximum number of sequential
295 max_b_frames bidirectionally-predicted frames. 295 max_b_frames bidirectionally-predicted frames.
296 (B-frames are not yet supported.) 296 (B-frames are not yet supported.)
297 297
298 enum go7007_aspect_ratio The aspect ratio to be encoded in the 298 enum go7007_aspect_ratio The aspect ratio to be encoded in the
299 aspect_ratio meta-data of the compressed format. 299 aspect_ratio meta-data of the compressed format.
300 300
301 Choices are: 301 Choices are:
302 GO7007_ASPECT_RATIO_1_1 302 GO7007_ASPECT_RATIO_1_1
303 GO7007_ASPECT_RATIO_4_3_NTSC 303 GO7007_ASPECT_RATIO_4_3_NTSC
304 GO7007_ASPECT_RATIO_4_3_PAL 304 GO7007_ASPECT_RATIO_4_3_PAL
305 GO7007_ASPECT_RATIO_16_9_NTSC 305 GO7007_ASPECT_RATIO_16_9_NTSC
306 GO7007_ASPECT_RATIO_16_9_PAL 306 GO7007_ASPECT_RATIO_16_9_PAL
307 307
308 __u32 Bit-wise OR of control flags (below) 308 __u32 Bit-wise OR of control flags (below)
309 flags 309 flags
310 310
311 Flags in struct go7007_comp_params: 311 Flags in struct go7007_comp_params:
312 312
313 GO7007_COMP_CLOSED_GOP Only produce self-contained GOPs, used 313 GO7007_COMP_CLOSED_GOP Only produce self-contained GOPs, used
314 to produce streams appropriate for 314 to produce streams appropriate for
315 random seeking. 315 random seeking.
316 316
317 GO7007_COMP_OMIT_SEQ_HEADER Omit the stream sequence header. 317 GO7007_COMP_OMIT_SEQ_HEADER Omit the stream sequence header.
318 318
319 319
320 GO7007IOC_S_MPEG_PARAMS, GO7007IOC_G_MPEG_PARAMS 320 GO7007IOC_S_MPEG_PARAMS, GO7007IOC_G_MPEG_PARAMS
@@ -337,56 +337,56 @@ features of the GO7007SB encoder, which are described below:
337 337
338 Fields in struct go7007_mpeg_params: 338 Fields in struct go7007_mpeg_params:
339 339
340 enum go7007_mpeg_video_standard 340 enum go7007_mpeg_video_standard
341 mpeg_video_standard The MPEG video standard in which to 341 mpeg_video_standard The MPEG video standard in which to
342 compress the video. 342 compress the video.
343 343
344 Choices are: 344 Choices are:
345 GO7007_MPEG_VIDEO_MPEG1 345 GO7007_MPEG_VIDEO_MPEG1
346 GO7007_MPEG_VIDEO_MPEG2 346 GO7007_MPEG_VIDEO_MPEG2
347 GO7007_MPEG_VIDEO_MPEG4 347 GO7007_MPEG_VIDEO_MPEG4
348 348
349 __u32 Bit-wise OR of control flags (below) 349 __u32 Bit-wise OR of control flags (below)
350 flags 350 flags
351 351
352 __u32 The profile and level indication to be 352 __u32 The profile and level indication to be
353 pali stored in the sequence header. This 353 pali stored in the sequence header. This
354 is only used as an indicator to the 354 is only used as an indicator to the
355 decoder, and does not affect the MPEG 355 decoder, and does not affect the MPEG
356 features used in the video stream. 356 features used in the video stream.
357 Not valid for MPEG1. 357 Not valid for MPEG1.
358 358
359 Choices for MPEG2 are: 359 Choices for MPEG2 are:
360 GO7007_MPEG2_PROFILE_MAIN_MAIN 360 GO7007_MPEG2_PROFILE_MAIN_MAIN
361 361
362 Choices for MPEG4 are: 362 Choices for MPEG4 are:
363 GO7007_MPEG4_PROFILE_S_L0 363 GO7007_MPEG4_PROFILE_S_L0
364 GO7007_MPEG4_PROFILE_S_L1 364 GO7007_MPEG4_PROFILE_S_L1
365 GO7007_MPEG4_PROFILE_S_L2 365 GO7007_MPEG4_PROFILE_S_L2
366 GO7007_MPEG4_PROFILE_S_L3 366 GO7007_MPEG4_PROFILE_S_L3
367 GO7007_MPEG4_PROFILE_ARTS_L1 367 GO7007_MPEG4_PROFILE_ARTS_L1
368 GO7007_MPEG4_PROFILE_ARTS_L2 368 GO7007_MPEG4_PROFILE_ARTS_L2
369 GO7007_MPEG4_PROFILE_ARTS_L3 369 GO7007_MPEG4_PROFILE_ARTS_L3
370 GO7007_MPEG4_PROFILE_ARTS_L4 370 GO7007_MPEG4_PROFILE_ARTS_L4
371 GO7007_MPEG4_PROFILE_AS_L0 371 GO7007_MPEG4_PROFILE_AS_L0
372 GO7007_MPEG4_PROFILE_AS_L1 372 GO7007_MPEG4_PROFILE_AS_L1
373 GO7007_MPEG4_PROFILE_AS_L2 373 GO7007_MPEG4_PROFILE_AS_L2
374 GO7007_MPEG4_PROFILE_AS_L3 374 GO7007_MPEG4_PROFILE_AS_L3
375 GO7007_MPEG4_PROFILE_AS_L4 375 GO7007_MPEG4_PROFILE_AS_L4
376 GO7007_MPEG4_PROFILE_AS_L5 376 GO7007_MPEG4_PROFILE_AS_L5
377 377
378 Flags in struct go7007_mpeg_params: 378 Flags in struct go7007_mpeg_params:
379 379
380 GO7007_MPEG_FORCE_DVD_MODE Force all compression parameters and 380 GO7007_MPEG_FORCE_DVD_MODE Force all compression parameters and
381 bitrate control settings to comply 381 bitrate control settings to comply
382 with DVD MPEG2 stream requirements. 382 with DVD MPEG2 stream requirements.
383 This overrides most compression and 383 This overrides most compression and
384 bitrate settings! 384 bitrate settings!
385 385
386 GO7007_MPEG_OMIT_GOP_HEADER Omit the GOP header. 386 GO7007_MPEG_OMIT_GOP_HEADER Omit the GOP header.
387 387
388 GO7007_MPEG_REPEAT_SEQHEADER Repeat the MPEG sequence header at 388 GO7007_MPEG_REPEAT_SEQHEADER Repeat the MPEG sequence header at
389 the start of each GOP. 389 the start of each GOP.
390 390
391 391
392 GO7007IOC_S_BITRATE, GO7007IOC_G_BITRATE 392 GO7007IOC_S_BITRATE, GO7007IOC_G_BITRATE
@@ -404,7 +404,7 @@ features of the GO7007SB encoder, which are described below:
404 404
405 405
406---------------------------------------------------------------------------- 406----------------------------------------------------------------------------
407 Installing the WIS PCI Voyager Driver 407 Installing the WIS PCI Voyager Driver
408--------------------------------------------------------------------------- 408---------------------------------------------------------------------------
409 409
410The WIS PCI Voyager driver requires several patches to the Linux 2.6.11.x 410The WIS PCI Voyager driver requires several patches to the Linux 2.6.11.x
diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c
index 1706fbf06847..b398db43d376 100644
--- a/drivers/staging/go7007/s2250-board.c
+++ b/drivers/staging/go7007/s2250-board.c
@@ -34,7 +34,7 @@ extern void s2250loader_cleanup(void);
34#define VPX322_ADDR_CONTRAST0 0x0128 34#define VPX322_ADDR_CONTRAST0 0x0128
35#define VPX322_ADDR_CONTRAST1 0x0132 35#define VPX322_ADDR_CONTRAST1 0x0132
36#define VPX322_ADDR_HUE 0x00dc 36#define VPX322_ADDR_HUE 0x00dc
37#define VPX322_ADDR_SAT 0x0030 37#define VPX322_ADDR_SAT 0x0030
38 38
39struct go7007_usb_board { 39struct go7007_usb_board {
40 unsigned int flags; 40 unsigned int flags;
diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/go7007/wis-tw9903.c
index 6c3427bb6f4c..506dca6e942e 100644
--- a/drivers/staging/go7007/wis-tw9903.c
+++ b/drivers/staging/go7007/wis-tw9903.c
@@ -111,7 +111,8 @@ static int wis_tw9903_command(struct i2c_client *client,
111 i2c_smbus_write_byte_data(client, 0x02, 0x40 | (*input << 1)); 111 i2c_smbus_write_byte_data(client, 0x02, 0x40 | (*input << 1));
112 break; 112 break;
113 } 113 }
114#if 0 /* The scaler on this thing seems to be horribly broken */ 114#if 0
115 /* The scaler on this thing seems to be horribly broken */
115 case DECODER_SET_RESOLUTION: 116 case DECODER_SET_RESOLUTION:
116 { 117 {
117 struct video_decoder_resolution *res = arg; 118 struct video_decoder_resolution *res = arg;
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-08 05:38:50 -0500