# HG changeset patch

# Parent 0389db07e7f73185c59a24f22288daf1e693569b

Changes to build to compile rtl2832u kernel module

diff -r 0389db07e7f7 linux/drivers/media/dvb/dvb-usb/Kconfig

--- a/linux/drivers/media/dvb/dvb-usb/Kconfig	Wed Oct 27 09:16:44 2010 +0200

+++ b/linux/drivers/media/dvb/dvb-usb/Kconfig	Wed Oct 27 09:33:34 2010 +0200

@@ -346,3 +346,9 @@

 	select DVB_STB6100 if !DVB_FE_CUSTOMISE

 	help

 	  Say Y here to support the AZ6027 device

+

+config DVB_USB_RTL2832U

+        tristate "Realtek RTL2832U DVB-T USB2.0 support"

+        depends on DVB_USB

+        help

+          Realtek RTL2832U DVB-T driver

diff -r 0389db07e7f7 linux/drivers/media/dvb/dvb-usb/Makefile

--- a/linux/drivers/media/dvb/dvb-usb/Makefile	Wed Oct 27 09:16:44 2010 +0200

+++ b/linux/drivers/media/dvb/dvb-usb/Makefile	Wed Oct 27 09:33:34 2010 +0200

@@ -88,6 +88,9 @@

 dvb-usb-az6027-objs = az6027.o

 obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o

+dvb-usb-rtl2832u-objs = demod_rtl2832.o dvbt_demod_base.o dvbt_nim_base.o foundation.o math_mpi.o nim_rtl2832_mxl5007t.o nim_rtl2832_fc2580.o nim_rtl2832_mt2266.o rtl2832u.o rtl2832u_fe.o rtl2832u_io.o tuner_mxl5007t.o tuner_fc2580.o tuner_mt2266.o tuner_tua9001.o nim_rtl2832_tua9001.o

+obj-$(CONFIG_DVB_USB_RTL2832U) += dvb-usb-rtl2832u.o

+

 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/

 # due to tuner-xc3028

 EXTRA_CFLAGS += -Idrivers/media/common/tuners

diff -r 0389db07e7f7 linux/drivers/media/dvb/dvb-usb/rtl2832u.c

--- a/linux/drivers/media/dvb/dvb-usb/rtl2832u.c	Wed Oct 27 09:16:44 2010 +0200

+++ b/linux/drivers/media/dvb/dvb-usb/rtl2832u.c	Wed Oct 27 09:33:34 2010 +0200

@@ -9,7 +9,7 @@

 module_param_named(debug,dvb_usb_rtl2832u_debug, int, 0644);

 MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2 (or-able))." DVB_USB_DEBUG_STATUS);

-//DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);

+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);

 #define	USB_EPA_CTL	0x0148

@@ -58,9 +58,9 @@

 static int rtl2832u_usb_probe(struct usb_interface *intf,

 		const struct usb_device_id *id)

 {

-	if ( ( 0== dvb_usb_device_init(intf,&rtl2832u_1st_properties,THIS_MODULE,NULL) )||

-		( 0== dvb_usb_device_init(intf,&rtl2832u_2nd_properties,THIS_MODULE,NULL) ) ||

-		( 0== dvb_usb_device_init(intf,&rtl2832u_3th_properties,THIS_MODULE,NULL) ))

+	if ( ( 0== dvb_usb_device_init(intf,&rtl2832u_1st_properties,THIS_MODULE,NULL,adapter_nr) )||

+		( 0== dvb_usb_device_init(intf,&rtl2832u_2nd_properties,THIS_MODULE,NULL,adapter_nr) ) ||

+		( 0== dvb_usb_device_init(intf,&rtl2832u_3th_properties,THIS_MODULE,NULL,adapter_nr) ))

 		return 0;

 	return -ENODEV;

diff -r 0389db07e7f7 linux/drivers/media/dvb/dvb-usb/tuner_tua9001.c

--- a/linux/drivers/media/dvb/dvb-usb/tuner_tua9001.c	Wed Oct 27 09:16:44 2010 +0200

+++ b/linux/drivers/media/dvb/dvb-usb/tuner_tua9001.c	Wed Oct 27 09:33:34 2010 +0200

@@ -948,13 +948,13 @@

   i2cseq[1] = 0x78;

   if(i2cBusWrite (pTuner, DeviceAddr, 0x40, i2cseq, 2) != TUNER_OK) goto error_status;

-#elif defined(CRYSTAL_19.2_MHZ)   /*  Frequency 19.2 MHz */

+#elif defined(CRYSTAL_19_2_MHZ)   /*  Frequency 19.2 MHz */

   i2cseq[0] = 0x01;

   i2cseq[1] = 0xA0;    

   if(i2cBusWrite (pTuner, DeviceAddr, 0x1d, i2cseq, 2) != TUNER_OK) goto error_status;

   /* Note: Insert optimised register values for 0x40 / 0x41 for used crystal */

   /* contact application support for further information */

-#elif defined(CRYSTAL_20.48_MHZ)   /*  Frequency 20,48 MHz */

+#elif defined(CRYSTAL_20_48_MHZ)   /*  Frequency 20,48 MHz */

   i2cseq[0] = 0x01;

   i2cseq[1] = 0xA8;    

   if(i2cBusWrite (pTuner, DeviceAddr, 0x1d, i2cseq, 2) != TUNER_OK) goto error_status;