tv tuner module update.
Subsystems (2)
PATCH 1/1 tv tuner module update.
Did some code reorganization: splitted up the source into four files:
- tuner-core.c for all the interfacing stuff (register driver, handle insmod options, react on v4l ioctls, ...),
- tuner-simple.c for all those trivial 4-byte-command-sequence tuner chips.
- mt20xx.c for the mt2032 and mt2050 tuners.
- tda8290.c for the tda8290/8272 combo (this code is new).
I also did a number of cleanups like using dev_printk() for the messages everythere. There should be no functional changes beside the new support for the tda8290 tuner.
include/media/tuner.h +73 -4
@@ -29,55 +29,70 @@#define TUNER_PHILIPS_PAL_I 1#define TUNER_PHILIPS_NTSC 2#define TUNER_PHILIPS_SECAM 3/* you must actively select B/G, L, L` */ +#define TUNER_ABSENT 4#define TUNER_PHILIPS_PAL 5#define TUNER_TEMIC_NTSC 6/* 4032 FY5 (3X 7004, 9498, 9789) */ #define TUNER_TEMIC_PAL_I 7/* 4062 FY5 (3X 8501, 9957) */ +#define TUNER_TEMIC_4036FY5_NTSC 8/* 4036 FY5 (3X 1223, 1981, 7686) */ #define TUNER_ALPS_TSBH1_NTSC 9#define TUNER_ALPS_TSBE1_PAL 10#define TUNER_ALPS_TSBB5_PAL_I 11 +#define TUNER_ALPS_TSBE5_PAL 12#define TUNER_ALPS_TSBC5_PAL 13#define TUNER_TEMIC_4006FH5_PAL 14/* 4006 FH5 (3X 9500, 9501, 7291) */ #define TUNER_ALPS_TSHC6_NTSC 15 +#define TUNER_TEMIC_PAL_DK 16/* 4016 FY5 (3X 1392, 1393) */ #define TUNER_PHILIPS_NTSC_M 17#define TUNER_TEMIC_4066FY5_PAL_I 18/* 4066 FY5 (3X 7032, 7035) */ #define TUNER_TEMIC_4006FN5_MULTI_PAL 19/* B/G, I and D/K autodetected (3X 7595, 7606, 7657)*/ +#define TUNER_TEMIC_4009FR5_PAL 20/* incl. FM radio (3X 7607, 7488, 7711)*/ #define TUNER_TEMIC_4039FR5_NTSC 21/* incl. FM radio (3X 7246, 7578, 7732)*/ #define TUNER_TEMIC_4046FM5 22/* you must actively select B/G, D/K, I, L, L` ! (3X 7804, 7806, 8103, 8104)*/ #define TUNER_PHILIPS_PAL_DK 23 +#define TUNER_PHILIPS_FQ1216ME 24/* you must actively select B/G/D/K, I, L, L` */ #define TUNER_LG_PAL_I_FM 25#define TUNER_LG_PAL_I 26#define TUNER_LG_NTSC_FM 27 +#define TUNER_LG_PAL_FM 28#define TUNER_LG_PAL 29#define TUNER_TEMIC_4009FN5_MULTI_PAL_FM 30/* B/G, I and D/K autodetected (3X 8155, 8160, 8163)*/ #define TUNER_SHARP_2U5JF5540_NTSC 31 +#define TUNER_Samsung_PAL_TCPM9091PD27 32#define TUNER_MT2032 33#define TUNER_TEMIC_4106FH5 34/* 4106 FH5 (3X 7808, 7865)*/ #define TUNER_TEMIC_4012FY5 35/* 4012 FY5 (3X 0971, 1099)*/ +#define TUNER_TEMIC_4136FY5 36/* 4136 FY5 (3X 7708, 7746)*/ #define TUNER_LG_PAL_NEW_TAPC 37#define TUNER_PHILIPS_FM1216ME_MK3 38#define TUNER_LG_NTSC_NEW_TAPC 39 +#define TUNER_HITACHI_NTSC 40#define TUNER_PHILIPS_PAL_MK 41#define TUNER_PHILIPS_ATSC 42#define TUNER_PHILIPS_FM1236_MK3 43 +#define TUNER_PHILIPS_4IN1 44/* ATI TV Wonder Pro - Conexant */ /* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */ #define TUNER_MICROTUNE_4049FM5 45#define TUNER_LG_NTSC_TAPE 47 +#define TUNER_TNF_8831BGFF 48#define TUNER_MICROTUNE_4042FI5 49/* FusionHDTV 3 Gold - 4042 FI5 (3X 8147) */ #define TUNER_TCL_2002N 50#define TUNER_PHILIPS_FM1256_IH3 51 +#define TUNER_THOMSON_DTT7610 52 +#define TUNER_PHILIPS_FQ1286 53 +#define TUNER_PHILIPS_TDA8290 54#define NOTUNER 0#define PAL 1/* PAL_BG */
@@ -102,10 +117,6 @@#define TUNER_SET_TYPE _IOW('t',1,int)/* set tuner type */ #define TUNER_SET_TVFREQ _IOW('t',2,int)/* set tv freq */ -#if 0 /* obsolete */ -# define TUNER_SET_RADIOFREQ _IOW('t',3,int)/* set radio freq */ -# define TUNER_SET_MODE _IOW('t',4,int)/* set tuner mode */ -#endif #define TDA9887_SET_CONFIG _IOW('t',5,int)/* tv card specific */
@@ -123,4 +134,62 @@# define TDA9887_DEEMPHASIS_75 (3<<16)# define TDA9887_AUTOMUTE (1<<18) +#ifdef __KERNEL__ + +#define I2C_ADDR_TDA8290 0x4b +#define I2C_ADDR_TDA8275 0x61 + +struct tuner { +/* device */ +struct i2c_client i2c; + +/* state + config */ +unsigned int initialized; +unsigned int type;/* chip type */ +unsigned int freq;/* keep track of the current settings */ +v4l2_std_id std; +int using_v4l2; + +enum v4l2_tuner_type mode; +unsigned int input; + +/* used by MT2032 */ +unsigned int xogc; +unsigned int radio_if2; + +/* used by tda8290 */ +unsigned char i2c_easy_mode[2 ]; +unsigned char i2c_set_freq[8 ]; + +/* function ptrs */ +void (*tv_freq)(struct i2c_client *c,unsigned int freq); +void (*radio_freq)(struct i2c_client *c,unsigned int freq); +int (*has_signal)(struct i2c_client *c); +int (*is_stereo)(struct i2c_client *c); +}; + +extern unsigned int tuner_debug; +extern unsigned const int tuner_count; + +extern int microtune_init (struct i2c_client *c); +extern int tda8290_init (struct i2c_client *c); +extern int default_tuner_init (struct i2c_client *c); + +#define tuner_warn(fmt, arg...) \ + dev_printk(KERN_WARNING , &t->i2c.dev , fmt , ## arg) +#define tuner_info(fmt, arg...) \ + dev_printk(KERN_INFO , &t->i2c.dev , fmt , ## arg) +#define tuner_dbg(fmt, arg...) \ + if (tuner_debug) dev_printk(KERN_DEBUG , &t->i2c.dev , fmt , ## arg) + +#endif /* __KERNEL__ */ +#endif + +/* +* Overrides for Emacs so that we follow Linus's tabbing style. +* --------------------------------------------------------------------------- +* Local variables: +* c-basic-offset: 8 +* End: +*/
drivers/media/video/tuner-core.c new file +443 -0
443 lines not on this page · raw message
drivers/media/video/tuner-simple.c new file +467 -0
467 lines not on this page · raw message
drivers/media/video/mt20xx.c new file +557 -0
557 lines not on this page · raw message
drivers/media/video/tda8290.c new file +224 -0
224 lines not on this page · raw message
drivers/media/video/tda9887.c +1 -1
@@ -557,7 +557,7 @@ static int tda9887_configure(struct tda9#if 0 /* This as-is breaks some cards, must be fixed in a * card-specific way, probably using TDA9887_SET_CONFIG to -* turn on/off port2 */ +* turn on/off port2 */ if (t->std &V4L2_STD_SECAM_L ) {/* secam fixup (FIXME: move this to tvnorms array?) */ buf[1 ] &= ~cOutputPort2Inactive;
drivers/media/video/Makefile +1 -0
@@ -7,6 +7,7 @@ bttv-objs := bttv-driver.o bttv-cards.o zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o zr36067-objs := zoran_procfs.o zoran_device.o \ zoran_driver.o zoran_card.o +tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o
drivers/media/video/tuner.c deleted +0 -1425
1,152 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
#define printk(args...) fprintf(stderr, ## args)
Part of the diff is not shown here. View the raw message.