jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: update DVBSky patch to support build with gcc-4.9

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-04-23 12:39:11 +02:00
parent bf6eae1e4b
commit 69be6f1e71
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/linux/patches/3.14.1/linux-210-dvbsky.patch vendored
View File

@ -1,8 +1,8 @@
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index fb77062..f6f1afa 100644
index 49db718..6ddcfc9 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -214,6 +214,20 @@ config DVB_CX24117
@@ -248,6 +248,20 @@ config DVB_CX24117
help
A Dual DVB-S/S2 tuner module. Say Y when you want to support this frontend.
@ -24,10 +24,10 @@ index fb77062..f6f1afa 100644
tristate "Silicon Labs SI21XX based"
depends on DVB_CORE && I2C
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
index c08b7f0..e8de9b6 100644
index 9b21488..edaae0d 100644
--- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -108,4 +108,5 @@ obj-$(CONFIG_DVB_RTL2830) += rtl2830.o
@@ -112,4 +112,5 @@ obj-$(CONFIG_DVB_RTL2830) += rtl2830.o
obj-$(CONFIG_DVB_RTL2832) += rtl2832.o
obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
obj-$(CONFIG_DVB_AF9033) += af9033.o
@ -36,7 +36,7 @@ index c08b7f0..e8de9b6 100644
+obj-$(CONFIG_DVB_DVBSKY_M88DC2800) += dvbsky_m88dc2800.o
diff --git a/drivers/media/dvb-frontends/dvbsky_m88dc2800.c b/drivers/media/dvb-frontends/dvbsky_m88dc2800.c
new file mode 100644
index 0000000..f876a11
index 0000000..3c933b4
--- /dev/null
+++ b/drivers/media/dvb-frontends/dvbsky_m88dc2800.c
@@ -0,0 +1,2124 @@
@ -2166,7 +2166,7 @@ index 0000000..f876a11
+MODULE_VERSION("1.00");
diff --git a/drivers/media/dvb-frontends/dvbsky_m88dc2800.h b/drivers/media/dvb-frontends/dvbsky_m88dc2800.h
new file mode 100644
index 0000000..2184322
index 0000000..0844a66
--- /dev/null
+++ b/drivers/media/dvb-frontends/dvbsky_m88dc2800.h
@@ -0,0 +1,44 @@
@ -2216,7 +2216,7 @@ index 0000000..2184322
+#endif /* dvbsky_m88dc2800_H */
diff --git a/drivers/media/dvb-frontends/dvbsky_m88ds3103.c b/drivers/media/dvb-frontends/dvbsky_m88ds3103.c
new file mode 100644
index 0000000..9d525da
index 0000000..99985a7
--- /dev/null
+++ b/drivers/media/dvb-frontends/dvbsky_m88ds3103.c
@@ -0,0 +1,1707 @@
@ -3929,7 +3929,7 @@ index 0000000..9d525da
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/dvbsky_m88ds3103.h b/drivers/media/dvb-frontends/dvbsky_m88ds3103.h
new file mode 100644
index 0000000..e3b96b2
index 0000000..df95253
--- /dev/null
+++ b/drivers/media/dvb-frontends/dvbsky_m88ds3103.h
@@ -0,0 +1,53 @@
@ -3988,7 +3988,7 @@ index 0000000..e3b96b2
+#endif /* dvbsky_m88ds3103_H */
diff --git a/drivers/media/dvb-frontends/dvbsky_m88ds3103_priv.h b/drivers/media/dvb-frontends/dvbsky_m88ds3103_priv.h
new file mode 100644
index 0000000..2838514
index 0000000..dfb3f8b
--- /dev/null
+++ b/drivers/media/dvb-frontends/dvbsky_m88ds3103_priv.h
@@ -0,0 +1,403 @@
@ -4396,7 +4396,7 @@ index 0000000..2838514
+
+#endif /* dvbsky_m88ds3103_PRIV_H */
diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
index d1dcb1d..478f3dc 100644
index d1dcb1d..a5fbc89 100644
--- a/drivers/media/pci/cx23885/Kconfig
+++ b/drivers/media/pci/cx23885/Kconfig
@@ -23,6 +23,8 @@ config VIDEO_CX23885
@ -4745,7 +4745,7 @@ index edcd79d..4b57eef 100644
break;
}
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 0549205..86c0cf2 100644
index 0549205..201523a 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -52,6 +52,8 @@
@ -5019,7 +5019,7 @@ index 8a49e7c..a5e4639 100644
/* Integrated CX23885 IR controller */
driver_type = RC_DRIVER_IR_RAW;
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 0fa4048..bd33b00 100644
index 0fa4048..7084a4e 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -97,6 +97,14 @@
@ -5047,7 +5047,7 @@ index 0fa4048..bd33b00 100644
u32 force_bff;
};
diff --git a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
index a63a9ad..ccf0e6a 100644
index a63a9ad..7deb300 100644
--- a/drivers/media/pci/cx88/Kconfig
+++ b/drivers/media/pci/cx88/Kconfig
@@ -57,6 +57,7 @@ config VIDEO_CX88_DVB
@ -5106,7 +5106,7 @@ index e18a7ac..317511d 100644
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index 053ed1b..b4269a8 100644
index 053ed1b..955b916 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -54,6 +54,7 @@
@ -5250,7 +5250,7 @@ index 28893a6..5fa5f48 100644
enum cx88_itype {
CX88_VMUX_COMPOSITE1 = 1,
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index b1cde8c..563a109 100644
index 0b8c549..abf6079 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
@ -5346,7 +5346,7 @@ index 0000000..bfc41fb
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Nibble Max <nibble.max@gmail.com>");
diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
index 2059d0c..1dc0600 100644
index 2059d0c..24a4ec2 100644
--- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@@ -147,3 +147,9 @@ config DVB_USB_RTL28XXU
@ -5360,7 +5360,7 @@ index 2059d0c..1dc0600 100644
+ help
+ Say Y here to support the USB receivers from DVBSky.
diff --git a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile
index 2c06714..e002b57 100644
index 2c06714..926f12d 100644
--- a/drivers/media/usb/dvb-usb-v2/Makefile
+++ b/drivers/media/usb/dvb-usb-v2/Makefile
@@ -40,6 +40,9 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
@ -5375,10 +5375,10 @@ index 2c06714..e002b57 100644
ccflags-y += -I$(srctree)/drivers/media/tuners
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
new file mode 100644
index 0000000..45bedfc
index 0000000..9033d92
--- /dev/null
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
@@ -0,0 +1,741 @@
@@ -0,0 +1,739 @@
+/*
+ * Driver for DVBSky USB2.0 receiver
+ *
@ -5984,8 +5984,6 @@ index 0000000..45bedfc
+ struct dvb_usb_device *d = adap_to_d(adap);
+ int ret = 0;
+
+ dprintk("%s, build on %s %s()\n", __func__, __DATE__,__TIME__);
+
+ dvbsky_gpio_ctrl(d, 0x04, 1);
+
+ dvbsky_gpio_ctrl(d, 0x83, 0);
@ -6121,7 +6119,7 @@ index 0000000..45bedfc
+MODULE_DESCRIPTION("Driver for DVBSky USB2.0");
+MODULE_LICENSE("GPL");
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 6628f5d..64646e3 100644
index a20ed97..73f8c92 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -119,6 +119,7 @@ void rc_map_init(void);