From 2845a7bd4ab0184c1b4b33542c31b550be6ea290 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 8 Jul 2013 09:50:48 +0000 Subject: main/libcrystalhd: new aport we need the userspace library for crystaldhd driver for xbmc --- ...-remove-devinit-and-devexit-for-linux-3.8.patch | 106 +++++++++++++++++++++ main/libcrystalhd/APKBUILD | 71 ++++++++++++++ .../crystalhd-use_8_DMA_buffers-0.1.patch | 11 +++ 3 files changed, 188 insertions(+) create mode 100644 main/libcrystalhd/0001-driver-remove-devinit-and-devexit-for-linux-3.8.patch create mode 100644 main/libcrystalhd/APKBUILD create mode 100644 main/libcrystalhd/crystalhd-use_8_DMA_buffers-0.1.patch (limited to 'main/libcrystalhd') diff --git a/main/libcrystalhd/0001-driver-remove-devinit-and-devexit-for-linux-3.8.patch b/main/libcrystalhd/0001-driver-remove-devinit-and-devexit-for-linux-3.8.patch new file mode 100644 index 0000000000..a5b0eb2cda --- /dev/null +++ b/main/libcrystalhd/0001-driver-remove-devinit-and-devexit-for-linux-3.8.patch @@ -0,0 +1,106 @@ +From 40aab27139c6e2291142fc8d93e4651effdeef90 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 12 Mar 2013 09:45:31 +0000 +Subject: [PATCH] driver: remove devinit and devexit for linux-3.8 + +devinit and devexit were removed from kernel version 3.8 and using it +causes compile problems. + +Signed-off-by: Natanael Copa +--- + driver/linux/crystalhd_cmds.c | 4 ++-- + driver/linux/crystalhd_lnx.c | 14 +++++++------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/driver/linux/crystalhd_cmds.c b/driver/linux/crystalhd_cmds.c +index cecd710..f3d26e0 100644 +--- a/driver/linux/crystalhd_cmds.c ++++ b/driver/linux/crystalhd_cmds.c +@@ -1093,7 +1093,7 @@ BC_STATUS crystalhd_user_open(struct crystalhd_cmd *ctx, + * + * Called at the time of driver load. + */ +-BC_STATUS __devinit crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx, ++BC_STATUS crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx, + struct crystalhd_adp *adp) + { + struct device *dev = &adp->pdev->dev; +@@ -1136,7 +1136,7 @@ BC_STATUS __devinit crystalhd_setup_cmd_context(struct crystalhd_cmd *ctx, + * + * Called at the time of driver un-load. + */ +-BC_STATUS __devexit crystalhd_delete_cmd_context(struct crystalhd_cmd *ctx) ++BC_STATUS crystalhd_delete_cmd_context(struct crystalhd_cmd *ctx) + { + dev_dbg(chddev(), "Deleting Command context..\n"); + +diff --git a/driver/linux/crystalhd_lnx.c b/driver/linux/crystalhd_lnx.c +index 64e66ad..8608aea 100644 +--- a/driver/linux/crystalhd_lnx.c ++++ b/driver/linux/crystalhd_lnx.c +@@ -431,7 +431,7 @@ static const struct file_operations chd_dec_fops = { + .llseek = noop_llseek, + }; + +-static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp) ++static int chd_dec_init_chdev(struct crystalhd_adp *adp) + { + struct device *xdev = &adp->pdev->dev; + struct device *dev; +@@ -498,7 +498,7 @@ fail: + return rc; + } + +-static void __devexit chd_dec_release_chdev(struct crystalhd_adp *adp) ++static void chd_dec_release_chdev(struct crystalhd_adp *adp) + { + crystalhd_ioctl_data *temp = NULL; + if (!adp) +@@ -523,7 +523,7 @@ static void __devexit chd_dec_release_chdev(struct crystalhd_adp *adp) + /*crystalhd_delete_elem_pool(adp); */ + } + +-static int __devinit chd_pci_reserve_mem(struct crystalhd_adp *pinfo) ++static int chd_pci_reserve_mem(struct crystalhd_adp *pinfo) + { + struct device *dev = &pinfo->pdev->dev; + int rc; +@@ -582,7 +582,7 @@ static int __devinit chd_pci_reserve_mem(struct crystalhd_adp *pinfo) + return 0; + } + +-static void __devexit chd_pci_release_mem(struct crystalhd_adp *pinfo) ++static void chd_pci_release_mem(struct crystalhd_adp *pinfo) + { + if (!pinfo) + return; +@@ -597,7 +597,7 @@ static void __devexit chd_pci_release_mem(struct crystalhd_adp *pinfo) + } + + +-static void __devexit chd_dec_pci_remove(struct pci_dev *pdev) ++static void chd_dec_pci_remove(struct pci_dev *pdev) + { + struct crystalhd_adp *pinfo; + BC_STATUS sts = BC_STS_SUCCESS; +@@ -625,7 +625,7 @@ static void __devexit chd_dec_pci_remove(struct pci_dev *pdev) + g_adp_info = NULL; + } + +-static int __devinit chd_dec_pci_probe(struct pci_dev *pdev, ++static int chd_dec_pci_probe(struct pci_dev *pdev, + const struct pci_device_id *entry) + { + struct device *dev = &pdev->dev; +@@ -815,7 +815,7 @@ MODULE_DEVICE_TABLE(pci, chd_dec_pci_id_table); + static struct pci_driver bc_chd_driver = { + .name = "crystalhd", + .probe = chd_dec_pci_probe, +- .remove = __devexit_p(chd_dec_pci_remove), ++ .remove = chd_dec_pci_remove, + .id_table = chd_dec_pci_id_table, + .suspend = chd_dec_pci_suspend, + .resume = chd_dec_pci_resume +-- +1.8.1.5 + diff --git a/main/libcrystalhd/APKBUILD b/main/libcrystalhd/APKBUILD new file mode 100644 index 0000000000..23a9819796 --- /dev/null +++ b/main/libcrystalhd/APKBUILD @@ -0,0 +1,71 @@ +# Contributor: Carlo Landmeter +# Maintainer: Natanael Copa + +pkgname=libcrystalhd +pkgver=20130708 +_date=$pkgver +pkgrel=0 +pkgdesc="Broadcom CrystalHD kernel driver library" +url="http://git.linuxtv.org/jarod/crystalhd.git" +arch="all" +license="GPL2" +depends="" +depends_dev="" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-dev" +source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-${_date}.tar.gz + " + +_giturl="git://linuxtv.org/jarod/crystalhd.git" +_upload="dev.alpinelinux.org:/archive/$pkgname/" +_libdir="$srcdir/$pkgname-$_date/linux_lib/libcrystalhd" +_builddir="$srcdir/$pkgname-$_date" + +snapshot() { + local _date=$(date +%Y%m%d) + local _pkg=$pkgname-$_date.tar.gz + mkdir -p "$srcdir" + cd "$srcdir" + msg "Creating snapshot: $_pkg" + rm -rf ${_giturl##*/} + git clone --depth=1 --bare $_giturl || return 1 + git --git-dir ${_giturl##*/} archive -o $_pkg \ + --prefix=$pkgname-$_date/ HEAD \ + || return 1 + msg "Uploading to $_upload" + rsync -Lave ssh $_pkg $_upload || return 1 + cd "$startdir" + sed -i -e "s/^pkgver=.*/pkgver=$_date/" \ + APKBUILD || return 1 + abuild checksum +} + +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_libdir" + msg "building library" + make || return 1 +} + +package() { + cd "$_libdir" + make DESTDIR="$pkgdir" install || return 1 +} + +dev() { + default_dev +} + +md5sums="e184af8123997a429f029ffe40c14384 libcrystalhd-20130708.tar.gz" +sha256sums="aa2d37789286d3c7c26e2274ef8f4b95cc54d68d7a0975723d7b145c829b8aa2 libcrystalhd-20130708.tar.gz" +sha512sums="70a84f8102250a797b658153d7cd2ed2b05d00d801b52a0b6f877e0feecd55a83c32032c5b66dba8cb53863dabc5536dde6405087403d8fe730c27f6ea3ee1b2 libcrystalhd-20130708.tar.gz" diff --git a/main/libcrystalhd/crystalhd-use_8_DMA_buffers-0.1.patch b/main/libcrystalhd/crystalhd-use_8_DMA_buffers-0.1.patch new file mode 100644 index 0000000000..1b9150ea7b --- /dev/null +++ b/main/libcrystalhd/crystalhd-use_8_DMA_buffers-0.1.patch @@ -0,0 +1,11 @@ +--- a/include/bc_dts_glob_lnx.h ++++ b/include/bc_dts_glob_lnx.h +@@ -76,7 +76,7 @@ + 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 = 16, /* Max Rx DMA Rings*/ ++ BC_RX_LIST_CNT = 8, /* Max Rx DMA Rings*/ + BC_PROC_OUTPUT_TIMEOUT = 2000, /* Milliseconds */ + BC_INFIFO_THRESHOLD = 0x10000, + }; -- cgit v1.2.3