Corrects and incorrect assumption I made earlier about the idx 55 PVR-150 tuner, instead associating it with tuner type 38. Also includes a tveeprom patch to associate the idx 58 tuner on the low-profile NTSC PVR-150 with its proper tuner definition. There are a few other misc code cleanup bits in there as well. Patch is against a clean 0.3.2i.
-- Jarod Wilson [EMAIL PROTECTED]
diff -BurN ivtv-0.3.2i/driver/ivtv-driver.c ivtv-0.3.2i-palup/driver/ivtv-driver.c
--- ivtv-0.3.2i/driver/ivtv-driver.c 2005-03-09 07:36:33.000000000 -0800
+++ ivtv-0.3.2i-palup/driver/ivtv-driver.c 2005-03-10 15:50:38.000000000 -0800
@@ -179,6 +179,8 @@
"\t\t3 = AVerMedia M179\n"
"\t\t4 = YUAN MPG600/Kuroutoshikou iTVC16-STVLP\n"
"\t\t5 = YUAN MPG160/Kuroutoshikou iTVC15-STVLP\n"
+ "\t\t6 = WinTV PVR-150 or PVR-500\n"
+ "\t\t7 = YUAN PG600/DIAMONDMM PVR-550 (CX Falcon 2)\n"
"\t\tDefault: Autodetect" );
MODULE_PARM_DESC(ivtv_debug, "Debug level (bitmask). Default: errors only "
"(ivtv_debug = 255 gives full debugging)");
@@ -187,7 +189,7 @@
MODULE_AUTHOR("Kevin Thayer");
MODULE_DESCRIPTION("iTVC15_16 driver");
-MODULE_SUPPORTED_DEVICE("iTVC15_16 mpg2 encoder (aka WinTV PVR 250/350)");
+MODULE_SUPPORTED_DEVICE("iTVC15_16 mpg2 encoder (WinTV PVR-150/250/350/500, Yuan MPG series and similar)");
MODULE_LICENSE("GPL");
#if defined(LINUX26)
diff -BurN ivtv-0.3.2i/driver/ivtv-driver.h ivtv-0.3.2i-palup/driver/ivtv-driver.h
--- ivtv-0.3.2i/driver/ivtv-driver.h 2005-03-10 10:24:00.000000000 -0800
+++ ivtv-0.3.2i-palup/driver/ivtv-driver.h 2005-03-10 15:50:38.000000000 -0800
@@ -141,7 +141,7 @@
#define IVTV_CARD_MPG600 3 /* Kuroutoshikou ITVC16-STVLP/YUAN MPG600, encoder only */
#define IVTV_CARD_MPG160 4 /* Kuroutoshikou ITVC15-STVLP/YUAN MPG160
iTVC15 based, but does not have tv-out */
-#define IVTV_CARD_PVR_150 5 /* wintv pvr 250 */
+#define IVTV_CARD_PVR_150 5 /* wintv pvr 150 */
#define IVTV_CARD_PG600 6 /* YUAN PG600/DIAMONDMM PVR-550 based on the CX Falcon 2 */
#define NO_AUDIO 0 /* the card can't handle audio */
diff -BurN ivtv-0.3.2i/driver/tuner.c ivtv-0.3.2i-palup/driver/tuner.c
--- ivtv-0.3.2i/driver/tuner.c 2005-03-06 12:17:45.000000000 -0800
+++ ivtv-0.3.2i-palup/driver/tuner.c 2005-03-10 15:50:38.000000000 -0800
@@ -124,13 +124,14 @@
unsigned short thresh1; /* band switch VHF_LO <=> VHF_HI */
unsigned short thresh2; /* band switch VHF_HI <=> UHF */
- unsigned char VHF_L;
- unsigned char VHF_H;
- unsigned char UHF;
- unsigned char config;
- unsigned short IFPCoff; /* 622.4=16*38.90 MHz PAL,
- 732 =16*45.75 NTSCi,
- 940 =58.75 NTSC-Japan */
+ unsigned char VHF_L; /* band switch byte, low band */
+ unsigned char VHF_H; /* band switch byte, mid band */
+ unsigned char UHF; /* band switch byte, high band */
+ unsigned char config; /* config byte, aka control byte */
+ unsigned short IFPCoff; /* Intermediate Frequency Picture Carrier:
+ 622.4 = 16*38.90 MHz PAL,
+ 732 = 16*45.75 NTSCi,
+ 940 = 58.75 NTSC-Japan */
};
/*
@@ -249,12 +250,14 @@
/* see tda8290.c for details */ },
{ "Philips FQ1286", Philips, NTSC,
16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940},
- { "LG PAL (TAPE series, pvr150)", LGINNOTEK, PAL,
+ { "LG PAL (TAPE series)", LGINNOTEK, PAL,
16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623},
- { "Philips PAL/SECAM multi (FM1216ME pvr150)", Philips, PAL,
+ { "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL,
16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
{ "Philips FQ1236A MK4", Philips, NTSC,
16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732},
+ { "LG PAL TAPE-S001D", LGINNOTEK, PAL,
+ 16*160.00, 16*442.00, 0x01,0x02,0x04,0xce,623},
};
#define TUNERS ARRAY_SIZE(tuners)
diff -BurN ivtv-0.3.2i/driver/tuner.h ivtv-0.3.2i-palup/driver/tuner.h
--- ivtv-0.3.2i/driver/tuner.h 2005-03-06 12:17:45.000000000 -0800
+++ ivtv-0.3.2i-palup/driver/tuner.h 2005-03-10 15:50:38.000000000 -0800
@@ -77,8 +77,9 @@
#define TUNER_PHILIPS_FQ1286 53
#define TUNER_PHILIPS_TDA8290 54
#define TUNER_LG_PAL_TAPE 55 /* Hauppauge PVR-150 PAL */
-#define TUNER_PHILIPS_FM1216ME 56 /* Hauppauge PVR-150 PAL */
+#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
#define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */
+#define TUNER_LG_PAL_TAPE_S001D 58 /* Another PAL PVR-150 */
#define NOTUNER 0
#define PAL 1 /* PAL_BG */
diff -BurN ivtv-0.3.2i/driver/tveeprom.c ivtv-0.3.2i-palup/driver/tveeprom.c
--- ivtv-0.3.2i/driver/tveeprom.c 2005-03-01 07:45:52.000000000 -0800
+++ ivtv-0.3.2i-palup/driver/tveeprom.c 2005-03-11 15:36:30.036157492 -0800
@@ -213,13 +213,13 @@
{ TUNER_MICROTUNE_4049FM5, "Microtune 4049 FM5"},
{ TUNER_ABSENT, "LG TPI8NSR11F"},
{ TUNER_ABSENT, "Microtune 4049 FM5 Alt I2C"},
- { TUNER_ABSENT, "Philips FQ1216ME MK3"},
+ { TUNER_PHILIPS_FM1216ME_MK3, "Philips FQ1216ME MK3"},
{ TUNER_ABSENT, "Philips FI1236 MK3"},
{ TUNER_PHILIPS_FM1216ME_MK3, "Philips FM1216 ME MK3"},
- { TUNER_ABSENT, "Philips FM1236 MK3"},
+ { TUNER_PHILIPS_FM1236_MK3, "Philips FM1236 MK3"},
{ TUNER_ABSENT, "Philips FM1216MP MK3"},
/* 60-69 */
- { TUNER_ABSENT, "LG S001D MK3"},
+ { TUNER_LG_PAL_TAPE_S001D, "LG S001D MK3"},
{ TUNER_ABSENT, "LG M001D MK3"},
{ TUNER_ABSENT, "LG S701D MK3"},
{ TUNER_ABSENT, "LG M701D MK3"},
@@ -253,11 +253,13 @@
{ TUNER_ABSENT, "TCL MFPE05 2"},
/* 90-99 */
{ TUNER_ABSENT, "LG TALN H202T"},
- { TUNER_ABSENT, "Philips FQ1216AME MK4"},
+ { TUNER_PHILIPS_FQ1216AME_MK4, "Philips FQ1216AME MK4"},
{ TUNER_PHILIPS_FQ1236A_MK4, "Philips FQ1236A MK4"},
{ TUNER_ABSENT, "Philips FQ1286A MK4"},
{ TUNER_ABSENT, "Philips FQ1216ME MK5"},
{ TUNER_ABSENT, "Philips FQ1236 MK5"},
+ { TUNER_ABSENT, "Unspecified"},
+ { TUNER_LG_PAL_TAPE, "LG PAL (TAPE Series)"},
};
static char *sndtype[] = {
pgprPkvRQgrDB.pgp
Description: PGP signature
