2005-11-09 13:37:07 +08:00
|
|
|
/*
|
2006-01-10 01:32:40 +08:00
|
|
|
em28xx.h - driver for Empia EM2800/EM2820/2840 USB video capture devices
|
2005-11-09 13:37:07 +08:00
|
|
|
|
|
|
|
Copyright (C) 2005 Markus Rechberger <mrechberger@gmail.com>
|
2005-11-09 13:37:43 +08:00
|
|
|
Ludovico Cavedon <cavedon@sssup.it>
|
2006-04-03 18:53:40 +08:00
|
|
|
Mauro Carvalho Chehab <mchehab@infradead.org>
|
2012-11-09 01:11:49 +08:00
|
|
|
Copyright (C) 2012 Frank Schäfer <fschaefer.oss@googlemail.com>
|
2005-11-09 13:37:07 +08:00
|
|
|
|
|
|
|
Based on the em2800 driver from Sascha Sommer <saschasommer@freenet.de>
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
#ifndef _EM28XX_H
|
|
|
|
#define _EM28XX_H
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2010-10-10 02:53:58 +08:00
|
|
|
#include <linux/workqueue.h>
|
|
|
|
#include <linux/i2c.h>
|
|
|
|
#include <linux/mutex.h>
|
2007-11-12 00:23:54 +08:00
|
|
|
#include <linux/videodev2.h>
|
2010-10-10 02:53:58 +08:00
|
|
|
|
2013-01-05 03:16:24 +08:00
|
|
|
#include <media/videobuf2-vmalloc.h>
|
2009-04-01 04:10:58 +08:00
|
|
|
#include <media/v4l2-device.h>
|
2012-09-07 16:43:59 +08:00
|
|
|
#include <media/v4l2-ctrls.h>
|
2012-09-07 16:52:40 +08:00
|
|
|
#include <media/v4l2-fh.h>
|
2005-11-09 13:37:32 +08:00
|
|
|
#include <media/ir-kbd-i2c.h>
|
2010-11-18 00:28:38 +08:00
|
|
|
#include <media/rc-core.h>
|
2008-04-18 08:37:53 +08:00
|
|
|
#include "tuner-xc2028.h"
|
2011-11-19 22:37:14 +08:00
|
|
|
#include "xc5000.h"
|
2008-04-18 08:42:58 +08:00
|
|
|
#include "em28xx-reg.h"
|
2008-04-18 08:36:41 +08:00
|
|
|
|
|
|
|
/* Boards supported by driver */
|
2013-02-12 01:01:20 +08:00
|
|
|
#define EM2800_BOARD_UNKNOWN 0
|
|
|
|
#define EM2820_BOARD_UNKNOWN 1
|
|
|
|
#define EM2820_BOARD_TERRATEC_CINERGY_250 2
|
|
|
|
#define EM2820_BOARD_PINNACLE_USB_2 3
|
|
|
|
#define EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 4
|
|
|
|
#define EM2820_BOARD_MSI_VOX_USB_2 5
|
|
|
|
#define EM2800_BOARD_TERRATEC_CINERGY_200 6
|
|
|
|
#define EM2800_BOARD_LEADTEK_WINFAST_USBII 7
|
|
|
|
#define EM2800_BOARD_KWORLD_USB2800 8
|
|
|
|
#define EM2820_BOARD_PINNACLE_DVC_90 9
|
|
|
|
#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 10
|
|
|
|
#define EM2880_BOARD_TERRATEC_HYBRID_XS 11
|
|
|
|
#define EM2820_BOARD_KWORLD_PVRTV2800RF 12
|
|
|
|
#define EM2880_BOARD_TERRATEC_PRODIGY_XS 13
|
|
|
|
#define EM2820_BOARD_PROLINK_PLAYTV_USB2 14
|
|
|
|
#define EM2800_BOARD_VGEAR_POCKETTV 15
|
|
|
|
#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 16
|
|
|
|
#define EM2880_BOARD_PINNACLE_PCTV_HD_PRO 17
|
|
|
|
#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2 18
|
|
|
|
#define EM2860_BOARD_SAA711X_REFERENCE_DESIGN 19
|
|
|
|
#define EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 20
|
|
|
|
#define EM2800_BOARD_GRABBEEX_USB2800 21
|
2008-07-28 01:03:32 +08:00
|
|
|
#define EM2750_BOARD_UNKNOWN 22
|
|
|
|
#define EM2750_BOARD_DLCW_130 23
|
|
|
|
#define EM2820_BOARD_DLINK_USB_TV 24
|
|
|
|
#define EM2820_BOARD_GADMEI_UTV310 25
|
|
|
|
#define EM2820_BOARD_HERCULES_SMART_TV_USB2 26
|
|
|
|
#define EM2820_BOARD_PINNACLE_USB_2_FM1216ME 27
|
|
|
|
#define EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE 28
|
2010-03-20 10:53:12 +08:00
|
|
|
#define EM2860_BOARD_TVP5150_REFERENCE_DESIGN 29
|
2008-07-28 01:03:32 +08:00
|
|
|
#define EM2820_BOARD_VIDEOLOGY_20K14XUSB 30
|
|
|
|
#define EM2821_BOARD_USBGEAR_VD204 31
|
|
|
|
#define EM2821_BOARD_SUPERCOMP_USB_2 32
|
2010-10-20 18:55:33 +08:00
|
|
|
#define EM2860_BOARD_ELGATO_VIDEO_CAPTURE 33
|
2008-07-28 01:03:32 +08:00
|
|
|
#define EM2860_BOARD_TERRATEC_HYBRID_XS 34
|
|
|
|
#define EM2860_BOARD_TYPHOON_DVD_MAKER 35
|
|
|
|
#define EM2860_BOARD_NETGMBH_CAM 36
|
|
|
|
#define EM2860_BOARD_GADMEI_UTV330 37
|
|
|
|
#define EM2861_BOARD_YAKUMO_MOVIE_MIXER 38
|
|
|
|
#define EM2861_BOARD_KWORLD_PVRTV_300U 39
|
|
|
|
#define EM2861_BOARD_PLEXTOR_PX_TV100U 40
|
|
|
|
#define EM2870_BOARD_KWORLD_350U 41
|
|
|
|
#define EM2870_BOARD_KWORLD_355U 42
|
|
|
|
#define EM2870_BOARD_TERRATEC_XS 43
|
|
|
|
#define EM2870_BOARD_TERRATEC_XS_MT2060 44
|
|
|
|
#define EM2870_BOARD_PINNACLE_PCTV_DVB 45
|
|
|
|
#define EM2870_BOARD_COMPRO_VIDEOMATE 46
|
|
|
|
#define EM2880_BOARD_KWORLD_DVB_305U 47
|
|
|
|
#define EM2880_BOARD_KWORLD_DVB_310U 48
|
|
|
|
#define EM2880_BOARD_MSI_DIGIVOX_AD 49
|
|
|
|
#define EM2880_BOARD_MSI_DIGIVOX_AD_II 50
|
|
|
|
#define EM2880_BOARD_TERRATEC_HYBRID_XS_FR 51
|
|
|
|
#define EM2881_BOARD_DNT_DA2_HYBRID 52
|
|
|
|
#define EM2881_BOARD_PINNACLE_HYBRID_PRO 53
|
|
|
|
#define EM2882_BOARD_KWORLD_VS_DVBT 54
|
|
|
|
#define EM2882_BOARD_TERRATEC_HYBRID_XS 55
|
2011-03-13 13:07:54 +08:00
|
|
|
#define EM2882_BOARD_PINNACLE_HYBRID_PRO_330E 56
|
2013-02-12 01:01:20 +08:00
|
|
|
#define EM2883_BOARD_KWORLD_HYBRID_330U 57
|
2008-07-28 03:58:04 +08:00
|
|
|
#define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58
|
2008-12-02 08:01:04 +08:00
|
|
|
#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60
|
2008-12-28 08:38:14 +08:00
|
|
|
#define EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2 61
|
2009-01-19 20:31:55 +08:00
|
|
|
#define EM2820_BOARD_GADMEI_TVR200 62
|
2013-02-12 01:01:20 +08:00
|
|
|
#define EM2860_BOARD_KAIOMY_TVNPC_U2 63
|
|
|
|
#define EM2860_BOARD_EASYCAP 64
|
2009-02-11 22:13:05 +08:00
|
|
|
#define EM2820_BOARD_IODATA_GVMVP_SZ 65
|
2009-04-10 05:24:34 +08:00
|
|
|
#define EM2880_BOARD_EMPIRE_DUAL_TV 66
|
2009-05-23 20:58:52 +08:00
|
|
|
#define EM2860_BOARD_TERRATEC_GRABBY 67
|
2009-05-24 11:46:01 +08:00
|
|
|
#define EM2860_BOARD_TERRATEC_AV350 68
|
2009-06-07 04:05:02 +08:00
|
|
|
#define EM2882_BOARD_KWORLD_ATSC_315U 69
|
2009-06-19 11:33:54 +08:00
|
|
|
#define EM2882_BOARD_EVGA_INDTUBE 70
|
2013-02-12 01:01:20 +08:00
|
|
|
#define EM2820_BOARD_SILVERCREST_WEBCAM 71
|
|
|
|
#define EM2861_BOARD_GADMEI_UTV330PLUS 72
|
|
|
|
#define EM2870_BOARD_REDDO_DVB_C_USB_BOX 73
|
2009-11-27 08:26:13 +08:00
|
|
|
#define EM2800_BOARD_VC211A 74
|
2010-02-10 04:53:38 +08:00
|
|
|
#define EM2882_BOARD_DIKOM_DK300 75
|
2010-03-08 04:55:43 +08:00
|
|
|
#define EM2870_BOARD_KWORLD_A340 76
|
2011-07-04 08:05:06 +08:00
|
|
|
#define EM2874_BOARD_LEADERSHIP_ISDBT 77
|
2013-02-12 01:01:20 +08:00
|
|
|
#define EM28174_BOARD_PCTV_290E 78
|
2011-07-04 08:05:06 +08:00
|
|
|
#define EM2884_BOARD_TERRATEC_H5 79
|
2013-02-12 01:01:20 +08:00
|
|
|
#define EM28174_BOARD_PCTV_460E 80
|
2011-11-19 22:37:14 +08:00
|
|
|
#define EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C 81
|
2011-11-16 22:06:50 +08:00
|
|
|
#define EM2884_BOARD_CINERGY_HTC_STICK 82
|
2013-02-12 01:01:20 +08:00
|
|
|
#define EM2860_BOARD_HT_VIDBOX_NW03 83
|
|
|
|
#define EM2874_BOARD_MAXMEDIA_UB425_TC 84
|
|
|
|
#define EM2884_BOARD_PCTV_510E 85
|
|
|
|
#define EM2884_BOARD_PCTV_520E 86
|
2012-10-05 01:22:54 +08:00
|
|
|
#define EM2884_BOARD_TERRATEC_HTC_USB_XS 87
|
2008-04-18 08:36:41 +08:00
|
|
|
|
|
|
|
/* Limits minimum and default number of buffers */
|
|
|
|
#define EM28XX_MIN_BUF 4
|
|
|
|
#define EM28XX_DEF_BUF 8
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2008-11-19 01:51:08 +08:00
|
|
|
/*Limits the max URB message size */
|
|
|
|
#define URB_MAX_CTRL_SIZE 80
|
|
|
|
|
2008-07-28 01:03:32 +08:00
|
|
|
/* Params for validated field */
|
|
|
|
#define EM28XX_BOARD_NOT_VALIDATED 1
|
|
|
|
#define EM28XX_BOARD_VALIDATED 0
|
|
|
|
|
2009-02-08 12:38:10 +08:00
|
|
|
/* Params for em28xx_cmd() audio */
|
|
|
|
#define EM28XX_START_AUDIO 1
|
|
|
|
#define EM28XX_STOP_AUDIO 0
|
|
|
|
|
2005-11-09 13:37:24 +08:00
|
|
|
/* maximum number of em28xx boards */
|
V4L/DVB (7179): Allow more than one em28xx board
em28xx driver is capable of handling more than one usb device. However, isoc
transfers require a large amount of data to be transfered.
Before this patch, just one em28xx board were enough to allocate more than 50%
URBs:
T: Bus=02 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#= 1 Spd=480 MxCh= 8
B: Alloc=480/800 us (60%), #Int= 0, #Iso= 2
D: Ver= 2.00 Cls=09(hub ) Sub=00 Prot=01 MxPS=64 #Cfgs= 1
So, only one board could use an USB host at the same time. After the patch, it
is possible to use more than one em28xx at the same time, on the same usb host,
if the image size is slower or equal to 345600, since those images will
require about 30% of the URBs:
T: Bus=02 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#= 1 Spd=480 MxCh= 8
B: Alloc=232/800 us (29%), #Int= 0, #Iso= 2
D: Ver= 2.00 Cls=09(hub ) Sub=00 Prot=01 MxPS=64 #Cfgs= 1
So, in thesis, after the patch, it would be possible to use up to 3 boards by
each usb host, if the devices are generating small images.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-02-09 02:44:25 +08:00
|
|
|
#define EM28XX_MAXBOARDS 4 /*FIXME: should be bigger */
|
2005-11-09 13:37:24 +08:00
|
|
|
|
2005-11-09 13:37:07 +08:00
|
|
|
/* maximum number of frames that can be queued */
|
2005-11-09 13:38:27 +08:00
|
|
|
#define EM28XX_NUM_FRAMES 5
|
2005-11-09 13:37:07 +08:00
|
|
|
/* number of frames that get used for v4l2_read() */
|
2005-11-09 13:38:27 +08:00
|
|
|
#define EM28XX_NUM_READ_FRAMES 2
|
2005-11-09 13:37:07 +08:00
|
|
|
|
|
|
|
/* number of buffers for isoc transfers */
|
2005-11-09 13:38:27 +08:00
|
|
|
#define EM28XX_NUM_BUFS 5
|
[media] em28xx: pre-allocate DVB isoc transfer buffers
On MIPS/ARM set-top-boxes, as well as old x86 PCs, memory allocation failures
in the em28xx driver are common, due to memory fragmentation over time, that
makes impossible to allocate large chunks of coherent memory.
A typical system with 256/512 MB of RAM fails after just 1 day of uptime (see
the old thread for detailed reports and crashlogs).
In fact, the em28xx driver allocates memory for USB isoc transfers at runtime,
as opposite to the dvb-usb drivers that allocates the USB buffers when the
device is initialized, and frees them when the device is disconnected.
Moreover, in digital mode the USB isoc transfer buffers are freed, allocated
and cleared every time the user selects a new channel, wasting time and
resources.
This patch solves both problems by allocating DVB isoc transfer buffers in
em28xx_usb_probe(), and freeing them in em28xx_usb_disconnect().
In fact, the buffers size and number depend only on the max USB packet size
that is parsed from the USB descriptors in em28xx_usb_probe(), so it can
never change for a given device.
This approach makes no sense in analog mode (as the buffer size depends on
the alternate mode selected at runtime), the patch creates two separate sets
of buffers for digital and analog modes.
For digital-only devices, USB buffers are created when the device is probed
and freed when the device is disconnected.
For analog-only devices, nothing changes: isoc buffers are created at runtime.
For hybrid devices, two sets of buffers are maintained: the digital-mode
buffers are created when the device is probed, and freed when the device is
disconnected; analog-mode buffers are created/destroyed at runtime as before.
So, in analog mode, digital and analog buffers coexists at the same time: this
can be justified by the fact that digital mode is by far more commonly used
nowadays, so it makes sense to optimize the driver for this use case scenario.
The patch has been tested in the last few days on a x86 PC and a MIPS
set-top-box, with the PCTV 290e (digital only) and the Terratec Hybrid XS
(hybrid device). With the latter, I switched several times between analog and
digital mode (Kaffeine/TvTime) with no issue at all.
I unplugged/plugged the devices several times with no problem.
Also, after over 3 days of normal usage in the MPIS set-top-box, the PCTV 290e
was still up and running.
Signed-off-by: Gianluca Gennari <gennarone@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-02-14 00:59:22 +08:00
|
|
|
#define EM28XX_DVB_NUM_BUFS 5
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2012-11-09 01:11:35 +08:00
|
|
|
/* isoc transfers: number of packets for each buffer
|
2010-01-22 12:53:17 +08:00
|
|
|
windows requests only 64 packets .. so we better do the same
|
2005-11-09 13:37:32 +08:00
|
|
|
this is what I found out for all alternate numbers there!
|
|
|
|
*/
|
2012-11-09 01:11:35 +08:00
|
|
|
#define EM28XX_NUM_ISOC_PACKETS 64
|
|
|
|
#define EM28XX_DVB_NUM_ISOC_PACKETS 64
|
2005-11-09 13:37:07 +08:00
|
|
|
|
[media] em28xx: improve USB endpoint logic, also use bulk transfers
The current enpoint logic ignores all bulk endpoints and uses
a fixed mapping between endpint addresses and the supported
data stream types (analog/audio/DVB):
Ep 0x82, isoc => analog
Ep 0x83, isoc => audio
Ep 0x84, isoc => DVB
Now that the code can also do bulk transfers, the endpoint
logic has to be extended to also consider bulk endpoints.
The new logic preserves backwards compatibility and reflects
the endpoint configurations we have seen so far:
Ep 0x82, isoc => analog
Ep 0x82, bulk => analog
Ep 0x83, isoc* => audio
Ep 0x84, isoc => digital
Ep 0x84, bulk => analog or digital**
(*: audio should always be isoc)
(**: analog, if ep 0x82 is isoc, otherwise digital)
[mchehab@redhat.com: Fix a CodingStyle issue: don't break strings
into separate lines]
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-11-09 01:11:52 +08:00
|
|
|
/* bulk transfers: transfer buffer size = packet size * packet multiplier
|
|
|
|
USB 2.0 spec says bulk packet size is always 512 bytes
|
|
|
|
*/
|
|
|
|
#define EM28XX_BULK_PACKET_MULTIPLIER 384
|
|
|
|
#define EM28XX_DVB_BULK_PACKET_MULTIPLIER 384
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
#define EM28XX_INTERLACED_DEFAULT 1
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2005-11-09 13:37:24 +08:00
|
|
|
/* time in msecs to wait for i2c writes to finish */
|
2013-01-04 01:27:03 +08:00
|
|
|
#define EM2800_I2C_XFER_TIMEOUT 20
|
2005-11-09 13:37:24 +08:00
|
|
|
|
2008-04-18 08:36:41 +08:00
|
|
|
enum em28xx_mode {
|
2008-11-27 20:10:40 +08:00
|
|
|
EM28XX_SUSPEND,
|
2008-04-18 08:36:41 +08:00
|
|
|
EM28XX_ANALOG_MODE,
|
|
|
|
EM28XX_DIGITAL_MODE,
|
|
|
|
};
|
|
|
|
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2008-04-18 08:40:16 +08:00
|
|
|
struct em28xx;
|
|
|
|
|
2012-11-09 01:11:36 +08:00
|
|
|
struct em28xx_usb_bufs {
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
/* max packet size of isoc transaction */
|
|
|
|
int max_pkt_size;
|
|
|
|
|
[media] em28xx: pre-allocate DVB isoc transfer buffers
On MIPS/ARM set-top-boxes, as well as old x86 PCs, memory allocation failures
in the em28xx driver are common, due to memory fragmentation over time, that
makes impossible to allocate large chunks of coherent memory.
A typical system with 256/512 MB of RAM fails after just 1 day of uptime (see
the old thread for detailed reports and crashlogs).
In fact, the em28xx driver allocates memory for USB isoc transfers at runtime,
as opposite to the dvb-usb drivers that allocates the USB buffers when the
device is initialized, and frees them when the device is disconnected.
Moreover, in digital mode the USB isoc transfer buffers are freed, allocated
and cleared every time the user selects a new channel, wasting time and
resources.
This patch solves both problems by allocating DVB isoc transfer buffers in
em28xx_usb_probe(), and freeing them in em28xx_usb_disconnect().
In fact, the buffers size and number depend only on the max USB packet size
that is parsed from the USB descriptors in em28xx_usb_probe(), so it can
never change for a given device.
This approach makes no sense in analog mode (as the buffer size depends on
the alternate mode selected at runtime), the patch creates two separate sets
of buffers for digital and analog modes.
For digital-only devices, USB buffers are created when the device is probed
and freed when the device is disconnected.
For analog-only devices, nothing changes: isoc buffers are created at runtime.
For hybrid devices, two sets of buffers are maintained: the digital-mode
buffers are created when the device is probed, and freed when the device is
disconnected; analog-mode buffers are created/destroyed at runtime as before.
So, in analog mode, digital and analog buffers coexists at the same time: this
can be justified by the fact that digital mode is by far more commonly used
nowadays, so it makes sense to optimize the driver for this use case scenario.
The patch has been tested in the last few days on a x86 PC and a MIPS
set-top-box, with the PCTV 290e (digital only) and the Terratec Hybrid XS
(hybrid device). With the latter, I switched several times between analog and
digital mode (Kaffeine/TvTime) with no issue at all.
I unplugged/plugged the devices several times with no problem.
Also, after over 3 days of normal usage in the MPIS set-top-box, the PCTV 290e
was still up and running.
Signed-off-by: Gianluca Gennari <gennarone@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-02-14 00:59:22 +08:00
|
|
|
/* number of packets in each buffer */
|
|
|
|
int num_packets;
|
|
|
|
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
/* number of allocated urbs */
|
|
|
|
int num_bufs;
|
|
|
|
|
2012-11-09 01:11:36 +08:00
|
|
|
/* urb for isoc/bulk transfers */
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
struct urb **urb;
|
|
|
|
|
2012-11-09 01:11:36 +08:00
|
|
|
/* transfer buffers for isoc/bulk transfer */
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
char **transfer_buffer;
|
[media] em28xx: pre-allocate DVB isoc transfer buffers
On MIPS/ARM set-top-boxes, as well as old x86 PCs, memory allocation failures
in the em28xx driver are common, due to memory fragmentation over time, that
makes impossible to allocate large chunks of coherent memory.
A typical system with 256/512 MB of RAM fails after just 1 day of uptime (see
the old thread for detailed reports and crashlogs).
In fact, the em28xx driver allocates memory for USB isoc transfers at runtime,
as opposite to the dvb-usb drivers that allocates the USB buffers when the
device is initialized, and frees them when the device is disconnected.
Moreover, in digital mode the USB isoc transfer buffers are freed, allocated
and cleared every time the user selects a new channel, wasting time and
resources.
This patch solves both problems by allocating DVB isoc transfer buffers in
em28xx_usb_probe(), and freeing them in em28xx_usb_disconnect().
In fact, the buffers size and number depend only on the max USB packet size
that is parsed from the USB descriptors in em28xx_usb_probe(), so it can
never change for a given device.
This approach makes no sense in analog mode (as the buffer size depends on
the alternate mode selected at runtime), the patch creates two separate sets
of buffers for digital and analog modes.
For digital-only devices, USB buffers are created when the device is probed
and freed when the device is disconnected.
For analog-only devices, nothing changes: isoc buffers are created at runtime.
For hybrid devices, two sets of buffers are maintained: the digital-mode
buffers are created when the device is probed, and freed when the device is
disconnected; analog-mode buffers are created/destroyed at runtime as before.
So, in analog mode, digital and analog buffers coexists at the same time: this
can be justified by the fact that digital mode is by far more commonly used
nowadays, so it makes sense to optimize the driver for this use case scenario.
The patch has been tested in the last few days on a x86 PC and a MIPS
set-top-box, with the PCTV 290e (digital only) and the Terratec Hybrid XS
(hybrid device). With the latter, I switched several times between analog and
digital mode (Kaffeine/TvTime) with no issue at all.
I unplugged/plugged the devices several times with no problem.
Also, after over 3 days of normal usage in the MPIS set-top-box, the PCTV 290e
was still up and running.
Signed-off-by: Gianluca Gennari <gennarone@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-02-14 00:59:22 +08:00
|
|
|
};
|
|
|
|
|
2012-11-09 01:11:37 +08:00
|
|
|
struct em28xx_usb_ctl {
|
|
|
|
/* isoc/bulk transfer buffers for analog mode */
|
2012-11-09 01:11:36 +08:00
|
|
|
struct em28xx_usb_bufs analog_bufs;
|
[media] em28xx: pre-allocate DVB isoc transfer buffers
On MIPS/ARM set-top-boxes, as well as old x86 PCs, memory allocation failures
in the em28xx driver are common, due to memory fragmentation over time, that
makes impossible to allocate large chunks of coherent memory.
A typical system with 256/512 MB of RAM fails after just 1 day of uptime (see
the old thread for detailed reports and crashlogs).
In fact, the em28xx driver allocates memory for USB isoc transfers at runtime,
as opposite to the dvb-usb drivers that allocates the USB buffers when the
device is initialized, and frees them when the device is disconnected.
Moreover, in digital mode the USB isoc transfer buffers are freed, allocated
and cleared every time the user selects a new channel, wasting time and
resources.
This patch solves both problems by allocating DVB isoc transfer buffers in
em28xx_usb_probe(), and freeing them in em28xx_usb_disconnect().
In fact, the buffers size and number depend only on the max USB packet size
that is parsed from the USB descriptors in em28xx_usb_probe(), so it can
never change for a given device.
This approach makes no sense in analog mode (as the buffer size depends on
the alternate mode selected at runtime), the patch creates two separate sets
of buffers for digital and analog modes.
For digital-only devices, USB buffers are created when the device is probed
and freed when the device is disconnected.
For analog-only devices, nothing changes: isoc buffers are created at runtime.
For hybrid devices, two sets of buffers are maintained: the digital-mode
buffers are created when the device is probed, and freed when the device is
disconnected; analog-mode buffers are created/destroyed at runtime as before.
So, in analog mode, digital and analog buffers coexists at the same time: this
can be justified by the fact that digital mode is by far more commonly used
nowadays, so it makes sense to optimize the driver for this use case scenario.
The patch has been tested in the last few days on a x86 PC and a MIPS
set-top-box, with the PCTV 290e (digital only) and the Terratec Hybrid XS
(hybrid device). With the latter, I switched several times between analog and
digital mode (Kaffeine/TvTime) with no issue at all.
I unplugged/plugged the devices several times with no problem.
Also, after over 3 days of normal usage in the MPIS set-top-box, the PCTV 290e
was still up and running.
Signed-off-by: Gianluca Gennari <gennarone@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-02-14 00:59:22 +08:00
|
|
|
|
2012-11-09 01:11:37 +08:00
|
|
|
/* isoc/bulk transfer buffers for digital mode */
|
2012-11-09 01:11:36 +08:00
|
|
|
struct em28xx_usb_bufs digital_bufs;
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
|
|
|
|
/* Stores already requested buffers */
|
2009-09-01 12:54:54 +08:00
|
|
|
struct em28xx_buffer *vid_buf;
|
|
|
|
struct em28xx_buffer *vbi_buf;
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
|
2012-11-09 01:11:37 +08:00
|
|
|
/* copy data from URB */
|
|
|
|
int (*urb_data_copy) (struct em28xx *dev, struct urb *urb);
|
2008-04-18 08:40:16 +08:00
|
|
|
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
};
|
|
|
|
|
2008-12-20 20:06:37 +08:00
|
|
|
/* Struct to enumberate video formats */
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
struct em28xx_fmt {
|
|
|
|
char *name;
|
|
|
|
u32 fourcc; /* v4l2 format id */
|
2008-12-20 20:06:37 +08:00
|
|
|
int depth;
|
|
|
|
int reg;
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* buffer for one video frame */
|
|
|
|
struct em28xx_buffer {
|
|
|
|
/* common v4l buffer stuff -- must be first */
|
2013-01-05 03:16:24 +08:00
|
|
|
struct vb2_buffer vb;
|
|
|
|
struct list_head list;
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
|
2013-01-05 03:16:24 +08:00
|
|
|
void *mem;
|
|
|
|
unsigned int length;
|
2005-11-09 13:37:07 +08:00
|
|
|
int top_field;
|
2012-12-08 22:31:27 +08:00
|
|
|
|
|
|
|
/* counter to control buffer fill */
|
|
|
|
unsigned int pos;
|
|
|
|
/* NOTE; in interlaced mode, this value is reset to zero at
|
|
|
|
* the start of each new field (not frame !) */
|
2012-12-08 22:31:29 +08:00
|
|
|
|
|
|
|
/* pointer to vmalloc memory address in vb */
|
|
|
|
char *vb_buf;
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct em28xx_dmaqueue {
|
|
|
|
struct list_head active;
|
|
|
|
|
|
|
|
wait_queue_head_t wq;
|
2005-11-09 13:37:07 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* inputs */
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
#define MAX_EM28XX_INPUT 4
|
|
|
|
enum enum28xx_itype {
|
|
|
|
EM28XX_VMUX_COMPOSITE1 = 1,
|
|
|
|
EM28XX_VMUX_COMPOSITE2,
|
|
|
|
EM28XX_VMUX_COMPOSITE3,
|
|
|
|
EM28XX_VMUX_COMPOSITE4,
|
|
|
|
EM28XX_VMUX_SVIDEO,
|
|
|
|
EM28XX_VMUX_TELEVISION,
|
|
|
|
EM28XX_VMUX_CABLE,
|
|
|
|
EM28XX_VMUX_DVB,
|
|
|
|
EM28XX_VMUX_DEBUG,
|
|
|
|
EM28XX_RADIO,
|
2005-11-09 13:37:07 +08:00
|
|
|
};
|
|
|
|
|
2008-11-19 23:01:33 +08:00
|
|
|
enum em28xx_ac97_mode {
|
|
|
|
EM28XX_NO_AC97 = 0,
|
|
|
|
EM28XX_AC97_EM202,
|
2008-11-20 23:49:33 +08:00
|
|
|
EM28XX_AC97_SIGMATEL,
|
2008-11-19 23:01:33 +08:00
|
|
|
EM28XX_AC97_OTHER,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct em28xx_audio_mode {
|
|
|
|
enum em28xx_ac97_mode ac97;
|
|
|
|
|
|
|
|
u16 ac97_feat;
|
2008-11-20 19:56:19 +08:00
|
|
|
u32 ac97_vendor_id;
|
2008-11-19 23:01:33 +08:00
|
|
|
|
|
|
|
unsigned int has_audio:1;
|
|
|
|
|
|
|
|
unsigned int i2s_3rates:1;
|
|
|
|
unsigned int i2s_5rates:1;
|
2008-11-19 19:22:28 +08:00
|
|
|
};
|
|
|
|
|
2008-11-20 20:06:09 +08:00
|
|
|
/* em28xx has two audio inputs: tuner and line in.
|
|
|
|
However, on most devices, an auxiliary AC97 codec device is used.
|
|
|
|
The AC97 device may have several different inputs and outputs,
|
|
|
|
depending on their model. So, it is possible to use AC97 mixer to
|
|
|
|
address more than two different entries.
|
|
|
|
*/
|
2008-01-05 20:53:54 +08:00
|
|
|
enum em28xx_amux {
|
2008-11-20 20:06:09 +08:00
|
|
|
/* This is the only entry for em28xx tuner input */
|
|
|
|
EM28XX_AMUX_VIDEO, /* em28xx tuner, AC97 mixer Video */
|
|
|
|
|
|
|
|
EM28XX_AMUX_LINE_IN, /* AC97 mixer Line In */
|
|
|
|
|
|
|
|
/* Some less-common mixer setups */
|
|
|
|
EM28XX_AMUX_VIDEO2, /* em28xx Line in, AC97 mixer Video */
|
|
|
|
EM28XX_AMUX_PHONE,
|
|
|
|
EM28XX_AMUX_MIC,
|
|
|
|
EM28XX_AMUX_CD,
|
|
|
|
EM28XX_AMUX_AUX,
|
|
|
|
EM28XX_AMUX_PCM_OUT,
|
2008-01-05 20:53:54 +08:00
|
|
|
};
|
|
|
|
|
2008-11-20 23:40:51 +08:00
|
|
|
enum em28xx_aout {
|
2009-01-13 08:50:52 +08:00
|
|
|
/* AC97 outputs */
|
2008-11-21 00:39:39 +08:00
|
|
|
EM28XX_AOUT_MASTER = 1 << 0,
|
|
|
|
EM28XX_AOUT_LINE = 1 << 1,
|
|
|
|
EM28XX_AOUT_MONO = 1 << 2,
|
|
|
|
EM28XX_AOUT_LFE = 1 << 3,
|
|
|
|
EM28XX_AOUT_SURR = 1 << 4,
|
2009-01-13 08:50:52 +08:00
|
|
|
|
|
|
|
/* PCM IN Mixer - used by AC97_RECORD_SELECT register */
|
|
|
|
EM28XX_AOUT_PCM_IN = 1 << 7,
|
|
|
|
|
|
|
|
/* Bits 10-8 are used to indicate the PCM IN record select */
|
|
|
|
EM28XX_AOUT_PCM_MIC_PCM = 0 << 8,
|
|
|
|
EM28XX_AOUT_PCM_CD = 1 << 8,
|
|
|
|
EM28XX_AOUT_PCM_VIDEO = 2 << 8,
|
|
|
|
EM28XX_AOUT_PCM_AUX = 3 << 8,
|
|
|
|
EM28XX_AOUT_PCM_LINE = 4 << 8,
|
|
|
|
EM28XX_AOUT_PCM_STEREO = 5 << 8,
|
|
|
|
EM28XX_AOUT_PCM_MONO = 6 << 8,
|
|
|
|
EM28XX_AOUT_PCM_PHONE = 7 << 8,
|
2008-11-20 23:40:51 +08:00
|
|
|
};
|
|
|
|
|
2009-01-17 22:21:02 +08:00
|
|
|
static inline int ac97_return_record_select(int a_out)
|
2009-01-13 08:50:52 +08:00
|
|
|
{
|
|
|
|
return (a_out & 0x700) >> 8;
|
|
|
|
}
|
|
|
|
|
2008-11-27 18:42:26 +08:00
|
|
|
struct em28xx_reg_seq {
|
|
|
|
int reg;
|
|
|
|
unsigned char val, mask;
|
|
|
|
int sleep;
|
|
|
|
};
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
struct em28xx_input {
|
|
|
|
enum enum28xx_itype type;
|
2005-11-09 13:37:07 +08:00
|
|
|
unsigned int vmux;
|
2008-01-05 20:53:54 +08:00
|
|
|
enum em28xx_amux amux;
|
2008-11-20 23:40:51 +08:00
|
|
|
enum em28xx_aout aout;
|
2008-11-27 18:42:26 +08:00
|
|
|
struct em28xx_reg_seq *gpio;
|
2005-11-09 13:37:07 +08:00
|
|
|
};
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
#define INPUT(nr) (&em28xx_boards[dev->model].input[nr])
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
enum em28xx_decoder {
|
2009-07-12 22:04:15 +08:00
|
|
|
EM28XX_NODECODER = 0,
|
2005-11-09 13:38:27 +08:00
|
|
|
EM28XX_TVP5150,
|
2008-11-25 20:43:29 +08:00
|
|
|
EM28XX_SAA711X,
|
2009-07-12 22:04:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
enum em28xx_sensor {
|
|
|
|
EM28XX_NOSENSOR = 0,
|
2009-06-29 22:35:05 +08:00
|
|
|
EM28XX_MT9V011,
|
2009-07-15 08:08:22 +08:00
|
|
|
EM28XX_MT9M001,
|
2009-08-13 07:21:44 +08:00
|
|
|
EM28XX_MT9M111,
|
2005-11-09 13:37:07 +08:00
|
|
|
};
|
|
|
|
|
V4L/DVB (10654): em28xx: VideoMate For You USB TV box requires tvaudio
As reported by Vitaly Wool <vital@embeddedalley.com>:
> about half a year ago I posted the patch that basically enabled Compro
> VideoMate For You USB TV box support.
> The main problem is I couldn't get the sound working.
> So I kind of decomposed the box and found out the audio decoder chip
> used there was Philips TDA9874A. As far as I can see, it's not supported
> within the em28xx suite although it is for other TV tuner drivers.
A tvaudio modprobing confirms that tda9874a chip is accessible via i2c:
tvaudio: TV audio decoder + audio/video mux driver
tvaudio: known chips: tda9840, tda9873h, tda9874h/a, tda9850, tda9855, tea6300, tea6320, tea6420, tda8425, pic16c54 (PV951), ta8874z
tvaudio' 1-0058: chip found @ 0xb0
tvaudio' 1-0058: tvaudio': chip_read2: reg254=0x11
tvaudio' 1-0058: tvaudio': chip_read2: reg255=0x2
tvaudio' 1-0058: tda9874a_checkit(): DIC=0x11, SIC=0x2.
tvaudio' 1-0058: found tda9874a.
tvaudio' 1-0058: tda9874h/a found @ 0xb0 (em28xx #0)
tvaudio' 1-0058: tda9874h/a: chip_write: reg0=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg1=0xc0
tvaudio' 1-0058: tda9874h/a: chip_write: reg2=0x2
tvaudio' 1-0058: tda9874h/a: chip_write: reg11=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg12=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg13=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg14=0x1
tvaudio' 1-0058: tda9874h/a: chip_write: reg15=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg16=0x14
tvaudio' 1-0058: tda9874h/a: chip_write: reg17=0x50
tvaudio' 1-0058: tda9874h/a: chip_write: reg18=0xf9
tvaudio' 1-0058: tda9874h/a: chip_write: reg19=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg20=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg24=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg255=0x0
tvaudio' 1-0058: tda9874a_setup(): A2, B/G [0x00].
tvaudio' 1-0058: tda9874h/a: thread started]
This patch automatically loads tvaudio when needed (currently, only
with this board).
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-25 20:06:13 +08:00
|
|
|
enum em28xx_adecoder {
|
|
|
|
EM28XX_NOADECODER = 0,
|
|
|
|
EM28XX_TVAUDIO,
|
|
|
|
};
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
struct em28xx_board {
|
2005-11-09 13:37:07 +08:00
|
|
|
char *name;
|
2008-11-25 20:39:50 +08:00
|
|
|
int vchannels;
|
2005-11-09 13:37:07 +08:00
|
|
|
int tuner_type;
|
2008-11-16 19:05:06 +08:00
|
|
|
int tuner_addr;
|
2005-11-09 13:37:07 +08:00
|
|
|
|
|
|
|
/* i2c flags */
|
|
|
|
unsigned int tda9887_conf;
|
|
|
|
|
2008-11-27 20:21:55 +08:00
|
|
|
/* GPIO sequences */
|
2008-11-27 18:42:26 +08:00
|
|
|
struct em28xx_reg_seq *dvb_gpio;
|
2008-11-27 20:10:40 +08:00
|
|
|
struct em28xx_reg_seq *suspend_gpio;
|
2008-11-27 20:21:55 +08:00
|
|
|
struct em28xx_reg_seq *tuner_gpio;
|
2009-03-04 19:27:52 +08:00
|
|
|
struct em28xx_reg_seq *mute_gpio;
|
2008-11-27 18:42:26 +08:00
|
|
|
|
2008-01-05 20:54:58 +08:00
|
|
|
unsigned int is_em2800:1;
|
2005-11-09 13:37:07 +08:00
|
|
|
unsigned int has_msp34xx:1;
|
2007-11-22 23:08:53 +08:00
|
|
|
unsigned int mts_firmware:1;
|
2008-01-14 02:42:17 +08:00
|
|
|
unsigned int max_range_640_480:1;
|
2008-04-18 08:36:41 +08:00
|
|
|
unsigned int has_dvb:1;
|
2008-06-28 19:57:06 +08:00
|
|
|
unsigned int has_snapshot_button:1;
|
2009-07-12 21:23:23 +08:00
|
|
|
unsigned int is_webcam:1;
|
2008-07-28 01:03:32 +08:00
|
|
|
unsigned int valid:1;
|
2009-09-09 01:04:41 +08:00
|
|
|
unsigned int has_ir_i2c:1;
|
2008-01-06 04:01:41 +08:00
|
|
|
|
2008-11-25 18:05:06 +08:00
|
|
|
unsigned char xclk, i2c_speed;
|
2009-04-01 04:10:58 +08:00
|
|
|
unsigned char radio_addr;
|
|
|
|
unsigned short tvaudio_addr;
|
2008-11-25 18:05:06 +08:00
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
enum em28xx_decoder decoder;
|
V4L/DVB (10654): em28xx: VideoMate For You USB TV box requires tvaudio
As reported by Vitaly Wool <vital@embeddedalley.com>:
> about half a year ago I posted the patch that basically enabled Compro
> VideoMate For You USB TV box support.
> The main problem is I couldn't get the sound working.
> So I kind of decomposed the box and found out the audio decoder chip
> used there was Philips TDA9874A. As far as I can see, it's not supported
> within the em28xx suite although it is for other TV tuner drivers.
A tvaudio modprobing confirms that tda9874a chip is accessible via i2c:
tvaudio: TV audio decoder + audio/video mux driver
tvaudio: known chips: tda9840, tda9873h, tda9874h/a, tda9850, tda9855, tea6300, tea6320, tea6420, tda8425, pic16c54 (PV951), ta8874z
tvaudio' 1-0058: chip found @ 0xb0
tvaudio' 1-0058: tvaudio': chip_read2: reg254=0x11
tvaudio' 1-0058: tvaudio': chip_read2: reg255=0x2
tvaudio' 1-0058: tda9874a_checkit(): DIC=0x11, SIC=0x2.
tvaudio' 1-0058: found tda9874a.
tvaudio' 1-0058: tda9874h/a found @ 0xb0 (em28xx #0)
tvaudio' 1-0058: tda9874h/a: chip_write: reg0=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg1=0xc0
tvaudio' 1-0058: tda9874h/a: chip_write: reg2=0x2
tvaudio' 1-0058: tda9874h/a: chip_write: reg11=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg12=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg13=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg14=0x1
tvaudio' 1-0058: tda9874h/a: chip_write: reg15=0x0
tvaudio' 1-0058: tda9874h/a: chip_write: reg16=0x14
tvaudio' 1-0058: tda9874h/a: chip_write: reg17=0x50
tvaudio' 1-0058: tda9874h/a: chip_write: reg18=0xf9
tvaudio' 1-0058: tda9874h/a: chip_write: reg19=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg20=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg24=0x80
tvaudio' 1-0058: tda9874h/a: chip_write: reg255=0x0
tvaudio' 1-0058: tda9874a_setup(): A2, B/G [0x00].
tvaudio' 1-0058: tda9874h/a: thread started]
This patch automatically loads tvaudio when needed (currently, only
with this board).
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-02-25 20:06:13 +08:00
|
|
|
enum em28xx_adecoder adecoder;
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
struct em28xx_input input[MAX_EM28XX_INPUT];
|
2008-01-06 04:22:01 +08:00
|
|
|
struct em28xx_input radio;
|
2010-04-03 07:01:00 +08:00
|
|
|
char *ir_codes;
|
2005-11-09 13:37:07 +08:00
|
|
|
};
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
struct em28xx_eeprom {
|
2005-11-09 13:37:07 +08:00
|
|
|
u32 id; /* 0x9567eb1a */
|
|
|
|
u16 vendor_ID;
|
|
|
|
u16 product_ID;
|
|
|
|
|
|
|
|
u16 chip_conf;
|
|
|
|
|
|
|
|
u16 board_conf;
|
|
|
|
|
|
|
|
u16 string1, string2, string3;
|
|
|
|
|
|
|
|
u8 string_idx_table;
|
|
|
|
};
|
|
|
|
|
2008-01-05 20:57:31 +08:00
|
|
|
#define EM28XX_AUDIO_BUFS 5
|
|
|
|
#define EM28XX_NUM_AUDIO_PACKETS 64
|
|
|
|
#define EM28XX_AUDIO_MAX_PACKET_SIZE 196 /* static value */
|
|
|
|
#define EM28XX_CAPTURE_STREAM_EN 1
|
2008-04-18 08:36:41 +08:00
|
|
|
|
|
|
|
/* em28xx extensions */
|
2008-01-05 20:57:31 +08:00
|
|
|
#define EM28XX_AUDIO 0x10
|
2008-04-18 08:36:41 +08:00
|
|
|
#define EM28XX_DVB 0x20
|
2012-03-26 20:13:35 +08:00
|
|
|
#define EM28XX_RC 0x30
|
2008-01-05 20:57:31 +08:00
|
|
|
|
2009-09-03 11:23:27 +08:00
|
|
|
/* em28xx resource types (used for res_get/res_lock etc */
|
|
|
|
#define EM28XX_RESOURCE_VIDEO 0x01
|
|
|
|
#define EM28XX_RESOURCE_VBI 0x02
|
|
|
|
|
2008-01-05 20:57:31 +08:00
|
|
|
struct em28xx_audio {
|
|
|
|
char name[50];
|
|
|
|
char *transfer_buffer[EM28XX_AUDIO_BUFS];
|
|
|
|
struct urb *urb[EM28XX_AUDIO_BUFS];
|
|
|
|
struct usb_device *udev;
|
|
|
|
unsigned int capture_transfer_done;
|
|
|
|
struct snd_pcm_substream *capture_pcm_substream;
|
|
|
|
|
|
|
|
unsigned int hwptr_done_capture;
|
|
|
|
struct snd_card *sndcard;
|
|
|
|
|
2009-02-09 00:10:39 +08:00
|
|
|
int users;
|
2008-01-05 20:57:31 +08:00
|
|
|
spinlock_t slock;
|
|
|
|
};
|
|
|
|
|
2008-04-18 08:38:38 +08:00
|
|
|
struct em28xx;
|
|
|
|
|
|
|
|
struct em28xx_fh {
|
2012-09-07 16:52:40 +08:00
|
|
|
struct v4l2_fh fh;
|
2008-04-18 08:38:38 +08:00
|
|
|
struct em28xx *dev;
|
|
|
|
|
|
|
|
enum v4l2_buf_type type;
|
|
|
|
};
|
|
|
|
|
2005-11-09 13:37:07 +08:00
|
|
|
/* main device struct */
|
2005-11-09 13:38:27 +08:00
|
|
|
struct em28xx {
|
2005-11-09 13:37:07 +08:00
|
|
|
/* generic device properties */
|
|
|
|
char name[30]; /* name (including minor) of the device */
|
|
|
|
int model; /* index in the device_data struct */
|
2006-01-24 03:11:08 +08:00
|
|
|
int devno; /* marks the number of this device */
|
2008-11-12 13:05:02 +08:00
|
|
|
enum em28xx_chip_id chip_id;
|
2008-11-25 20:39:50 +08:00
|
|
|
|
2012-12-28 06:02:43 +08:00
|
|
|
unsigned char disconnected:1; /* device has been diconnected */
|
|
|
|
|
2011-06-18 02:15:12 +08:00
|
|
|
int audio_ifnum;
|
|
|
|
|
2009-04-01 04:10:58 +08:00
|
|
|
struct v4l2_device v4l2_dev;
|
2012-09-07 16:43:59 +08:00
|
|
|
struct v4l2_ctrl_handler ctrl_handler;
|
2008-11-25 20:39:50 +08:00
|
|
|
struct em28xx_board board;
|
|
|
|
|
2009-07-14 14:18:39 +08:00
|
|
|
/* Webcam specific fields */
|
2009-07-12 22:04:15 +08:00
|
|
|
enum em28xx_sensor em28xx_sensor;
|
2009-07-14 07:15:02 +08:00
|
|
|
int sensor_xres, sensor_yres;
|
2009-07-14 14:18:39 +08:00
|
|
|
int sensor_xtal;
|
2009-07-12 22:04:15 +08:00
|
|
|
|
2012-11-09 01:11:34 +08:00
|
|
|
/* Progressive (non-interlaced) mode */
|
2009-08-08 14:14:55 +08:00
|
|
|
int progressive;
|
|
|
|
|
2009-07-14 23:33:25 +08:00
|
|
|
/* Vinmode/Vinctl used at the driver */
|
|
|
|
int vinmode, vinctl;
|
|
|
|
|
2008-01-05 20:59:03 +08:00
|
|
|
unsigned int has_audio_class:1;
|
2008-11-12 13:05:19 +08:00
|
|
|
unsigned int has_alsa_audio:1;
|
2011-06-18 02:15:12 +08:00
|
|
|
unsigned int is_audio_only:1;
|
2008-11-25 18:05:06 +08:00
|
|
|
|
2010-10-10 02:53:58 +08:00
|
|
|
/* Controls audio streaming */
|
2013-02-12 01:01:20 +08:00
|
|
|
struct work_struct wq_trigger; /* Trigger to start/stop audio for alsa module */
|
|
|
|
atomic_t stream_started; /* stream should be running if true */
|
2010-10-10 02:53:58 +08:00
|
|
|
|
2008-12-20 20:06:37 +08:00
|
|
|
struct em28xx_fmt *format;
|
|
|
|
|
2008-11-12 19:41:29 +08:00
|
|
|
struct em28xx_IR *ir;
|
|
|
|
|
2008-04-18 08:42:14 +08:00
|
|
|
/* Some older em28xx chips needs a waiting time after writing */
|
|
|
|
unsigned int wait_after_write;
|
|
|
|
|
2008-01-05 20:54:58 +08:00
|
|
|
struct list_head devlist;
|
|
|
|
|
2006-01-10 01:25:37 +08:00
|
|
|
u32 i2s_speed; /* I2S speed for audio digital stream */
|
|
|
|
|
2008-11-19 23:01:33 +08:00
|
|
|
struct em28xx_audio_mode audio_mode;
|
2005-11-09 13:37:07 +08:00
|
|
|
|
|
|
|
int tuner_type; /* type of the tuner */
|
|
|
|
int tuner_addr; /* tuner address */
|
|
|
|
int tda9887_conf;
|
|
|
|
/* i2c i/o */
|
|
|
|
struct i2c_adapter i2c_adap;
|
|
|
|
struct i2c_client i2c_client;
|
|
|
|
/* video for linux */
|
|
|
|
int users; /* user count for exclusive use */
|
2013-01-05 03:16:24 +08:00
|
|
|
int streaming_users; /* Number of actively streaming users */
|
2005-11-09 13:37:07 +08:00
|
|
|
struct video_device *vdev; /* video for linux device struct */
|
2007-11-12 01:15:34 +08:00
|
|
|
v4l2_std_id norm; /* selected tv norm */
|
2005-11-09 13:37:07 +08:00
|
|
|
int ctl_freq; /* selected frequency */
|
|
|
|
unsigned int ctl_input; /* selected input */
|
2008-07-28 01:03:32 +08:00
|
|
|
unsigned int ctl_ainput;/* selected audio input */
|
2008-11-20 23:40:51 +08:00
|
|
|
unsigned int ctl_aoutput;/* selected audio output */
|
2005-11-09 13:37:07 +08:00
|
|
|
int mute;
|
|
|
|
int volume;
|
|
|
|
/* frame properties */
|
|
|
|
int width; /* current frame width */
|
|
|
|
int height; /* current frame height */
|
2008-09-04 14:33:43 +08:00
|
|
|
unsigned hscale; /* horizontal scale factor (see datasheet) */
|
|
|
|
unsigned vscale; /* vertical scale factor (see datasheet) */
|
2005-11-09 13:37:07 +08:00
|
|
|
int interlaced; /* 1=interlace fileds, 0=just top fileds */
|
2007-11-11 12:13:49 +08:00
|
|
|
unsigned int video_bytesread; /* Number of bytes read */
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2007-11-04 08:20:59 +08:00
|
|
|
unsigned long hash; /* eeprom hash - for boards with generic ID */
|
2008-04-18 08:41:10 +08:00
|
|
|
unsigned long i2c_hash; /* i2c devicelist hash -
|
|
|
|
for boards with generic ID */
|
2007-11-04 08:20:59 +08:00
|
|
|
|
2008-12-31 20:37:33 +08:00
|
|
|
struct em28xx_audio adev;
|
2008-01-05 20:57:31 +08:00
|
|
|
|
2012-11-25 17:37:37 +08:00
|
|
|
/* capture state tracking */
|
2009-09-01 12:19:46 +08:00
|
|
|
int capture_type;
|
2012-11-25 17:37:34 +08:00
|
|
|
unsigned char top_field:1;
|
2012-11-25 17:37:37 +08:00
|
|
|
int vbi_read;
|
2009-11-25 10:17:25 +08:00
|
|
|
unsigned int vbi_width;
|
|
|
|
unsigned int vbi_height; /* lines per field */
|
2009-09-01 12:19:46 +08:00
|
|
|
|
2008-01-05 20:59:03 +08:00
|
|
|
struct work_struct request_module_wk;
|
|
|
|
|
2005-11-09 13:37:07 +08:00
|
|
|
/* locks */
|
2007-11-04 08:22:38 +08:00
|
|
|
struct mutex lock;
|
2008-11-19 17:17:44 +08:00
|
|
|
struct mutex ctrl_urb_lock; /* protects urb_buf */
|
2008-04-14 01:38:47 +08:00
|
|
|
/* spinlock_t queue_lock; */
|
2005-11-09 13:37:07 +08:00
|
|
|
struct list_head inqueue, outqueue;
|
|
|
|
struct video_device *vbi_dev;
|
2008-01-06 04:22:01 +08:00
|
|
|
struct video_device *radio_dev;
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2013-01-05 03:16:24 +08:00
|
|
|
/* Videobuf2 */
|
|
|
|
struct vb2_queue vb_vidq;
|
|
|
|
struct vb2_queue vb_vbiq;
|
|
|
|
struct mutex vb_queue_lock;
|
|
|
|
struct mutex vb_vbi_queue_lock;
|
|
|
|
|
2009-09-03 11:23:27 +08:00
|
|
|
/* resources in use */
|
|
|
|
unsigned int resources;
|
|
|
|
|
2005-11-09 13:37:07 +08:00
|
|
|
unsigned char eedata[256];
|
|
|
|
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
/* Isoc control struct */
|
|
|
|
struct em28xx_dmaqueue vidq;
|
2009-09-01 12:54:54 +08:00
|
|
|
struct em28xx_dmaqueue vbiq;
|
2012-11-09 01:11:37 +08:00
|
|
|
struct em28xx_usb_ctl usb_ctl;
|
V4L/DVB (7540): em28xx: convert to use videobuf-vmalloc
The usage of videobuf-vmalloc allows to cleanup em28xx logic.
Also, it reduced its size by about 5.42% on i386 arch (and about 7.5% on x86_64):
39113 4876 40 44029 abfd old/em28xx.ko
36731 4868 40 41639 a2a7 /home/v4l/master/v4l/em28xx.ko
Also, the preliminary tests, made on a single core 1.5 MHz Centrino showed
that CPU usage reduced from 42%-75% to 28%-33% (reports from "top") command.
A test with time command presented an even better result:
This is the performance tests I did, running code_example to get 1,000 frames
@29.995 Hz (about 35 seconds of stream), tested on a i386 machine, running at
1,5GHz:
The old driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:34.21: 8.22s User time, 25.16s Kernel time, 97% CPU used
The videobuf-based driver:
$ time -f "%E: %Us User time, %Ss Kernel time, %P CPU used" ./capture_example
0:35.36: 0.01s User time, 0.05s Kernel time, 0% CPU used
Conclusion:
The time consumption to receive the stream where reduced from about 33.38
seconds to 0.05 seconds.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-04-14 01:37:52 +08:00
|
|
|
spinlock_t slock;
|
|
|
|
|
2013-01-05 03:16:24 +08:00
|
|
|
unsigned int field_count;
|
|
|
|
unsigned int vbi_field_count;
|
|
|
|
|
2005-11-09 13:37:07 +08:00
|
|
|
/* usb transfer */
|
|
|
|
struct usb_device *udev; /* the usb device */
|
[media] em28xx: improve USB endpoint logic, also use bulk transfers
The current enpoint logic ignores all bulk endpoints and uses
a fixed mapping between endpint addresses and the supported
data stream types (analog/audio/DVB):
Ep 0x82, isoc => analog
Ep 0x83, isoc => audio
Ep 0x84, isoc => DVB
Now that the code can also do bulk transfers, the endpoint
logic has to be extended to also consider bulk endpoints.
The new logic preserves backwards compatibility and reflects
the endpoint configurations we have seen so far:
Ep 0x82, isoc => analog
Ep 0x82, bulk => analog
Ep 0x83, isoc* => audio
Ep 0x84, isoc => digital
Ep 0x84, bulk => analog or digital**
(*: audio should always be isoc)
(**: analog, if ep 0x82 is isoc, otherwise digital)
[mchehab@redhat.com: Fix a CodingStyle issue: don't break strings
into separate lines]
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-11-09 01:11:52 +08:00
|
|
|
u8 analog_ep_isoc; /* address of isoc endpoint for analog */
|
|
|
|
u8 analog_ep_bulk; /* address of bulk endpoint for analog */
|
|
|
|
u8 dvb_ep_isoc; /* address of isoc endpoint for DVB */
|
2013-02-12 01:01:20 +08:00
|
|
|
u8 dvb_ep_bulk; /* address of bulk endpoint for DVB */
|
2012-11-09 01:11:49 +08:00
|
|
|
int alt; /* alternate setting */
|
|
|
|
int max_pkt_size; /* max packet size of the selected ep at alt */
|
[media] em28xx: improve USB endpoint logic, also use bulk transfers
The current enpoint logic ignores all bulk endpoints and uses
a fixed mapping between endpint addresses and the supported
data stream types (analog/audio/DVB):
Ep 0x82, isoc => analog
Ep 0x83, isoc => audio
Ep 0x84, isoc => DVB
Now that the code can also do bulk transfers, the endpoint
logic has to be extended to also consider bulk endpoints.
The new logic preserves backwards compatibility and reflects
the endpoint configurations we have seen so far:
Ep 0x82, isoc => analog
Ep 0x82, bulk => analog
Ep 0x83, isoc* => audio
Ep 0x84, isoc => digital
Ep 0x84, bulk => analog or digital**
(*: audio should always be isoc)
(**: analog, if ep 0x82 is isoc, otherwise digital)
[mchehab@redhat.com: Fix a CodingStyle issue: don't break strings
into separate lines]
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2012-11-09 01:11:52 +08:00
|
|
|
int packet_multiplier; /* multiplier for wMaxPacketSize, used for
|
|
|
|
URB buffer size definition */
|
2012-11-09 01:11:49 +08:00
|
|
|
int num_alt; /* number of alternative settings */
|
|
|
|
unsigned int *alt_max_pkt_size_isoc; /* array of isoc wMaxPacketSize */
|
2012-11-09 01:11:50 +08:00
|
|
|
unsigned int analog_xfer_bulk:1; /* use bulk instead of isoc
|
|
|
|
transfers for analog */
|
2012-11-09 01:11:49 +08:00
|
|
|
int dvb_alt_isoc; /* alternate setting for DVB isoc transfers */
|
|
|
|
unsigned int dvb_max_pkt_size_isoc; /* isoc max packet size of the
|
|
|
|
selected DVB ep at dvb_alt */
|
2012-11-09 01:11:50 +08:00
|
|
|
unsigned int dvb_xfer_bulk:1; /* use bulk instead of isoc
|
|
|
|
transfers for DVB */
|
2008-11-19 01:51:08 +08:00
|
|
|
char urb_buf[URB_MAX_CTRL_SIZE]; /* urb control msg buffer */
|
|
|
|
|
2005-11-09 13:37:07 +08:00
|
|
|
/* helper funcs that call usb_control_msg */
|
2008-04-18 08:41:10 +08:00
|
|
|
int (*em28xx_write_regs) (struct em28xx *dev, u16 reg,
|
2005-11-09 13:37:07 +08:00
|
|
|
char *buf, int len);
|
2008-04-18 08:41:10 +08:00
|
|
|
int (*em28xx_read_reg) (struct em28xx *dev, u16 reg);
|
|
|
|
int (*em28xx_read_reg_req_len) (struct em28xx *dev, u8 req, u16 reg,
|
|
|
|
char *buf, int len);
|
|
|
|
int (*em28xx_write_regs_req) (struct em28xx *dev, u8 req, u16 reg,
|
2005-11-09 13:37:07 +08:00
|
|
|
char *buf, int len);
|
2008-04-18 08:41:10 +08:00
|
|
|
int (*em28xx_read_reg_req) (struct em28xx *dev, u8 req, u16 reg);
|
2008-04-18 08:36:41 +08:00
|
|
|
|
|
|
|
enum em28xx_mode mode;
|
|
|
|
|
2008-11-12 13:05:06 +08:00
|
|
|
/* register numbers for GPO/GPIO registers */
|
|
|
|
u16 reg_gpo_num, reg_gpio_num;
|
|
|
|
|
2008-04-18 08:48:00 +08:00
|
|
|
/* Caches GPO and GPIO registers */
|
|
|
|
unsigned char reg_gpo, reg_gpio;
|
|
|
|
|
2008-06-28 19:57:06 +08:00
|
|
|
/* Snapshot button */
|
|
|
|
char snapshot_button_path[30]; /* path of the input dev */
|
|
|
|
struct input_dev *sbutton_input_dev;
|
|
|
|
struct delayed_work sbutton_query_work;
|
|
|
|
|
2008-04-18 08:40:36 +08:00
|
|
|
struct em28xx_dvb *dvb;
|
2005-11-09 13:37:07 +08:00
|
|
|
};
|
|
|
|
|
2008-01-05 20:57:31 +08:00
|
|
|
struct em28xx_ops {
|
|
|
|
struct list_head next;
|
|
|
|
char *name;
|
|
|
|
int id;
|
|
|
|
int (*init)(struct em28xx *);
|
|
|
|
int (*fini)(struct em28xx *);
|
2007-11-11 09:21:01 +08:00
|
|
|
};
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
/* Provided by em28xx-i2c.c */
|
2007-11-04 19:06:48 +08:00
|
|
|
void em28xx_do_i2c_scan(struct em28xx *dev);
|
2009-04-01 04:10:58 +08:00
|
|
|
int em28xx_i2c_register(struct em28xx *dev);
|
|
|
|
int em28xx_i2c_unregister(struct em28xx *dev);
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
/* Provided by em28xx-core.c */
|
|
|
|
int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
|
2005-11-09 13:37:07 +08:00
|
|
|
char *buf, int len);
|
2005-11-09 13:38:27 +08:00
|
|
|
int em28xx_read_reg_req(struct em28xx *dev, u8 req, u16 reg);
|
|
|
|
int em28xx_read_reg(struct em28xx *dev, u16 reg);
|
|
|
|
int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
|
2005-11-09 13:37:07 +08:00
|
|
|
int len);
|
2005-11-09 13:38:27 +08:00
|
|
|
int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
|
2008-11-20 20:52:20 +08:00
|
|
|
int em28xx_write_reg(struct em28xx *dev, u16 reg, u8 val);
|
2009-12-05 19:27:49 +08:00
|
|
|
int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
|
|
|
|
u8 bitmask);
|
2008-11-20 20:52:20 +08:00
|
|
|
|
2008-12-23 00:18:27 +08:00
|
|
|
int em28xx_read_ac97(struct em28xx *dev, u8 reg);
|
|
|
|
int em28xx_write_ac97(struct em28xx *dev, u8 reg, u16 val);
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
int em28xx_audio_analog_set(struct em28xx *dev);
|
2008-11-19 23:01:33 +08:00
|
|
|
int em28xx_audio_setup(struct em28xx *dev);
|
2008-01-05 20:53:54 +08:00
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
int em28xx_colorlevels_set_default(struct em28xx *dev);
|
|
|
|
int em28xx_capture_start(struct em28xx *dev, int start);
|
2009-09-01 12:19:46 +08:00
|
|
|
int em28xx_vbi_supported(struct em28xx *dev);
|
2008-12-20 20:06:37 +08:00
|
|
|
int em28xx_set_outfmt(struct em28xx *dev);
|
2005-11-09 13:38:27 +08:00
|
|
|
int em28xx_resolution_set(struct em28xx *dev);
|
|
|
|
int em28xx_set_alternate(struct em28xx *dev);
|
2012-11-09 01:11:41 +08:00
|
|
|
int em28xx_alloc_urbs(struct em28xx *dev, enum em28xx_mode mode, int xfer_bulk,
|
|
|
|
int num_bufs, int max_pkt_size, int packet_multiplier);
|
2012-11-09 01:11:42 +08:00
|
|
|
int em28xx_init_usb_xfer(struct em28xx *dev, enum em28xx_mode mode,
|
|
|
|
int xfer_bulk,
|
|
|
|
int num_bufs, int max_pkt_size, int packet_multiplier,
|
|
|
|
int (*urb_data_copy)
|
|
|
|
(struct em28xx *dev, struct urb *urb));
|
2012-11-09 01:11:40 +08:00
|
|
|
void em28xx_uninit_usb_xfer(struct em28xx *dev, enum em28xx_mode mode);
|
2012-03-22 19:48:17 +08:00
|
|
|
void em28xx_stop_urbs(struct em28xx *dev);
|
2008-04-18 08:48:00 +08:00
|
|
|
int em28xx_set_mode(struct em28xx *dev, enum em28xx_mode set_mode);
|
|
|
|
int em28xx_gpio_set(struct em28xx *dev, struct em28xx_reg_seq *gpio);
|
2008-12-29 09:18:14 +08:00
|
|
|
void em28xx_wake_i2c(struct em28xx *dev);
|
2008-01-05 20:57:31 +08:00
|
|
|
int em28xx_register_extension(struct em28xx_ops *dev);
|
|
|
|
void em28xx_unregister_extension(struct em28xx_ops *dev);
|
2008-12-29 09:18:14 +08:00
|
|
|
void em28xx_init_extension(struct em28xx *dev);
|
|
|
|
void em28xx_close_extension(struct em28xx *dev);
|
|
|
|
|
|
|
|
/* Provided by em28xx-video.c */
|
2013-01-05 03:16:24 +08:00
|
|
|
int em28xx_vb2_setup(struct em28xx *dev);
|
2008-12-29 09:18:14 +08:00
|
|
|
int em28xx_register_analog_devices(struct em28xx *dev);
|
|
|
|
void em28xx_release_analog_resources(struct em28xx *dev);
|
2012-09-07 16:43:59 +08:00
|
|
|
void em28xx_ctrl_notify(struct v4l2_ctrl *ctrl, void *priv);
|
2013-01-05 03:16:24 +08:00
|
|
|
int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count);
|
|
|
|
int em28xx_stop_vbi_streaming(struct vb2_queue *vq);
|
2012-09-07 16:43:59 +08:00
|
|
|
extern const struct v4l2_ctrl_ops em28xx_ctrl_ops;
|
2008-01-05 20:57:31 +08:00
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
/* Provided by em28xx-cards.c */
|
|
|
|
extern struct em28xx_board em28xx_boards[];
|
|
|
|
extern struct usb_device_id em28xx_id_table[];
|
2008-09-13 00:31:45 +08:00
|
|
|
int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
|
2008-12-29 09:18:14 +08:00
|
|
|
void em28xx_release_resources(struct em28xx *dev);
|
2008-01-14 02:42:17 +08:00
|
|
|
|
2009-09-01 12:54:54 +08:00
|
|
|
/* Provided by em28xx-vbi.c */
|
2013-01-05 03:16:24 +08:00
|
|
|
extern struct vb2_ops em28xx_vbi_qops;
|
2009-09-01 12:54:54 +08:00
|
|
|
|
2005-11-09 13:37:07 +08:00
|
|
|
/* printk macros */
|
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
#define em28xx_err(fmt, arg...) do {\
|
2005-12-19 18:53:59 +08:00
|
|
|
printk(KERN_ERR fmt , ##arg); } while (0)
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
#define em28xx_errdev(fmt, arg...) do {\
|
2005-11-09 13:37:43 +08:00
|
|
|
printk(KERN_ERR "%s: "fmt,\
|
2005-12-19 18:53:59 +08:00
|
|
|
dev->name , ##arg); } while (0)
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2005-11-09 13:38:27 +08:00
|
|
|
#define em28xx_info(fmt, arg...) do {\
|
2005-11-09 13:37:43 +08:00
|
|
|
printk(KERN_INFO "%s: "fmt,\
|
2005-12-19 18:53:59 +08:00
|
|
|
dev->name , ##arg); } while (0)
|
2005-11-09 13:38:27 +08:00
|
|
|
#define em28xx_warn(fmt, arg...) do {\
|
2005-11-09 13:37:43 +08:00
|
|
|
printk(KERN_WARNING "%s: "fmt,\
|
2005-12-19 18:53:59 +08:00
|
|
|
dev->name , ##arg); } while (0)
|
2005-11-09 13:37:07 +08:00
|
|
|
|
2008-04-18 08:41:10 +08:00
|
|
|
static inline int em28xx_compression_disable(struct em28xx *dev)
|
2005-11-09 13:37:07 +08:00
|
|
|
{
|
|
|
|
/* side effect of disabling scaler and mixer */
|
V4L/DVB (9758): em28xx: replace some magic by register descriptions where known
Replaces all occurrences of em28xx_write_regs_req() and em28xx_write_reg()
used to setup register names by em28xx_write_reg().
Also, documents the register names that are known.
This patch were generated by this small perl script:
my %reg_map = (
# Register table - the same as defined on parse_em28xx.pl script
);
while (<>) {
if (m/(.*)em28xx_write_regs_req\(dev\,\s*0x00\,\s*(.*)\,\s*\"\\x(..)\",\s*1\)\;(.*)/) {
my $reg = $2;
my $val = $3;
$val =~ tr/A-f/a-f/;
$reg = $reg_map{$reg} if defined($reg_map{$reg});
printf "$1em28xx_write_reg(dev, %s, 0x%s);$4\n", $reg, $val;
} elsif (m/(.*)em28xx_write_regs\(dev\,\s*(.*)\,\s*\"\\x(..)\",\s*1\)\;(.*)/) {
my $reg = $2;
my $val = $3;
$val =~ tr/A-f/a-f/;
$reg = $reg_map{$reg} if defined($reg_map{$reg});
printf "$1em28xx_write_reg(dev, %s, 0x%s);$4\n", $reg, $val;
} else {
print $_;
}
}
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2008-11-27 03:28:42 +08:00
|
|
|
return em28xx_write_reg(dev, EM28XX_R26_COMPR, 0x00);
|
2005-11-09 13:37:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*FIXME: maxw should be dependent of alt mode */
|
2008-04-18 08:41:10 +08:00
|
|
|
static inline unsigned int norm_maxw(struct em28xx *dev)
|
2005-11-09 13:38:05 +08:00
|
|
|
{
|
2009-07-14 07:15:02 +08:00
|
|
|
if (dev->board.is_webcam)
|
|
|
|
return dev->sensor_xres;
|
|
|
|
|
2012-01-09 03:54:28 +08:00
|
|
|
if (dev->board.max_range_640_480)
|
2007-11-12 01:15:34 +08:00
|
|
|
return 640;
|
2009-07-14 07:15:02 +08:00
|
|
|
|
|
|
|
return 720;
|
2005-11-09 13:38:05 +08:00
|
|
|
}
|
|
|
|
|
2008-04-18 08:41:10 +08:00
|
|
|
static inline unsigned int norm_maxh(struct em28xx *dev)
|
2005-11-09 13:37:07 +08:00
|
|
|
{
|
2009-07-14 07:15:02 +08:00
|
|
|
if (dev->board.is_webcam)
|
|
|
|
return dev->sensor_yres;
|
|
|
|
|
2008-11-25 20:39:50 +08:00
|
|
|
if (dev->board.max_range_640_480)
|
2007-11-12 01:15:34 +08:00
|
|
|
return 480;
|
2009-07-14 07:15:02 +08:00
|
|
|
|
|
|
|
return (dev->norm & V4L2_STD_625_50) ? 576 : 480;
|
2005-11-09 13:37:07 +08:00
|
|
|
}
|
|
|
|
#endif
|