[gentoo-commits] dev/xmw:master commit in: dev-embedded/msp430-uart/files/, dev-embedded/msp430-uart/

["Michael Weber" <xmw@gentoo.org>]

commit:     459049cdafc115ed5485d06c51a0ac1763dc7aec
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Tue Jul 22 00:22:44 2014 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Jul 22 00:22:44 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=459049cd

Fix for kernel 3.15

Package-Manager: portage-2.2.10
Manifest-Sign-Key: 62EEF090

---
 dev-embedded/msp430-uart/ChangeLog                 |  6 +++
 .../files/msp430-uart-0-cdc-acm-3.4.15.patch       | 33 +++++++++++++++
 dev-embedded/msp430-uart/msp430-uart-0-r2.ebuild   | 48 ++++++++++++++++++++++
 3 files changed, 87 insertions(+)

diff --git a/dev-embedded/msp430-uart/ChangeLog b/dev-embedded/msp430-uart/ChangeLog
index 898b950..cf98825 100644
--- a/dev-embedded/msp430-uart/ChangeLog
+++ b/dev-embedded/msp430-uart/ChangeLog
@@ -1,3 +1,9 @@
+*msp430-uart-0-r2 (22 Jul 2014)
+
+  22 Jul 2014; Michael Weber <xmw@gentoo.org>
+  +files/msp430-uart-0-cdc-acm-3.4.15.patch, +msp430-uart-0-r2.ebuild:
+  Fix for kernel 3.15
+
 *msp430-uart-0-r1 (08 Jul 2014)
 
   08 Jul 2014; Michael Weber <xmw@gentoo.org>

diff --git a/dev-embedded/msp430-uart/files/msp430-uart-0-cdc-acm-3.4.15.patch b/dev-embedded/msp430-uart/files/msp430-uart-0-cdc-acm-3.4.15.patch
new file mode 100644
index 0000000..32abf03
--- /dev/null
+++ b/dev-embedded/msp430-uart/files/msp430-uart-0-cdc-acm-3.4.15.patch
@@ -0,0 +1,33 @@
+From https://aur.archlinux.org/packages.php?ID=63769
+
+--- msp430-uart-0-r2/work/cdc-acm.c
++++ msp430-uart-0-r2/work/cdc-acm.c
+@@ -533,11 +533,6 @@
+ 		goto error_submit_urb;
+ 	}
+ 
+-	acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS;
+-	retval = acm_set_control(acm, acm->ctrlout);
+-	if (retval < 0 && (acm->ctrl_caps & USB_CDC_CAP_LINE))
+-		goto error_set_control;
+-
+ 	/*
+ 	 * Unthrottle device in case the TTY was closed while throttled.
+ 	 */
+@@ -561,8 +556,6 @@
+ 		usb_kill_urb(acm->read_urbs[i]);
+ 	acm->ctrlout = 0;
+ 	acm_set_control(acm, acm->ctrlout);
+-error_set_control:
+-	usb_kill_urb(acm->ctrlurb);
+ error_submit_urb:
+ 	usb_autopm_put_interface(acm->control);
+ error_get_interface:
+@@ -597,7 +590,6 @@
+ 	mutex_lock(&acm->mutex);
+ 	if (!acm->disconnected) {
+ 		pm_err = usb_autopm_get_interface(acm->control);
+-		acm_set_control(acm, acm->ctrlout = 0);
+ 
+ 		for (;;) {
+ 			urb = usb_get_from_anchor(&acm->delayed);

diff --git a/dev-embedded/msp430-uart/msp430-uart-0-r2.ebuild b/dev-embedded/msp430-uart/msp430-uart-0-r2.ebuild
new file mode 100644
index 0000000..a4cf60c
--- /dev/null
+++ b/dev-embedded/msp430-uart/msp430-uart-0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit linux-info linux-mod eutils
+
+DESCRIPTION="kernel module fix for the MSP430 LaunchPad UART"
+HOMEPAGE="https://aur.archlinux.org/packages.php?ID=63769"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+CONFIG_CHECK="~!USB_SERIAL_TI"
+ERROR_X86_ACPI_CPUFREQ="CONFIG_USB_SERIAL_TI has to be configured to Module to enable the replacement of cdc-acm with msp430-uart."
+MODULE_NAMES="${PN}(misc:)"
+BUILD_TARGETS="module"
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	cp -v "${KERNEL_DIR}"/drivers/usb/class/cdc-acm.{c,h} . || die
+}
+
+src_prepare() {
+	if kernel_is ge 3 14 15 ; then
+		epatch "${FILESDIR}"/${P}-cdc-acm-3.4.15.patch
+	else 
+		if kernel_is ge 3 14 10 ; then
+			epatch "${FILESDIR}"/${P}-cdc-acm-3.4.10.patch
+		else
+			epatch "${FILESDIR}"/${P}-cdc-acm.patch
+		fi
+	fi
+	echo "obj-m := ${PN}.o" >> Makefile
+	echo "module:" >> Makefile
+	echo "	\$(MAKE) -C "${KERNEL_DIR}" M="${S}" modules" >> Makefile
+	mv cdc-acm.c ${PN}.c || die
+	export KERNEL_DIR="${KERNEL_DIR}"
+}