forked from Minki/linux
[media] go7007: move out of staging into drivers/media/usb.
Now that the custom motion detection API in this driver has been replaced with a standard API there is no reason anymore to keep it in staging. So (finally!) move it to drivers/media/usb. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Hans Verkuil
Mauro Carvalho Chehab
parent
28cae868cd
commit
7955f03d18
@ -27,6 +27,7 @@ source "drivers/media/usb/hdpvr/Kconfig"
|
||||
source "drivers/media/usb/tlg2300/Kconfig"
|
||||
source "drivers/media/usb/usbvision/Kconfig"
|
||||
source "drivers/media/usb/stk1160/Kconfig"
|
||||
source "drivers/media/usb/go7007/Kconfig"
|
||||
endif
|
||||
|
||||
if (MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT)
|
||||
|
||||
@ -22,3 +22,4 @@ obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
|
||||
obj-$(CONFIG_VIDEO_TM6000) += tm6000/
|
||||
obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
|
||||
obj-$(CONFIG_VIDEO_USBTV) += usbtv/
|
||||
obj-$(CONFIG_VIDEO_GO7007) += go7007/
|
||||
|
||||
@ -8,8 +8,4 @@ go7007-y := go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o \
|
||||
|
||||
s2250-y := s2250-board.o
|
||||
|
||||
# Uncomment when the saa7134 patches get into upstream
|
||||
#obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o
|
||||
#ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/pci/saa7134
|
||||
|
||||
ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -Idrivers/media/common
|
||||
@ -29,8 +29,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig"
|
||||
|
||||
source "drivers/staging/media/dt3155v4l/Kconfig"
|
||||
|
||||
source "drivers/staging/media/go7007/Kconfig"
|
||||
|
||||
source "drivers/staging/media/omap24xx/Kconfig"
|
||||
|
||||
source "drivers/staging/media/omap4iss/Kconfig"
|
||||
|
||||
@ -3,7 +3,6 @@ obj-$(CONFIG_I2C_BCM2048) += bcm2048/
|
||||
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
|
||||
obj-$(CONFIG_LIRC_STAGING) += lirc/
|
||||
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
|
||||
obj-$(CONFIG_VIDEO_GO7007) += go7007/
|
||||
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
|
||||
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
|
||||
obj-$(CONFIG_VIDEO_OMAP2) += omap24xx/
|
||||
|
||||
@ -1,136 +0,0 @@
|
||||
Todo:
|
||||
- let s2250-board use i2c subdevs as well instead of hardcoding
|
||||
support for the i2c devices.
|
||||
- when the driver is moved out of staging, support for saa7134-go7007
|
||||
should be added to the saa7134 driver. The patch for that is
|
||||
included below.
|
||||
|
||||
Patch for saa7134:
|
||||
|
||||
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
|
||||
index dc68cf1..9a53794 100644
|
||||
--- a/drivers/media/pci/saa7134/saa7134-cards.c
|
||||
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
|
||||
@@ -5790,6 +5790,29 @@ struct saa7134_board saa7134_boards[] = {
|
||||
.gpio = 0x6010000,
|
||||
} },
|
||||
},
|
||||
+ [SAA7134_BOARD_WIS_VOYAGER] = {
|
||||
+ .name = "WIS Voyager or compatible",
|
||||
+ .audio_clock = 0x00200000,
|
||||
+ .tuner_type = TUNER_PHILIPS_TDA8290,
|
||||
+ .radio_type = UNSET,
|
||||
+ .tuner_addr = ADDR_UNSET,
|
||||
+ .radio_addr = ADDR_UNSET,
|
||||
+ .mpeg = SAA7134_MPEG_GO7007,
|
||||
+ .inputs = { {
|
||||
+ .name = name_comp1,
|
||||
+ .vmux = 0,
|
||||
+ .amux = LINE2,
|
||||
+ }, {
|
||||
+ .name = name_tv,
|
||||
+ .vmux = 3,
|
||||
+ .amux = TV,
|
||||
+ .tv = 1,
|
||||
+ }, {
|
||||
+ .name = name_svideo,
|
||||
+ .vmux = 6,
|
||||
+ .amux = LINE1,
|
||||
+ } },
|
||||
+ },
|
||||
|
||||
};
|
||||
|
||||
@@ -7037,6 +7060,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
|
||||
.subdevice = 0x0911,
|
||||
.driver_data = SAA7134_BOARD_SENSORAY811_911,
|
||||
}, {
|
||||
+ .vendor = PCI_VENDOR_ID_PHILIPS,
|
||||
+ .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
|
||||
+ .subvendor = 0x1905, /* WIS */
|
||||
+ .subdevice = 0x7007,
|
||||
+ .driver_data = SAA7134_BOARD_WIS_VOYAGER,
|
||||
+ }, {
|
||||
/* --- boards without eeprom + subsystem ID --- */
|
||||
.vendor = PCI_VENDOR_ID_PHILIPS,
|
||||
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
|
||||
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
|
||||
index 8fd24e7..0a849ea 100644
|
||||
--- a/drivers/media/pci/saa7134/saa7134-core.c
|
||||
+++ b/drivers/media/pci/saa7134/saa7134-core.c
|
||||
@@ -156,6 +156,8 @@ static void request_module_async(struct work_struct *work){
|
||||
request_module("saa7134-empress");
|
||||
if (card_is_dvb(dev))
|
||||
request_module("saa7134-dvb");
|
||||
+ if (card_is_go7007(dev))
|
||||
+ request_module("saa7134-go7007");
|
||||
if (alsa) {
|
||||
if (dev->pci->device != PCI_DEVICE_ID_PHILIPS_SAA7130)
|
||||
request_module("saa7134-alsa");
|
||||
@@ -557,8 +559,12 @@ static irqreturn_t saa7134_irq(int irq, void *dev_id)
|
||||
saa7134_irq_vbi_done(dev,status);
|
||||
|
||||
if ((report & SAA7134_IRQ_REPORT_DONE_RA2) &&
|
||||
- card_has_mpeg(dev))
|
||||
- saa7134_irq_ts_done(dev,status);
|
||||
+ card_has_mpeg(dev)) {
|
||||
+ if (dev->mops->irq_ts_done != NULL)
|
||||
+ dev->mops->irq_ts_done(dev, status);
|
||||
+ else
|
||||
+ saa7134_irq_ts_done(dev, status);
|
||||
+ }
|
||||
|
||||
if (report & SAA7134_IRQ_REPORT_GPIO16) {
|
||||
switch (dev->has_remote) {
|
||||
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
|
||||
index 62169dd..5fad39a 100644
|
||||
--- a/drivers/media/pci/saa7134/saa7134.h
|
||||
+++ b/drivers/media/pci/saa7134/saa7134.h
|
||||
@@ -334,6 +334,7 @@ struct saa7134_card_ir {
|
||||
#define SAA7134_BOARD_KWORLD_PC150U 189
|
||||
#define SAA7134_BOARD_ASUSTeK_PS3_100 190
|
||||
#define SAA7134_BOARD_HAWELL_HW_9004V1 191
|
||||
+#define SAA7134_BOARD_WIS_VOYAGER 192
|
||||
|
||||
#define SAA7134_MAXBOARDS 32
|
||||
#define SAA7134_INPUT_MAX 8
|
||||
@@ -364,6 +365,7 @@ enum saa7134_mpeg_type {
|
||||
SAA7134_MPEG_UNUSED,
|
||||
SAA7134_MPEG_EMPRESS,
|
||||
SAA7134_MPEG_DVB,
|
||||
+ SAA7134_MPEG_GO7007,
|
||||
};
|
||||
|
||||
enum saa7134_mpeg_ts_type {
|
||||
@@ -403,6 +405,7 @@ struct saa7134_board {
|
||||
#define card_has_radio(dev) (NULL != saa7134_boards[dev->board].radio.name)
|
||||
#define card_is_empress(dev) (SAA7134_MPEG_EMPRESS == saa7134_boards[dev->board].mpeg)
|
||||
#define card_is_dvb(dev) (SAA7134_MPEG_DVB == saa7134_boards[dev->board].mpeg)
|
||||
+#define card_is_go7007(dev) (SAA7134_MPEG_GO7007 == saa7134_boards[dev->board].mpeg)
|
||||
#define card_has_mpeg(dev) (SAA7134_MPEG_UNUSED != saa7134_boards[dev->board].mpeg)
|
||||
#define card(dev) (saa7134_boards[dev->board])
|
||||
#define card_in(dev,n) (saa7134_boards[dev->board].inputs[n])
|
||||
@@ -535,6 +538,8 @@ struct saa7134_mpeg_ops {
|
||||
int (*init)(struct saa7134_dev *dev);
|
||||
int (*fini)(struct saa7134_dev *dev);
|
||||
void (*signal_change)(struct saa7134_dev *dev);
|
||||
+ void (*irq_ts_done)(struct saa7134_dev *dev,
|
||||
+ unsigned long status);
|
||||
};
|
||||
|
||||
/* global device status */
|
||||
diff --git a/drivers/staging/media/go7007/Makefile b/drivers/staging/media/go7007/Makefile
|
||||
index 9c6ad4a..1b23689 100644
|
||||
--- a/drivers/staging/media/go7007/Makefile
|
||||
+++ b/drivers/staging/media/go7007/Makefile
|
||||
@@ -8,8 +8,7 @@ go7007-y := go7007-v4l2.o go7007-driver.o go7007-i2c.o go7007-fw.o \
|
||||
|
||||
s2250-y := s2250-board.o
|
||||
|
||||
-# Uncomment when the saa7134 patches get into upstream
|
||||
-#obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o
|
||||
-#ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/pci/saa7134
|
||||
+obj-$(CONFIG_VIDEO_SAA7134) += saa7134-go7007.o
|
||||
+ccflags-$(CONFIG_VIDEO_SAA7134:m=y) += -Idrivers/media/pci/saa7134
|
||||
|
||||
ccflags-$(CONFIG_VIDEO_GO7007_LOADER:m=y) += -Idrivers/media/common
|
||||
@ -1,478 +0,0 @@
|
||||
This is a driver for the WIS GO7007SB multi-format video encoder.
|
||||
|
||||
Pete Eberlein <pete@sensoray.com>
|
||||
|
||||
The driver was originally released under the GPL and is currently hosted at:
|
||||
http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver
|
||||
The go7007 firmware can be acquired from the package on the site above.
|
||||
|
||||
I've modified the driver to support the following Video4Linux2 MPEG
|
||||
controls, with acceptable values:
|
||||
|
||||
V4L2_CID_MPEG_STREAM_TYPE V4L2_MPEG_STREAM_TYPE_MPEG2_DVD
|
||||
V4L2_MPEG_STREAM_TYPE_MPEG_ELEM
|
||||
V4L2_CID_MPEG_VIDEO_ENCODING V4L2_MPEG_VIDEO_ENCODING_MPEG_1
|
||||
V4L2_MPEG_VIDEO_ENCODING_MPEG_2
|
||||
V4L2_MPEG_VIDEO_ENCODING_MPEG_4
|
||||
V4L2_CID_MPEG_VIDEO_ASPECT V4L2_MPEG_VIDEO_ASPECT_1x1
|
||||
V4L2_MPEG_VIDEO_ASPECT_4x3
|
||||
V4L2_MPEG_VIDEO_ASPECT_16x9
|
||||
V4L2_CID_MPEG_VIDEO_GOP_SIZE integer
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE 64000 .. 10000000
|
||||
|
||||
These should be used instead of the non-standard GO7007 ioctls described
|
||||
below.
|
||||
|
||||
|
||||
The README files from the orignal package appear below:
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
WIS GO7007SB Public Linux Driver
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
|
||||
*** Please see the file RELEASE-NOTES for important last-minute updates ***
|
||||
|
||||
|
||||
0. OVERVIEW AND LICENSING/DISCLAIMER
|
||||
|
||||
|
||||
This driver kit contains Linux drivers for the WIS GO7007SB multi-format
|
||||
video encoder. Only kernel version 2.6.x is supported. The video stream
|
||||
is available through the Video4Linux2 API and the audio stream is available
|
||||
through the ALSA API (or the OSS emulation layer of the ALSA system).
|
||||
|
||||
The files in kernel/ and hotplug/ are licensed under the GNU General Public
|
||||
License Version 2 from the Free Software Foundation. A copy of the license
|
||||
is included in the file COPYING.
|
||||
|
||||
The example applications in apps/ and C header files in include/ are
|
||||
licensed under a permissive license included in the source files which
|
||||
allows copying, modification and redistribution for any purpose without
|
||||
attribution.
|
||||
|
||||
The firmware files included in the firmware/ directory may be freely
|
||||
redistributed only in conjunction with this document; but modification,
|
||||
tampering and reverse engineering are prohibited.
|
||||
|
||||
MICRONAS USA, INC., MAKES NO WARRANTIES TO ANY PERSON OR ENTITY WITH
|
||||
RESPECT TO THE SOFTWARE OR ANY DERIVATIVES THEREOF OR ANY SERVICES OR
|
||||
LICENSES AND DISCLAIMS ALL IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION
|
||||
WARRANTIES OF MERCHANTABILITY, SUPPORT, AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE AND NON-INFRINGEMENT.
|
||||
|
||||
|
||||
1. SYSTEM REQUIREMENTS
|
||||
|
||||
|
||||
This driver requires Linux kernel 2.6. Kernel 2.4 is not supported. Using
|
||||
kernel 2.6.10 or later is recommended, as earlier kernels are known to have
|
||||
unstable USB 2.0 support.
|
||||
|
||||
A fully built kernel source tree must be available. Typically this will be
|
||||
linked from "/lib/modules/<KERNEL VERSION>/build" for convenience. If this
|
||||
link does not exist, an extra parameter will need to be passed to the
|
||||
`make` command.
|
||||
|
||||
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_MODULES - Enable loadable module support
|
||||
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_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
|
||||
|
||||
The hotplug scripts, along with the fxload utility, must also be installed.
|
||||
These scripts can be obtained from <http://linux-hotplug.sourceforge.net/>.
|
||||
Hotplugging is used for loading firmware into the Cypruss EZ-USB chip using
|
||||
fxload and for loading firmware into the driver using the firmware agent.
|
||||
|
||||
|
||||
2. COMPILING AND INSTALLING THE DRIVER
|
||||
|
||||
|
||||
Most users should be able to compile the driver by simply running:
|
||||
|
||||
$ make
|
||||
|
||||
in the top-level directory of the driver kit. First the kernel modules
|
||||
will be built, followed by the example applications.
|
||||
|
||||
If the build system is unable to locate the kernel source tree for the
|
||||
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
|
||||
|
||||
Once the compile completes, the driver and firmware files should be
|
||||
installed by running:
|
||||
|
||||
$ 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
|
||||
directory, usually /lib/firmware. In addition, USB maps and scripts will
|
||||
be placed in /etc/hotplug/usb to enable fxload to initialize the EZ-USB
|
||||
control chip when the device is connected.
|
||||
|
||||
|
||||
3. PAL/SECAM TUNER CONFIGURATION (TV402U-EU only)
|
||||
|
||||
|
||||
The PAL model of the Plextor ConvertX TV402U may require additional
|
||||
configuration to correctly select the appropriate TV frequency band and
|
||||
audio subchannel.
|
||||
|
||||
Users with a device other than the Plextor ConvertX TV402U-EU should skip
|
||||
this section.
|
||||
|
||||
The wide variety of PAL TV systems used in Europe requires that additional
|
||||
information about the local TV standards be passed to the driver in order
|
||||
to properly tune TV channels. The two necessary parameters are (a) the PAL
|
||||
TV band, and (b) the audio subchannel format in use.
|
||||
|
||||
In many cases, the appropriate TV band selection is passed to the driver
|
||||
from applications. However, in some cases, the application only specifies
|
||||
that the driver should use PAL but not the specific information about the
|
||||
appropriate TV band. To work around this issue, the correct TV band may be
|
||||
specified in the "force_band" parameter to the wis-sony-tuner module:
|
||||
|
||||
TV band force_band
|
||||
------- ----------
|
||||
PAL B/G B
|
||||
PAL I I
|
||||
PAL D/K D
|
||||
SECAM L L
|
||||
|
||||
If the "force_band" parameter is specified, the driver will ignore any TV
|
||||
band specified by applications and will always use the band provided in the
|
||||
module parameter.
|
||||
|
||||
The other parameter that can be specified is the audio subchannel format.
|
||||
There are several stereo audio carrier systems in use, including NICAM and
|
||||
three varieties of A2. To receive audio broadcast on one of these stereo
|
||||
carriers, the "force_mpx_mode" parameter must be specified to the
|
||||
wis-sony-tuner module.
|
||||
|
||||
TV band Audio subcarrier force_mpx_mode
|
||||
------- ---------------- --------------
|
||||
PAL B/G Mono (default) 1
|
||||
PAL B/G A2 2
|
||||
PAL B/G NICAM 3
|
||||
PAL I Mono (default) 4
|
||||
PAL I NICAM 5
|
||||
PAL D/K Mono (default) 6
|
||||
PAL D/K A2 (1) 7
|
||||
PAL D/K A2 (2) 8
|
||||
PAL D/K A2 (3) 9
|
||||
PAL D/K NICAM 10
|
||||
SECAM L Mono (default) 11
|
||||
SECAM L NICAM 12
|
||||
|
||||
If the "force_mpx_mode" parameter is not specified, the correct mono-only
|
||||
mode will be chosen based on the TV band. However, the tuner will not
|
||||
receive stereo audio or bilingual broadcasts correctly.
|
||||
|
||||
To pass the "force_band" or "force_mpx_mode" parameters to the
|
||||
wis-sony-tuner module, the following line must be added to the modprobe
|
||||
configuration file, which varies from one Linux distribution to another.
|
||||
|
||||
options wis-sony-tuner force_band=B force_mpx_mode=2
|
||||
|
||||
The above example would force the tuner to the PAL B/G TV band and receive
|
||||
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
|
||||
|
||||
If the configuration line appears, then modprobe will pass the parameters
|
||||
correctly the next time the wis-sony-tuner module is loaded into the
|
||||
kernel.
|
||||
|
||||
|
||||
4. TESTING THE DRIVER
|
||||
|
||||
|
||||
Because few Linux applications are able to correctly capture from
|
||||
Video4Linux2 devices with only compressed formats supported, the new driver
|
||||
should be tested with the "gorecord" application in the apps/ directory.
|
||||
|
||||
First connect a video source to the device, such as a DVD player or VCR.
|
||||
This will be captured to a file for testing the driver. If an input source
|
||||
is unavailable, a test file can still be captured, but the video will be
|
||||
black and the audio will be silent.
|
||||
|
||||
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
|
||||
|
||||
If this application does not successfully record an AVI file, the error
|
||||
messages produced by gorecord and recorded in the system log (usually in
|
||||
/var/log/messages) should provide information to help resolve the problem.
|
||||
|
||||
Supplying no parameters to gorecord will cause it to probe the available
|
||||
devices and exit. Use the -help flag for usage information.
|
||||
|
||||
|
||||
5. USING THE DRIVER
|
||||
|
||||
|
||||
The V4L2 device implemented by the driver provides a standard compressed
|
||||
format API, within the following criteria:
|
||||
|
||||
* Applications that only support the original Video4Linux1 API will not
|
||||
be able to communicate with this driver at all.
|
||||
|
||||
* No raw video modes are supported, so applications like xawtv that
|
||||
expect only uncompressed video will not function.
|
||||
|
||||
* Supported compression formats are: Motion-JPEG, MPEG1, MPEG2 and MPEG4.
|
||||
|
||||
* MPEG video formats are delivered as Video Elementary Streams only.
|
||||
Program Stream (PS), Transport Stream (TS) and Packetized Elementary
|
||||
Stream (PES) formats are not supported.
|
||||
|
||||
* Video parameters such as format and input port may not be changed while
|
||||
the encoder is active.
|
||||
|
||||
* The audio capture device only functions when the video encoder is
|
||||
actively capturing video. Attempts to read from the audio device when
|
||||
the encoder is inactive will result in an I/O error.
|
||||
|
||||
* The native format of the audio device is 48Khz 2-channel 16-bit
|
||||
little-endian PCM, delivered through the ALSA system. No audio
|
||||
compression is implemented in the hardware. ALSA may convert to other
|
||||
uncompressed formats on the fly.
|
||||
|
||||
The include/ directory contains a C header file describing non-standard
|
||||
features of the GO7007SB encoder, which are described below:
|
||||
|
||||
|
||||
GO7007IOC_S_COMP_PARAMS, GO7007IOC_G_COMP_PARAMS
|
||||
|
||||
These ioctls are used to negotiate general compression parameters.
|
||||
|
||||
To query the current parameters, call the GO7007IOC_G_COMP_PARAMS ioctl
|
||||
with a pointer to a struct go7007_comp_params. If the driver is not
|
||||
set to MPEG format, the EINVAL error code will be returned.
|
||||
|
||||
To change the current parameters, initialize all fields of a struct
|
||||
go7007_comp_params and call the GO7007_IOC_S_COMP_PARAMS ioctl with a
|
||||
pointer to this structure. The driver will return the current
|
||||
parameters with any necessary changes to conform to the limitations of
|
||||
the hardware or current compression mode. Any or all fields can be set
|
||||
to zero to request a reasonable default value. If the driver is not
|
||||
set to MPEG format, the EINVAL error code will be returned. When I/O
|
||||
is in progress, the EBUSY error code will be returned.
|
||||
|
||||
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 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.
|
||||
|
||||
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
|
||||
|
||||
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_OMIT_SEQ_HEADER Omit the stream sequence header.
|
||||
|
||||
|
||||
GO7007IOC_S_MPEG_PARAMS, GO7007IOC_G_MPEG_PARAMS
|
||||
|
||||
These ioctls are used to negotiate MPEG-specific stream parameters when
|
||||
the pixelformat has been set to V4L2_PIX_FMT_MPEG.
|
||||
|
||||
To query the current parameters, call the GO7007IOC_G_MPEG_PARAMS ioctl
|
||||
with a pointer to a struct go7007_mpeg_params. If the driver is not
|
||||
set to MPEG format, the EINVAL error code will be returned.
|
||||
|
||||
To change the current parameters, initialize all fields of a struct
|
||||
go7007_mpeg_params and call the GO7007_IOC_S_MPEG_PARAMS ioctl with a
|
||||
pointer to this structure. The driver will return the current
|
||||
parameters with any necessary changes to conform to the limitations of
|
||||
the hardware or selected MPEG mode. Any or all fields can be set to
|
||||
zero to request a reasonable default value. If the driver is not set
|
||||
to MPEG format, the EINVAL error code will be returned. When I/O is in
|
||||
progress, the EBUSY error code will be returned.
|
||||
|
||||
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
|
||||
|
||||
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_OMIT_GOP_HEADER Omit the GOP header.
|
||||
|
||||
GO7007_MPEG_REPEAT_SEQHEADER Repeat the MPEG sequence header at
|
||||
the start of each GOP.
|
||||
|
||||
|
||||
GO7007IOC_S_BITRATE, GO7007IOC_G_BITRATE
|
||||
|
||||
These ioctls are used to set and query the target bitrate value for the
|
||||
compressed video stream. The bitrate may be selected by storing the
|
||||
target bits per second in an int and calling GO7007IOC_S_BITRATE with a
|
||||
pointer to the int. The bitrate may be queried by calling
|
||||
GO7007IOC_G_BITRATE with a pointer to an int where the current bitrate
|
||||
will be stored.
|
||||
|
||||
Note that this is the primary means of controlling the video quality
|
||||
for all compression modes, including V4L2_PIX_FMT_MJPEG. The
|
||||
VIDIOC_S_JPEGCOMP ioctl is not supported.
|
||||
|
||||
|
||||
----------------------------------------------------------------------------
|
||||
Installing the WIS PCI Voyager Driver
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
The WIS PCI Voyager driver requires several patches to the Linux 2.6.11.x
|
||||
kernel source tree before compiling the driver. These patches update the
|
||||
in-kernel SAA7134 driver to the newest development version and patch bugs
|
||||
in the TDA8290/TDA8275 tuner driver.
|
||||
|
||||
The following patches must be downloaded from Gerd Knorr's website and
|
||||
applied in the order listed:
|
||||
|
||||
http://dl.bytesex.org/patches/2.6.11-2/i2c-tuner
|
||||
http://dl.bytesex.org/patches/2.6.11-2/i2c-tuner2
|
||||
http://dl.bytesex.org/patches/2.6.11-2/v4l2-api-mpeg
|
||||
http://dl.bytesex.org/patches/2.6.11-2/saa7134-update
|
||||
|
||||
The following patches are included with this SDK and can be applied in any
|
||||
order:
|
||||
|
||||
patches/2.6.11/saa7134-voyager.diff
|
||||
patches/2.6.11/tda8275-newaddr.diff
|
||||
patches/2.6.11/tda8290-ntsc.diff
|
||||
|
||||
Check to make sure the CONFIG_VIDEO_SAA7134 option is enabled in the kernel
|
||||
configuration, and build and install the kernel.
|
||||
|
||||
After rebooting into the new kernel, the GO7007 driver can be compiled and
|
||||
installed:
|
||||
|
||||
$ make SAA7134_BUILD=y
|
||||
$ make install
|
||||
$ modprobe saa7134-go7007
|
||||
|
||||
There will be two V4L video devices associated with the PCI Voyager. The
|
||||
first device (most likely /dev/video0) provides access to the raw video
|
||||
capture mode of the SAA7133 device and is used to configure the source
|
||||
video parameters and tune the TV tuner. This device can be used with xawtv
|
||||
or other V4L(2) video software as a standard uncompressed device.
|
||||
|
||||
The second device (most likely /dev/video1) provides access to the
|
||||
compression functions of the GO7007. It can be tested using the gorecord
|
||||
application in the apps/ directory of this SDK:
|
||||
|
||||
$ apps/gorecord -vdevice /dev/video1 -noaudio test.avi
|
||||
|
||||
Currently the frame resolution is fixed at 720x480 (NTSC) or 720x576 (PAL),
|
||||
and the video standard must be specified to both the raw and the compressed
|
||||
video devices (xawtv and gorecord, for example).
|
||||
|
||||
|
||||
--------------------------------------------------------------------------
|
||||
RELEASE NOTES FOR WIS GO7007SB LINUX DRIVER
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
Last updated: 5 November 2005
|
||||
|
||||
- Release 0.9.7 includes new support for using udev to run fxload. The
|
||||
install script should automatically detect whether the old hotplug
|
||||
scripts or the new udev rules should be used. To force the use of
|
||||
hotplug, run "make install USE_UDEV=n". To force the use of udev, run
|
||||
"make install USE_UDEV=y".
|
||||
|
||||
- Motion detection is supported but undocumented. Try the `modet` app
|
||||
for a demonstration of how to use the facility.
|
||||
|
||||
- Using USB2.0 devices such as the TV402U with USB1.1 HCDs or hubs can
|
||||
cause buffer overruns and frame drops, even at low framerates, due to
|
||||
inconsistency in the bitrate control mechanism.
|
||||
|
||||
- On devices with an SAA7115, including the Plextor ConvertX, video height
|
||||
values of 96, 128, 160, 192, 256, 320, and 384 do not work in NTSC mode.
|
||||
All valid heights up to 512 work correctly in PAL mode.
|
||||
|
||||
- The WIS Star Trek and PCI Voyager boards have no support yet for audio
|
||||
or the TV tuner.
|
||||
@ -1,560 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2006 Micronas USA Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License (Version 2) as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <asm/byteorder.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-subdev.h>
|
||||
|
||||
#include "saa7134.h"
|
||||
#include "saa7134-reg.h"
|
||||
#include "go7007-priv.h"
|
||||
|
||||
/*#define GO7007_HPI_DEBUG*/
|
||||
|
||||
enum hpi_address {
|
||||
HPI_ADDR_VIDEO_BUFFER = 0xe4,
|
||||
HPI_ADDR_INIT_BUFFER = 0xea,
|
||||
HPI_ADDR_INTR_RET_VALUE = 0xee,
|
||||
HPI_ADDR_INTR_RET_DATA = 0xec,
|
||||
HPI_ADDR_INTR_STATUS = 0xf4,
|
||||
HPI_ADDR_INTR_WR_PARAM = 0xf6,
|
||||
HPI_ADDR_INTR_WR_INDEX = 0xf8,
|
||||
};
|
||||
|
||||
enum gpio_command {
|
||||
GPIO_COMMAND_RESET = 0x00, /* 000b */
|
||||
GPIO_COMMAND_REQ1 = 0x04, /* 001b */
|
||||
GPIO_COMMAND_WRITE = 0x20, /* 010b */
|
||||
GPIO_COMMAND_REQ2 = 0x24, /* 011b */
|
||||
GPIO_COMMAND_READ = 0x80, /* 100b */
|
||||
GPIO_COMMAND_VIDEO = 0x84, /* 101b */
|
||||
GPIO_COMMAND_IDLE = 0xA0, /* 110b */
|
||||
GPIO_COMMAND_ADDR = 0xA4, /* 111b */
|
||||
};
|
||||
|
||||
struct saa7134_go7007 {
|
||||
struct v4l2_subdev sd;
|
||||
struct saa7134_dev *dev;
|
||||
u8 *top;
|
||||
u8 *bottom;
|
||||
dma_addr_t top_dma;
|
||||
dma_addr_t bottom_dma;
|
||||
};
|
||||
|
||||
static inline struct saa7134_go7007 *to_state(struct v4l2_subdev *sd)
|
||||
{
|
||||
return container_of(sd, struct saa7134_go7007, sd);
|
||||
}
|
||||
|
||||
static const struct go7007_board_info board_voyager = {
|
||||
.flags = 0,
|
||||
.sensor_flags = GO7007_SENSOR_656 |
|
||||
GO7007_SENSOR_VALID_ENABLE |
|
||||
GO7007_SENSOR_TV |
|
||||
GO7007_SENSOR_VBI,
|
||||
.audio_flags = GO7007_AUDIO_I2S_MODE_1 |
|
||||
GO7007_AUDIO_WORD_16,
|
||||
.audio_rate = 48000,
|
||||
.audio_bclk_div = 8,
|
||||
.audio_main_div = 2,
|
||||
.hpi_buffer_cap = 7,
|
||||
.num_inputs = 1,
|
||||
.inputs = {
|
||||
{
|
||||
.name = "SAA7134",
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
/********************* Driver for GPIO HPI interface *********************/
|
||||
|
||||
static int gpio_write(struct saa7134_dev *dev, u8 addr, u16 data)
|
||||
{
|
||||
saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);
|
||||
|
||||
/* Write HPI address */
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS0, addr);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_ADDR);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);
|
||||
|
||||
/* Write low byte */
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS0, data & 0xff);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_WRITE);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);
|
||||
|
||||
/* Write high byte */
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS0, data >> 8);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_WRITE);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int gpio_read(struct saa7134_dev *dev, u8 addr, u16 *data)
|
||||
{
|
||||
saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);
|
||||
|
||||
/* Write HPI address */
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS0, addr);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_ADDR);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);
|
||||
|
||||
saa_writeb(SAA7134_GPIO_GPMODE0, 0x00);
|
||||
|
||||
/* Read low byte */
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_READ);
|
||||
saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
|
||||
saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
|
||||
*data = saa_readb(SAA7134_GPIO_GPSTATUS0);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);
|
||||
|
||||
/* Read high byte */
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_READ);
|
||||
saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
|
||||
saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
|
||||
*data |= saa_readb(SAA7134_GPIO_GPSTATUS0) << 8;
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int saa7134_go7007_interface_reset(struct go7007 *go)
|
||||
{
|
||||
struct saa7134_go7007 *saa = go->hpi_context;
|
||||
struct saa7134_dev *dev = saa->dev;
|
||||
u32 status;
|
||||
u16 intr_val, intr_data;
|
||||
int count = 20;
|
||||
|
||||
saa_clearb(SAA7134_TS_PARALLEL, 0x80); /* Disable TS interface */
|
||||
saa_writeb(SAA7134_GPIO_GPMODE2, 0xa4);
|
||||
saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);
|
||||
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ1);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_RESET);
|
||||
msleep(1);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ1);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ2);
|
||||
msleep(10);
|
||||
|
||||
saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
|
||||
saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
|
||||
|
||||
status = saa_readb(SAA7134_GPIO_GPSTATUS2);
|
||||
/*pr_debug("status is %s\n", status & 0x40 ? "OK" : "not OK"); */
|
||||
|
||||
/* enter command mode...(?) */
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ1);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_REQ2);
|
||||
|
||||
do {
|
||||
saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
|
||||
saa_setb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
|
||||
status = saa_readb(SAA7134_GPIO_GPSTATUS2);
|
||||
/*pr_info("gpio is %08x\n", saa_readl(SAA7134_GPIO_GPSTATUS0 >> 2)); */
|
||||
} while (--count > 0);
|
||||
|
||||
/* Wait for an interrupt to indicate successful hardware reset */
|
||||
if (go7007_read_interrupt(go, &intr_val, &intr_data) < 0 ||
|
||||
(intr_val & ~0x1) != 0x55aa) {
|
||||
pr_err("saa7134-go7007: unable to reset the GO7007\n");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int saa7134_go7007_write_interrupt(struct go7007 *go, int addr, int data)
|
||||
{
|
||||
struct saa7134_go7007 *saa = go->hpi_context;
|
||||
struct saa7134_dev *dev = saa->dev;
|
||||
int i;
|
||||
u16 status_reg;
|
||||
|
||||
#ifdef GO7007_HPI_DEBUG
|
||||
pr_debug("saa7134-go7007: WriteInterrupt: %04x %04x\n", addr, data);
|
||||
#endif
|
||||
|
||||
for (i = 0; i < 100; ++i) {
|
||||
gpio_read(dev, HPI_ADDR_INTR_STATUS, &status_reg);
|
||||
if (!(status_reg & 0x0010))
|
||||
break;
|
||||
msleep(10);
|
||||
}
|
||||
if (i == 100) {
|
||||
pr_err("saa7134-go7007: device is hung, status reg = 0x%04x\n",
|
||||
status_reg);
|
||||
return -1;
|
||||
}
|
||||
gpio_write(dev, HPI_ADDR_INTR_WR_PARAM, data);
|
||||
gpio_write(dev, HPI_ADDR_INTR_WR_INDEX, addr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int saa7134_go7007_read_interrupt(struct go7007 *go)
|
||||
{
|
||||
struct saa7134_go7007 *saa = go->hpi_context;
|
||||
struct saa7134_dev *dev = saa->dev;
|
||||
|
||||
/* XXX we need to wait if there is no interrupt available */
|
||||
go->interrupt_available = 1;
|
||||
gpio_read(dev, HPI_ADDR_INTR_RET_VALUE, &go->interrupt_value);
|
||||
gpio_read(dev, HPI_ADDR_INTR_RET_DATA, &go->interrupt_data);
|
||||
#ifdef GO7007_HPI_DEBUG
|
||||
pr_debug("saa7134-go7007: ReadInterrupt: %04x %04x\n",
|
||||
go->interrupt_value, go->interrupt_data);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void saa7134_go7007_irq_ts_done(struct saa7134_dev *dev,
|
||||
unsigned long status)
|
||||
{
|
||||
struct go7007 *go = video_get_drvdata(dev->empress_dev);
|
||||
struct saa7134_go7007 *saa = go->hpi_context;
|
||||
|
||||
if (!vb2_is_streaming(&go->vidq))
|
||||
return;
|
||||
if (0 != (status & 0x000f0000))
|
||||
pr_debug("saa7134-go7007: irq: lost %ld\n",
|
||||
(status >> 16) & 0x0f);
|
||||
if (status & 0x100000) {
|
||||
dma_sync_single_for_cpu(&dev->pci->dev,
|
||||
saa->bottom_dma, PAGE_SIZE, DMA_FROM_DEVICE);
|
||||
go7007_parse_video_stream(go, saa->bottom, PAGE_SIZE);
|
||||
saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa->bottom_dma));
|
||||
} else {
|
||||
dma_sync_single_for_cpu(&dev->pci->dev,
|
||||
saa->top_dma, PAGE_SIZE, DMA_FROM_DEVICE);
|
||||
go7007_parse_video_stream(go, saa->top, PAGE_SIZE);
|
||||
saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa->top_dma));
|
||||
}
|
||||
}
|
||||
|
||||
static int saa7134_go7007_stream_start(struct go7007 *go)
|
||||
{
|
||||
struct saa7134_go7007 *saa = go->hpi_context;
|
||||
struct saa7134_dev *dev = saa->dev;
|
||||
|
||||
saa->top_dma = dma_map_page(&dev->pci->dev, virt_to_page(saa->top),
|
||||
0, PAGE_SIZE, DMA_FROM_DEVICE);
|
||||
if (dma_mapping_error(&dev->pci->dev, saa->top_dma))
|
||||
return -ENOMEM;
|
||||
saa->bottom_dma = dma_map_page(&dev->pci->dev,
|
||||
virt_to_page(saa->bottom),
|
||||
0, PAGE_SIZE, DMA_FROM_DEVICE);
|
||||
if (dma_mapping_error(&dev->pci->dev, saa->bottom_dma)) {
|
||||
dma_unmap_page(&dev->pci->dev, saa->top_dma, PAGE_SIZE,
|
||||
DMA_FROM_DEVICE);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
saa_writel(SAA7134_VIDEO_PORT_CTRL0 >> 2, 0xA300B000);
|
||||
saa_writel(SAA7134_VIDEO_PORT_CTRL4 >> 2, 0x40000200);
|
||||
|
||||
/* Set HPI interface for video */
|
||||
saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS0, HPI_ADDR_VIDEO_BUFFER);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_ADDR);
|
||||
saa_writeb(SAA7134_GPIO_GPMODE0, 0x00);
|
||||
|
||||
/* Enable TS interface */
|
||||
saa_writeb(SAA7134_TS_PARALLEL, 0xe6);
|
||||
|
||||
/* Reset TS interface */
|
||||
saa_setb(SAA7134_TS_SERIAL1, 0x01);
|
||||
saa_clearb(SAA7134_TS_SERIAL1, 0x01);
|
||||
|
||||
/* Set up transfer block size */
|
||||
saa_writeb(SAA7134_TS_PARALLEL_SERIAL, 128 - 1);
|
||||
saa_writeb(SAA7134_TS_DMA0, (PAGE_SIZE >> 7) - 1);
|
||||
saa_writeb(SAA7134_TS_DMA1, 0);
|
||||
saa_writeb(SAA7134_TS_DMA2, 0);
|
||||
|
||||
/* Enable video streaming mode */
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_VIDEO);
|
||||
|
||||
saa_writel(SAA7134_RS_BA1(5), cpu_to_le32(saa->top_dma));
|
||||
saa_writel(SAA7134_RS_BA2(5), cpu_to_le32(saa->bottom_dma));
|
||||
saa_writel(SAA7134_RS_PITCH(5), 128);
|
||||
saa_writel(SAA7134_RS_CONTROL(5), SAA7134_RS_CONTROL_BURST_MAX);
|
||||
|
||||
/* Enable TS FIFO */
|
||||
saa_setl(SAA7134_MAIN_CTRL, SAA7134_MAIN_CTRL_TE5);
|
||||
|
||||
/* Enable DMA IRQ */
|
||||
saa_setl(SAA7134_IRQ1,
|
||||
SAA7134_IRQ1_INTE_RA2_1 | SAA7134_IRQ1_INTE_RA2_0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int saa7134_go7007_stream_stop(struct go7007 *go)
|
||||
{
|
||||
struct saa7134_go7007 *saa = go->hpi_context;
|
||||
struct saa7134_dev *dev;
|
||||
|
||||
if (!saa)
|
||||
return -EINVAL;
|
||||
dev = saa->dev;
|
||||
if (!dev)
|
||||
return -EINVAL;
|
||||
|
||||
/* Shut down TS FIFO */
|
||||
saa_clearl(SAA7134_MAIN_CTRL, SAA7134_MAIN_CTRL_TE5);
|
||||
|
||||
/* Disable DMA IRQ */
|
||||
saa_clearl(SAA7134_IRQ1,
|
||||
SAA7134_IRQ1_INTE_RA2_1 | SAA7134_IRQ1_INTE_RA2_0);
|
||||
|
||||
/* Disable TS interface */
|
||||
saa_clearb(SAA7134_TS_PARALLEL, 0x80);
|
||||
|
||||
dma_unmap_page(&dev->pci->dev, saa->top_dma, PAGE_SIZE,
|
||||
DMA_FROM_DEVICE);
|
||||
dma_unmap_page(&dev->pci->dev, saa->bottom_dma, PAGE_SIZE,
|
||||
DMA_FROM_DEVICE);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int saa7134_go7007_send_firmware(struct go7007 *go, u8 *data, int len)
|
||||
{
|
||||
struct saa7134_go7007 *saa = go->hpi_context;
|
||||
struct saa7134_dev *dev = saa->dev;
|
||||
u16 status_reg;
|
||||
int i;
|
||||
|
||||
#ifdef GO7007_HPI_DEBUG
|
||||
pr_debug("saa7134-go7007: DownloadBuffer sending %d bytes\n", len);
|
||||
#endif
|
||||
|
||||
while (len > 0) {
|
||||
i = len > 64 ? 64 : len;
|
||||
saa_writeb(SAA7134_GPIO_GPMODE0, 0xff);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS0, HPI_ADDR_INIT_BUFFER);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_ADDR);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);
|
||||
while (i-- > 0) {
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS0, *data);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_WRITE);
|
||||
saa_writeb(SAA7134_GPIO_GPSTATUS2, GPIO_COMMAND_IDLE);
|
||||
++data;
|
||||
--len;
|
||||
}
|
||||
for (i = 0; i < 100; ++i) {
|
||||
gpio_read(dev, HPI_ADDR_INTR_STATUS, &status_reg);
|
||||
if (!(status_reg & 0x0002))
|
||||
break;
|
||||
}
|
||||
if (i == 100) {
|
||||
pr_err("saa7134-go7007: device is hung, status reg = 0x%04x\n",
|
||||
status_reg);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct go7007_hpi_ops saa7134_go7007_hpi_ops = {
|
||||
.interface_reset = saa7134_go7007_interface_reset,
|
||||
.write_interrupt = saa7134_go7007_write_interrupt,
|
||||
.read_interrupt = saa7134_go7007_read_interrupt,
|
||||
.stream_start = saa7134_go7007_stream_start,
|
||||
.stream_stop = saa7134_go7007_stream_stop,
|
||||
.send_firmware = saa7134_go7007_send_firmware,
|
||||
};
|
||||
MODULE_FIRMWARE("go7007/go7007tv.bin");
|
||||
|
||||
/* --------------------------------------------------------------------------*/
|
||||
|
||||
static int saa7134_go7007_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
|
||||
{
|
||||
struct saa7134_go7007 *saa = to_state(sd);
|
||||
struct saa7134_dev *dev = saa->dev;
|
||||
|
||||
return saa7134_s_std_internal(dev, NULL, norm);
|
||||
}
|
||||
|
||||
static int saa7134_go7007_queryctrl(struct v4l2_subdev *sd,
|
||||
struct v4l2_queryctrl *query)
|
||||
{
|
||||
return saa7134_queryctrl(NULL, NULL, query);
|
||||
}
|
||||
static int saa7134_go7007_s_ctrl(struct v4l2_subdev *sd,
|
||||
struct v4l2_control *ctrl)
|
||||
{
|
||||
struct saa7134_go7007 *saa = to_state(sd);
|
||||
struct saa7134_dev *dev = saa->dev;
|
||||
|
||||
return saa7134_s_ctrl_internal(dev, NULL, ctrl);
|
||||
}
|
||||
|
||||
static int saa7134_go7007_g_ctrl(struct v4l2_subdev *sd,
|
||||
struct v4l2_control *ctrl)
|
||||
{
|
||||
struct saa7134_go7007 *saa = to_state(sd);
|
||||
struct saa7134_dev *dev = saa->dev;
|
||||
|
||||
return saa7134_g_ctrl_internal(dev, NULL, ctrl);
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------*/
|
||||
|
||||
static const struct v4l2_subdev_core_ops saa7134_go7007_core_ops = {
|
||||
.g_ctrl = saa7134_go7007_g_ctrl,
|
||||
.s_ctrl = saa7134_go7007_s_ctrl,
|
||||
.queryctrl = saa7134_go7007_queryctrl,
|
||||
};
|
||||
|
||||
static const struct v4l2_subdev_video_ops saa7134_go7007_video_ops = {
|
||||
.s_std = saa7134_go7007_s_std,
|
||||
};
|
||||
|
||||
static const struct v4l2_subdev_ops saa7134_go7007_sd_ops = {
|
||||
.core = &saa7134_go7007_core_ops,
|
||||
.video = &saa7134_go7007_video_ops,
|
||||
};
|
||||
|
||||
/* --------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
/********************* Add/remove functions *********************/
|
||||
|
||||
static int saa7134_go7007_init(struct saa7134_dev *dev)
|
||||
{
|
||||
struct go7007 *go;
|
||||
struct saa7134_go7007 *saa;
|
||||
struct v4l2_subdev *sd;
|
||||
|
||||
pr_debug("saa7134-go7007: probing new SAA713X board\n");
|
||||
|
||||
go = go7007_alloc(&board_voyager, &dev->pci->dev);
|
||||
if (go == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
saa = kzalloc(sizeof(struct saa7134_go7007), GFP_KERNEL);
|
||||
if (saa == NULL) {
|
||||
kfree(go);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
go->board_id = GO7007_BOARDID_PCI_VOYAGER;
|
||||
snprintf(go->bus_info, sizeof(go->bus_info), "PCI:%s", pci_name(dev->pci));
|
||||
strlcpy(go->name, saa7134_boards[dev->board].name, sizeof(go->name));
|
||||
go->hpi_ops = &saa7134_go7007_hpi_ops;
|
||||
go->hpi_context = saa;
|
||||
saa->dev = dev;
|
||||
|
||||
/* Init the subdevice interface */
|
||||
sd = &saa->sd;
|
||||
v4l2_subdev_init(sd, &saa7134_go7007_sd_ops);
|
||||
v4l2_set_subdevdata(sd, saa);
|
||||
strncpy(sd->name, "saa7134-go7007", sizeof(sd->name));
|
||||
|
||||
/* Allocate a couple pages for receiving the compressed stream */
|
||||
saa->top = (u8 *)get_zeroed_page(GFP_KERNEL);
|
||||
if (!saa->top)
|
||||
goto allocfail;
|
||||
saa->bottom = (u8 *)get_zeroed_page(GFP_KERNEL);
|
||||
if (!saa->bottom)
|
||||
goto allocfail;
|
||||
|
||||
/* Boot the GO7007 */
|
||||
if (go7007_boot_encoder(go, go->board_info->flags &
|
||||
GO7007_BOARD_USE_ONBOARD_I2C) < 0)
|
||||
goto allocfail;
|
||||
|
||||
/* Do any final GO7007 initialization, then register the
|
||||
* V4L2 and ALSA interfaces */
|
||||
if (go7007_register_encoder(go, go->board_info->num_i2c_devs) < 0)
|
||||
goto allocfail;
|
||||
|
||||
/* Register the subdevice interface with the go7007 device */
|
||||
if (v4l2_device_register_subdev(&go->v4l2_dev, sd) < 0)
|
||||
pr_info("saa7134-go7007: register subdev failed\n");
|
||||
|
||||
dev->empress_dev = &go->vdev;
|
||||
|
||||
go->status = STATUS_ONLINE;
|
||||
return 0;
|
||||
|
||||
allocfail:
|
||||
if (saa->top)
|
||||
free_page((unsigned long)saa->top);
|
||||
if (saa->bottom)
|
||||
free_page((unsigned long)saa->bottom);
|
||||
kfree(saa);
|
||||
kfree(go);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
static int saa7134_go7007_fini(struct saa7134_dev *dev)
|
||||
{
|
||||
struct go7007 *go;
|
||||
struct saa7134_go7007 *saa;
|
||||
|
||||
if (NULL == dev->empress_dev)
|
||||
return 0;
|
||||
|
||||
go = video_get_drvdata(dev->empress_dev);
|
||||
if (go->audio_enabled)
|
||||
go7007_snd_remove(go);
|
||||
|
||||
saa = go->hpi_context;
|
||||
go->status = STATUS_SHUTDOWN;
|
||||
free_page((unsigned long)saa->top);
|
||||
free_page((unsigned long)saa->bottom);
|
||||
v4l2_device_unregister_subdev(&saa->sd);
|
||||
kfree(saa);
|
||||
video_unregister_device(&go->vdev);
|
||||
|
||||
v4l2_device_put(&go->v4l2_dev);
|
||||
dev->empress_dev = NULL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct saa7134_mpeg_ops saa7134_go7007_ops = {
|
||||
.type = SAA7134_MPEG_GO7007,
|
||||
.init = saa7134_go7007_init,
|
||||
.fini = saa7134_go7007_fini,
|
||||
.irq_ts_done = saa7134_go7007_irq_ts_done,
|
||||
};
|
||||
|
||||
static int __init saa7134_go7007_mod_init(void)
|
||||
{
|
||||
return saa7134_ts_register(&saa7134_go7007_ops);
|
||||
}
|
||||
|
||||
static void __exit saa7134_go7007_mod_cleanup(void)
|
||||
{
|
||||
saa7134_ts_unregister(&saa7134_go7007_ops);
|
||||
}
|
||||
|
||||
module_init(saa7134_go7007_mod_init);
|
||||
module_exit(saa7134_go7007_mod_cleanup);
|
||||
|
||||
MODULE_LICENSE("GPL v2");
|
||||
Loading…
Reference in New Issue
Block a user