Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95b86a9a authored by Douglas Schilling Landgraf's avatar Douglas Schilling Landgraf Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8539): em28xx-cards: New supported IDs for analog models 



- New supported IDs for analog models
  (Based on Markus Rechberger <mrechberger@gmail.com> version of em28xx driver)

- Validation field for new em28xx boards.

Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@gmail.com>
[mchehab@infradead.org: Need to fix some merge conflicts]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 59d07f1b

Documentation/video4linux/CARDLIST.em28xx

+39 −2
Original line number Diff line number Diff line 
  0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]

  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2750,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]

  1 -> Unknown EM2750/28xx video grabber        (em2820/em2840) [eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883]

  2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]

  3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]

  4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200,2040:4201]

  5 -> MSI VOX USB 2.0                          (em2820/em2840)

  6 -> Terratec Cinergy 200 USB                 (em2800)

  7 -> Leadtek Winfast USB II                   (em2800)

  7 -> Leadtek Winfast USB II                   (em2800)        [0413:6023]

  8 -> Kworld USB2800                           (em2800)

  9 -> Pinnacle Dazzle DVC 90/DVC 100           (em2820/em2840) [2304:0207,2304:021a]

 10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]
@@ -20,3 +20,40 @@ 
 19 -> PointNix Intra-Oral Camera               (em2860)

 20 -> AMD ATI TV Wonder HD 600                 (em2880)        [0438:b002]

 21 -> eMPIA Technology, Inc. GrabBeeX+ Video Encoder (em2800)        [eb1a:2801]

 22 -> Unknown EM2750/EM2751 webcam grabber     (em2750)        [eb1a:2750,eb1a:2751]

 23 -> Huaqi DLCW-130                           (em2750)

 24 -> D-Link DUB-T210 TV Tuner                 (em2820/em2840) [2001:f112]

 25 -> Gadmei UTV310                            (em2820/em2840)

 26 -> Hercules Smart TV USB 2.0                (em2820/em2840)

 27 -> Pinnacle PCTV USB 2 (Philips FM1216ME)   (em2820/em2840)

 28 -> Leadtek Winfast USB II Deluxe            (em2820/em2840)

 29 -> Pinnacle Dazzle DVC 100                  (em2820/em2840)

 30 -> Videology 20K14XUSB USB2.0               (em2820/em2840)

 31 -> Usbgear VD204v9                          (em2821)

 32 -> Supercomp USB 2.0 TV                     (em2821)

 33 -> SIIG AVTuner-PVR/Prolink PlayTV USB 2.0  (em2821)

 34 -> Terratec Cinergy A Hybrid XS             (em2860)        [0ccd:004f]

 35 -> Typhoon DVD Maker                        (em2860)

 36 -> NetGMBH Cam                              (em2860)

 37 -> Gadmei UTV330                            (em2860)

 38 -> Yakumo MovieMixer                        (em2861)

 39 -> KWorld PVRTV 300U                        (em2861)        [eb1a:e300]

 40 -> Plextor ConvertX PX-TV100U               (em2861)        [093b:a005]

 41 -> Kworld 350 U DVB-T                       (em2870)        [eb1a:e350]

 42 -> Kworld 355 U DVB-T                       (em2870)        [eb1a:e355,eb1a:e357]

 43 -> Terratec Cinergy T XS                    (em2870)        [0ccd:0043]

 44 -> Terratec Cinergy T XS (MT2060)           (em2870)

 45 -> Pinnacle PCTV DVB-T                      (em2870)

 46 -> Compro, VideoMate U3                     (em2870)        [185b:2870]

 47 -> KWorld DVB-T 305U                        (em2880)        [eb1a:e305]

 48 -> KWorld DVB-T 310U                        (em2880)

 49 -> MSI DigiVox A/D                          (em2880)        [eb1a:e310]

 50 -> MSI DigiVox A/D II                       (em2880)        [eb1a:e320]

 51 -> Terratec Hybrid XS Secam                 (em2880)        [0ccd:004c]

 52 -> DNT DA2 Hybrid                           (em2881)

 53 -> Pinnacle Hybrid Pro                      (em2881)

 54 -> Kworld VS-DVB-T 323UR                    (em2882)        [eb1a:e323]

 55 -> Terratec Hybrid XS (em2882)              (em2882)        [0ccd:005e]

 56 -> Pinnacle Hybrid Pro (2)                  (em2882)        [2304:0226]

 57 -> Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]

 58 -> Hauppauge WinTV HVR 950                  (em2883)

drivers/media/video/em28xx/em28xx-cards.c

+1047 −173

File changed.

Preview size limit exceeded, changes collapsed.

drivers/media/video/em28xx/em28xx.h

+44 −1
Original line number Diff line number Diff line
@@ -60,11 +60,52 @@ 
#define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA  19

#define EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600   20

#define EM2800_BOARD_GRABBEEX_USB2800           21

#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

#define EM2820_BOARD_PINNACLE_DVC_100		  29

#define EM2820_BOARD_VIDEOLOGY_20K14XUSB	  30

#define EM2821_BOARD_USBGEAR_VD204		  31

#define EM2821_BOARD_SUPERCOMP_USB_2		  32

#define EM2821_BOARD_PROLINK_PLAYTV_USB2	  33

#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

#define EM2882_BOARD_PINNACLE_HYBRID_PRO	  56

#define EM2883_BOARD_KWORLD_HYBRID_A316		  57

#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950	  58



/* Limits minimum and default number of buffers */

#define EM28XX_MIN_BUF 4

#define EM28XX_DEF_BUF 8



/* Params for validated field */

#define EM28XX_BOARD_NOT_VALIDATED 1

#define EM28XX_BOARD_VALIDATED	   0



/* maximum number of em28xx boards */

#define EM28XX_MAXBOARDS 4 /*FIXME: should be bigger */
@@ -253,6 +294,7 @@ struct em28xx_board { 
	unsigned int max_range_640_480:1;

	unsigned int has_dvb:1;

	unsigned int has_snapshot_button:1;

	unsigned int valid:1;



	enum em28xx_decoder decoder;
@@ -333,6 +375,7 @@ struct em28xx { 
	unsigned int max_range_640_480:1;

	unsigned int has_dvb:1;

	unsigned int has_snapshot_button:1;

	unsigned int valid:1;		/* report for validated boards */



	/* Some older em28xx chips needs a waiting time after writing */

	unsigned int wait_after_write;
@@ -362,7 +405,7 @@ struct em28xx { 
	v4l2_std_id norm;	/* selected tv norm */

	int ctl_freq;		/* selected frequency */

	unsigned int ctl_input;	/* selected input */

	unsigned int ctl_ainput;	/* slected audio input */

	unsigned int ctl_ainput;/* selected audio input */

	int mute;

	int volume;

	/* frame properties */