don't tune to any default transponder anymore, don't set any default PIDs

3 files changed, 4 insertions, 53 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index 5be8265ad..36ae3d090 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -99,8 +99,6 @@ static int av7110_debug = 0;
 #define dprintk	if (av7110_debug) printk
 
 static int vidmode=CVBS_RGB_OUT;
-static int init_vpid;
-static int init_apid;
 static int pids_off;
 static int adac=DVB_ADAC_TI;
 
@@ -4741,9 +4739,6 @@ int av7110_attach (struct saa7146 *saa, void **av7110_ptr)
                 }
         }
 
-	if (init_vpid != 0 || init_apid != 0)
-		ChangePIDs(av7110, init_vpid, init_apid, 0, 0, 0);
-
 	av7110_setup_irc_config (av7110, 0);
         dvb_register(av7110);
 
@@ -4874,8 +4869,6 @@ MODULE_PARM(av7110_debug,"i");
 MODULE_PARM(vidmem,"l");
 MODULE_PARM(vidlow,"l");
 MODULE_PARM(vidmode,"i");
-MODULE_PARM(init_vpid,"i");
-MODULE_PARM(init_apid,"i");
 MODULE_PARM(pids_off,"i");
 MODULE_PARM(adac,"i");
 
diff --git a/linux/drivers/media/dvb/av7110/av7110_ir.c b/linux/drivers/media/dvb/av7110/av7110_ir.c
index 096fa0c62..e706672a1 100644
--- a/linux/drivers/media/dvb/av7110/av7110_ir.c
+++ b/linux/drivers/media/dvb/av7110/av7110_ir.c
@@ -7,6 +7,10 @@
 
 #include "av7110.h"
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45))
+#include "input_fake.h"
+#endif
+
 
 #define UP_TIMEOUT (HZ/2)
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index 344621653..ab368b2ac 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -297,38 +297,6 @@ int dvb_frontend_get_event (struct dvb_frontend_data *fe,
 
 
 static
-struct dvb_frontend_parameters default_param [] = {
-	{						/* NTV on Astra */
-		frequency: 12669500-10600000,
-		inversion: INVERSION_OFF,
-		{ qpsk: { symbol_rate: 22000000, fec_inner: FEC_AUTO } }
-	},
-	{						/* Cable */
-		frequency: 394000000,
-		inversion: INVERSION_OFF,
-		{ qam:  { symbol_rate: 6900000,
-			  fec_inner: FEC_AUTO,
-			  modulation: QAM_64
-			}
-		}
-	},
-	{						/* DVB-T */
-		frequency: 730000000,
-		inversion: INVERSION_OFF,
-		{ ofdm: { bandwidth: BANDWIDTH_8_MHZ,
-			  code_rate_HP: FEC_2_3,
-			  code_rate_LP: FEC_1_2,
-			  constellation: QAM_16,
-			  transmission_mode: TRANSMISSION_MODE_2K,
-			  guard_interval: GUARD_INTERVAL_1_8,
-			  hierarchy_information: HIERARCHY_NONE
-			}
-		}
-	}
-};
-
-
-static
 int dvb_frontend_set_parameters (struct dvb_frontend_data *fe,
 				 struct dvb_frontend_parameters *param,
 				 int first_trial)
@@ -365,23 +333,11 @@ static
 void dvb_frontend_init (struct dvb_frontend_data *fe)
 {
 	struct dvb_frontend *frontend = &fe->frontend;
-	struct dvb_frontend_parameters *init_param;
 
 	printk ("DVB: initialising frontend %i:%i (%s)...\n",
 		frontend->i2c->adapter->num, frontend->i2c->id, fe->info->name);
 
 	dvb_frontend_internal_ioctl (frontend, FE_INIT, NULL);
-
-	if (fe->info->type == FE_QPSK) {
-		dvb_frontend_internal_ioctl (frontend, FE_SET_VOLTAGE,
-					     (void*) SEC_VOLTAGE_13);
-		dvb_frontend_internal_ioctl (frontend, FE_SET_TONE,
-					     (void*) SEC_TONE_ON);
-	}
-
-	init_param = &default_param[fe->info->type-FE_QPSK];
-
-	dvb_frontend_set_parameters (fe, init_param, 1);
 }
 
 
@@ -708,7 +664,6 @@ dvb_add_frontend_ioctls (struct dvb_adapter *adapter,
 			fe->frontend.before_ioctl = before_ioctl;
 			fe->frontend.after_ioctl = after_ioctl;
 			fe->frontend.before_after_data = before_after_data;
-			dvb_frontend_start (fe);
 			frontend_count++;
 		}
 	}
@@ -893,7 +848,6 @@ dvb_register_frontend (int (*ioctl) (struct dvb_frontend *frontend,
 			fe->frontend.before_ioctl = ioctl->before_ioctl;
 			fe->frontend.after_ioctl = ioctl->after_ioctl;
 			fe->frontend.before_after_data = ioctl->before_after_data;
-			dvb_frontend_start (fe);
 			break;
 		}
 	}