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

Commit 1c94aeec authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] v4l: normalize whitespace and comments in tuner lists 



- normalize whitespace and comments in tuner lists

Signed-off-by: default avatarPhilip Rowlands <phr@doc.ic.ac.uk>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 10c35cf8

drivers/media/video/tuner-simple.c

+20 −23
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ struct tunertype 
 *	"no float in kernel" rule.

 */

static struct tunertype tuners[] = {

	/* 0-9 */

        { "Temic PAL (4002 FH5)", TEMIC, PAL,

	  16*140.25,16*463.25,0x02,0x04,0x01,0x8e,623},

	{ "Philips PAL_I (FI1246 and compatibles)", Philips, PAL_I,
@@ -109,7 +110,6 @@ static struct tunertype tuners[] = { 
	  16*157.25,16*451.25,0xA0,0x90,0x30,0x8e,732},

	{ "Philips (SECAM+PAL_BG) (FI1216MF, FM1216MF, FR1216MF)", Philips, SECAM,

	  16*168.25,16*447.25,0xA7,0x97,0x37,0x8e,623},



	{ "NoTuner", NoTuner, NOTUNER,

	  0,0,0x00,0x00,0x00,0x00,0x00},

	{ "Philips PAL_BG (FI1216 and compatibles)", Philips, PAL,
@@ -118,16 +118,16 @@ static struct tunertype tuners[] = { 
	  16*157.25,16*463.25,0x02,0x04,0x01,0x8e,732},

	{ "Temic PAL_I (4062 FY5)", TEMIC, PAL_I,

	  16*170.00,16*450.00,0x02,0x04,0x01,0x8e,623},



 	{ "Temic NTSC (4036 FY5)", TEMIC, NTSC,

	  16*157.25,16*463.25,0xa0,0x90,0x30,0x8e,732},

        { "Alps HSBH1", TEMIC, NTSC,

	  16*137.25,16*385.25,0x01,0x02,0x08,0x8e,732},



	/* 10-19 */

        { "Alps TSBE1", TEMIC, PAL,

	  16*137.25,16*385.25,0x01,0x02,0x08,0x8e,732},

        { "Alps TSBB5", Alps, PAL_I, /* tested (UK UHF) with Modulartech MM205 */

	  16*133.25,16*351.25,0x01,0x02,0x08,0x8e,632},



        { "Alps TSBE5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */

	  16*133.25,16*351.25,0x01,0x02,0x08,0x8e,622},

        { "Alps TSBC5", Alps, PAL, /* untested - data sheet guess. Only IF differs. */
@@ -136,7 +136,6 @@ static struct tunertype tuners[] = { 
	  16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},

  	{ "Alps TSCH6", Alps, NTSC,

  	  16*137.25,16*385.25,0x14,0x12,0x11,0x8e,732},



  	{ "Temic PAL_DK (4016 FY5)", TEMIC, PAL,

  	  16*168.25,16*456.25,0xa0,0x90,0x30,0x8e,623},

  	{ "Philips NTSC_M (MK2)", Philips, NTSC,
@@ -146,6 +145,7 @@ static struct tunertype tuners[] = { 
        { "Temic PAL* auto (4006 FN5)", TEMIC, PAL,

          16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},



	/* 20-29 */

        { "Temic PAL_BG (4009 FR5) or PAL_I (4069 FR5)", TEMIC, PAL,

          16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},

        { "Temic NTSC (4039 FR5)", TEMIC, NTSC,
@@ -154,7 +154,6 @@ static struct tunertype tuners[] = { 
          16*169.00, 16*454.00, 0xa0,0x90,0x30,0x8e,623},

        { "Philips PAL_DK (FI1256 and compatibles)", Philips, PAL,

	  16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},



	{ "Philips PAL/SECAM multi (FQ1216ME)", Philips, PAL,

	  16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},

	{ "LG PAL_I+FM (TAPC-I001D)", LGINNOTEK, PAL_I,
@@ -163,16 +162,16 @@ static struct tunertype tuners[] = { 
	  16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},

	{ "LG NTSC+FM (TPI8NSR01F)", LGINNOTEK, NTSC,

	  16*210.00,16*497.00,0xa0,0x90,0x30,0x8e,732},



	{ "LG PAL_BG+FM (TPI8PSB01D)", LGINNOTEK, PAL,

	  16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},

	{ "LG PAL_BG (TPI8PSB11D)", LGINNOTEK, PAL,

	  16*170.00,16*450.00,0xa0,0x90,0x30,0x8e,623},



	/* 30-39 */

	{ "Temic PAL* auto + FM (4009 FN5)", TEMIC, PAL,

	  16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},

	{ "SHARP NTSC_JP (2U5JF5540)", SHARP, NTSC, /* 940=16*58.75 NTSC@Japan */

	  16*137.25,16*317.25,0x01,0x02,0x08,0x8e,940 },



	{ "Samsung PAL TCPM9091PD27", Samsung, PAL, /* from sourceforge v3tv */

          16*169,16*464,0xA0,0x90,0x30,0x8e,623},

	{ "MT20xx universal", Microtune, PAL|NTSC,
@@ -181,7 +180,6 @@ static struct tunertype tuners[] = { 
          16*141.00, 16*464.00, 0xa0,0x90,0x30,0x8e,623},

	{ "Temic PAL_DK/SECAM_L (4012 FY5)", TEMIC, PAL,

          16*140.25, 16*463.25, 0x02,0x04,0x01,0x8e,623},



	{ "Temic NTSC (4136 FY5)", TEMIC, NTSC,

          16*158.00, 16*453.00, 0xa0,0x90,0x30,0x8e,732},

        { "LG PAL (newer TAPC series)", LGINNOTEK, PAL,
@@ -191,6 +189,7 @@ static struct tunertype tuners[] = { 
	{ "LG NTSC (newer TAPC series)", LGINNOTEK, NTSC,

          16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,732},



	/* 40-49 */

	{ "HITACHI V7-J180AT", HITACHI, NTSC,

	  16*170.00, 16*450.00, 0x01,0x02,0x08,0x8e,940 },

	{ "Philips PAL_MK (FI1216 MK)", Philips, PAL,
@@ -199,7 +198,6 @@ static struct tunertype tuners[] = { 
	  16*157.25,16*454.00,0xa0,0x90,0x30,0x8e,732},

        { "Philips NTSC MK3 (FM1236MK3 or FM1236/F)", Philips, NTSC,

          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},



        { "Philips 4 in 1 (ATI TV Wonder Pro/Conexant)", Philips, NTSC,

          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},

	{ "Microtune 4049 FM5", Microtune, PAL,
@@ -208,25 +206,24 @@ static struct tunertype tuners[] = { 
	  16*160.00,16*454.00,0x01,0x02,0x08,0xce,940},

        { "LG NTSC (TAPE series)", LGINNOTEK, NTSC,

          16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },



        { "Tenna TNF 8831 BGFF)", Philips, PAL,

          16*161.25,16*463.25,0xa0,0x90,0x30,0x8e,623},

	{ "Microtune 4042 FI5 ATSC/NTSC dual in", Microtune, NTSC,

	  16*162.00,16*457.00,0xa2,0x94,0x31,0x8e,732},



	/* 50-59 */

        { "TCL 2002N", TCL, NTSC,

          16*172.00,16*448.00,0x01,0x02,0x08,0x8e,732},

	{ "Philips PAL/SECAM_D (FM 1256 I-H3)", Philips, PAL,

	  16*160.00,16*442.00,0x01,0x02,0x04,0x8e,623 },



	{ "Thomson DDT 7610 (ATSC/NTSC)", THOMSON, ATSC,

	  16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},

	{ "Philips FQ1286", Philips, NTSC,

	  16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, // UHF band untested

	  16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, /* UHF band untested */

	{ "tda8290+75", Philips, PAL|NTSC,

	  /* see tda8290.c for details */ },

	{ "LG PAL (TAPE series)", LGINNOTEK, PAL,

          16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623},



	{ "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL,

	  16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },

	{ "Philips FQ1236A MK4", Philips, NTSC,
@@ -236,6 +233,7 @@ static struct tunertype tuners[] = { 
	{ "Ymec TVision TVF-5533MF", Philips, NTSC,

	  16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732},



	/* 60-66 */

	{ "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC,

	  16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},

	{ "Tena TNF9533-D/IF/TNF9533-B/DF", Philips, PAL,
@@ -244,7 +242,6 @@ static struct tunertype tuners[] = { 
          /* see tea5767.c for details */},

	{ "Philips FMD1216ME MK3 Hybrid Tuner", Philips, PAL,

	  16*160.00,16*442.00,0x51,0x52,0x54,0x86,623 },



	{ "LG TDVS-H062F/TUA6034", LGINNOTEK, NTSC,

	  16*160.00,16*455.00,0x01,0x02,0x04,0x8e,732},

	{ "Ymec TVF66T5-B/DFF", Philips, PAL,

include/media/tuner.h

+85 −85
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
#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_MICROTUNE_4042_FI5	46

#define TUNER_LG_NTSC_TAPE		47



#define TUNER_TNF_8831BGFF		48
@@ -98,17 +99,16 @@ 


#define TUNER_PHILIPS_FQ1216AME_MK4	56	/* Hauppauge PVR-150 PAL */

#define TUNER_PHILIPS_FQ1236A_MK4	57	/* Hauppauge PVR-500MCE NTSC */



#define TUNER_YMEC_TVF_8531MF		58

#define TUNER_YMEC_TVF_5533MF		59	/* Pixelview Pro Ultra NTSC */



#define TUNER_THOMSON_DTT7611		60	/* DViCO FusionHDTV 3 Gold-T */

#define TUNER_TENA_9533_DI		61



#define TUNER_TEA5767			62	/* Only FM Radio Tuner */

#define TUNER_PHILIPS_FMD1216ME_MK3	63



#define TUNER_LG_TDVS_H062F		64	/* DViCO FusionHDTV 5 */

#define TUNER_YMEC_TVF66T5_B_DFF	65	/* Acorp Y878F */



#define TUNER_LG_NTSC_TALN_MINI		66



#define NOTUNER 0
@@ -221,7 +221,7 @@ extern int tea5767_autodetection(struct i2c_client *c); 


#endif /* __KERNEL__ */



#endif

#endif /* _TUNER_H */



/*

 * Overrides for Emacs so that we follow Linus's tabbing style.