Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 164087
b: refs/heads/master
c: 028d4c9
h: refs/heads/master
i:
  164085: 9049022
  164083: 0b7ec89
  164079: ff440d7
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Sep 19, 2009
1 parent 2bfdcd2 commit 9199474
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 90 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dd694441e31ebdabc439874c7eca4af0fa8ab338
refs/heads/master: 028d4c989ab9e839471739332d185f8f158b0043
3 changes: 2 additions & 1 deletion trunk/drivers/staging/go7007/go7007-fw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
172 changes: 86 additions & 86 deletions trunk/drivers/staging/go7007/go7007.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ below.
The README files from the original package appears below:

---------------------------------------------------------------------------
WIS GO7007SB Public Linux Driver
WIS GO7007SB Public Linux Driver
---------------------------------------------------------------------------


Expand Down Expand Up @@ -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/>.
Expand All @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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.

Choices are:
GO7007_MPEG_VIDEO_MPEG1
GO7007_MPEG_VIDEO_MPEG2
GO7007_MPEG_VIDEO_MPEG4

__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.

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
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

__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.

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

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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/go7007/s2250-board.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/staging/go7007/wis-tw9903.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9199474

Please sign in to comment.