From 415075b3f01b49ff59aeabc46a2bbfd2c796104f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 24 Oct 2010 04:51:30 +0200 Subject: [PATCH] crystalhd: update to crystalhd-171 Signed-off-by: Stephan Raue --- .../crystalhd-171-use_8_DMA_buffers-0.1.diff | 14 +++++++ .../crystalhd-linux-2.6.36_ioctrl-0.2.1.diff | 40 ------------------- packages/multimedia/crystalhd/url | 2 +- 3 files changed, 15 insertions(+), 41 deletions(-) create mode 100644 packages/multimedia/crystalhd/patches/crystalhd-171-use_8_DMA_buffers-0.1.diff delete mode 100644 packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl-0.2.1.diff diff --git a/packages/multimedia/crystalhd/patches/crystalhd-171-use_8_DMA_buffers-0.1.diff b/packages/multimedia/crystalhd/patches/crystalhd-171-use_8_DMA_buffers-0.1.diff new file mode 100644 index 0000000000..02ff65480e --- /dev/null +++ b/packages/multimedia/crystalhd/patches/crystalhd-171-use_8_DMA_buffers-0.1.diff @@ -0,0 +1,14 @@ +diff -Naur crystalhd-171/include/bc_dts_glob_lnx.h crystalhd-171.patch/include/bc_dts_glob_lnx.h +--- crystalhd-171/include/bc_dts_glob_lnx.h 2010-10-18 01:56:14.000000000 +0200 ++++ crystalhd-171.patch/include/bc_dts_glob_lnx.h 2010-10-24 02:53:16.739741578 +0200 +@@ -76,8 +76,8 @@ + BC_LINK_MAX_OPENS = 3, /* Maximum simultaneous opens*/ + BC_LINK_MAX_SGLS = 1024, /* Maximum SG elements 4M/4K */ + BC_TX_LIST_CNT = 2, /* Max Tx DMA Rings */ +- //BC_RX_LIST_CNT = 8, /* Max Rx DMA Rings*/ +- BC_RX_LIST_CNT = 16, /* Max Rx DMA Rings*/ ++ BC_RX_LIST_CNT = 8, /* Max Rx DMA Rings*/ ++ //BC_RX_LIST_CNT = 16, /* Max Rx DMA Rings*/ + BC_PROC_OUTPUT_TIMEOUT = 2000, /* Milliseconds */ + BC_INFIFO_THRESHOLD = 0x10000, + }; diff --git a/packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl-0.2.1.diff b/packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl-0.2.1.diff deleted file mode 100644 index f62bb485be..0000000000 --- a/packages/multimedia/crystalhd/patches/crystalhd-linux-2.6.36_ioctrl-0.2.1.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur crystalhd-3.8.0/driver/linux/crystalhd_flea_ddr.c crystalhd-3.8.0.patch/driver/linux/crystalhd_flea_ddr.c ---- crystalhd-3.8.0/driver/linux/crystalhd_flea_ddr.c 2010-10-06 00:07:16.000000000 +0200 -+++ crystalhd-3.8.0.patch/driver/linux/crystalhd_flea_ddr.c 2010-10-06 02:09:53.349322695 +0200 -@@ -24,6 +24,7 @@ - * along with this driver. If not, see . - **********************************************************************/ - -+#include - #include "crystalhd_hw.h" - #include "crystalhd_flea_ddr.h" - -diff -Naur crystalhd-3.8.0/driver/linux/crystalhd_lnx.c crystalhd-3.8.0.patch/driver/linux/crystalhd_lnx.c ---- crystalhd-3.8.0/driver/linux/crystalhd_lnx.c 2010-10-06 00:07:16.000000000 +0200 -+++ crystalhd-3.8.0.patch/driver/linux/crystalhd_lnx.c 2010-10-06 02:09:59.370398969 +0200 -@@ -279,8 +279,13 @@ - } - - /* API interfaces */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) - static int chd_dec_ioctl(struct inode *in, struct file *fd, - unsigned int cmd, unsigned long ua) -+#else -+static long chd_dec_ioctl(struct file *fd, -+ unsigned int cmd, unsigned long ua) -+#endif - { - struct crystalhd_adp *adp = chd_get_adp(); - crystalhd_cmd_proc cproc; -@@ -365,7 +370,11 @@ - - static const struct file_operations chd_dec_fops = { - .owner = THIS_MODULE, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) - .ioctl = chd_dec_ioctl, -+#else -+ .unlocked_ioctl = chd_dec_ioctl, -+#endif - .open = chd_dec_open, - .release = chd_dec_close, - }; diff --git a/packages/multimedia/crystalhd/url b/packages/multimedia/crystalhd/url index 97aaa32795..ec02158bb9 100644 --- a/packages/multimedia/crystalhd/url +++ b/packages/multimedia/crystalhd/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/crystalhd-3.8.0.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/crystalhd-171.tar.bz2 \ No newline at end of file