+++ /dev/null
-diff --git a/eciadsl-synch.c b/eciadsl-synch.c
-index 27c1f34..31c51dc 100644
---- a/eciadsl-synch.c
-+++ b/eciadsl-synch.c
-@@ -322,7 +322,7 @@ void read_endpoint(pusb_endpoint_t ep_int, int epnum){
- device. So we revert to the old behaviour : NO TIMEOUTS ...
- */
-
-- ret = pusb_endpoint_read(ep_int, lbuf, sizeof(lbuf), 0);
-+ ret = pusb_endpoint_read_int(ep_int, lbuf, sizeof(lbuf));
-
- if (ret < 0)
- {
-diff --git a/pusb-linux.c b/pusb-linux.c
-index 79b7545..b5bf1dd 100644
---- a/pusb-linux.c
-+++ b/pusb-linux.c
-@@ -340,6 +340,54 @@ int pusb_endpoint_rw_no_timeout(int fd, int ep,
- return(purb->actual_length);
- }
-
-+int pusb_endpoint_read_int_no_timeout(int fd, int ep,
-+ unsigned char* buf, int size)
-+{
-+ struct usbdevfs_urb urb, *purb = &urb;
-+ int ret;
-+
-+ memset(purb, 0, sizeof(urb));
-+
-+ purb->type = USBDEVFS_URB_TYPE_INTERRUPT;
-+ purb->endpoint = ep;
-+ purb->flags = 0;
-+ purb->buffer = buf;
-+ purb->buffer_length = size;
-+ purb->signr = 0;
-+
-+ do
-+ {
-+ ret = ioctl(fd, USBDEVFS_SUBMITURB, purb);
-+ }
-+ while (ret < 0 && errno == EINTR);
-+
-+ if (ret < 0)
-+ return(ret);
-+
-+ do
-+ {
-+ ret = ioctl(fd, USBDEVFS_REAPURB, &purb);
-+ }
-+ while (ret < 0 && errno == EINTR);
-+
-+ if (ret < 0)
-+ return(ret);
-+
-+ if (purb != &urb)
-+ printf("purb=%p, &urb=%p\n", (void*)purb, (void*)&urb);
-+
-+ if (purb->buffer != buf)
-+ printf("purb->buffer=%p, buf=%p\n", (void*)purb->buffer, (void*)buf);
-+
-+ return(purb->actual_length);
-+}
-+
-+int pusb_endpoint_read_int(pusb_endpoint_t ep,
-+ unsigned char* buf, int size)
-+{
-+ return(pusb_endpoint_read_int_no_timeout(ep->fd, ep->ep|USB_DIR_IN, buf, size));
-+}
-+
- int pusb_endpoint_rw(int fd, int ep, unsigned char* buf, int size, int timeout)
- {
- struct usbdevfs_bulktransfer bulk;
-diff --git a/pusb.h b/pusb.h
-index 921543b..112e41f 100644
---- a/pusb.h
-+++ b/pusb.h
-@@ -30,6 +30,8 @@ int pusb_release_interface(pusb_device_t dev,int interface);
- pusb_endpoint_t pusb_endpoint_open(pusb_device_t dev, int epnum, int flags);
- int pusb_endpoint_read(pusb_endpoint_t ep,
- unsigned char *buf, int size, int timeout);
-+int pusb_endpoint_read_int(pusb_endpoint_t ep,
-+ unsigned char *buf, int size);
- int pusb_endpoint_write(pusb_endpoint_t ep,
- const unsigned char *buf, int size, int timeout);
-
+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_PN="eciadsl-usermode-${PV}"
-
-DESCRIPTION="Driver for various ADSL modems. Also known as EciAdsl"
-SRC_URI="http://eciadsl.flashtux.org/download/${MY_PN}.tar.gz"
-HOMEPAGE="http://eciadsl.flashtux.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="tk"
-
-DEPEND="net-dialup/ppp"
-RDEPEND="${DEPEND}
- dev-lang/perl
- tk? ( >=dev-lang/tk-8.3.4 )"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-synch.patch
- epatch "${FILESDIR}"/${P}-pagesize.patch
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
- dodoc README* TROUBLESHOOTING* ChangeLog || die "failed to install documentation"
-}
-
-pkg_postinst() {
- elog
- elog "Package succesfully installed you should now run "
- elog "eciconf.sh (graphical, requires TCL/TK) or eciconftxt.sh"
- elog
- elog "Paquetage installé avec succés vous devriez maintenant"
- elog "executer eciconf.sh (qui requiert TCL/TK) ou eciconftxt.sh"
- elog
- ewarn "Please note that if you're using a 2.6.x kernel you'll"
- ewarn "probably need to apply a patch to fix a USB bug. See"
- ewarn "http://eciadsl.flashtux.org/download/beta/"
- ewarn
-}
+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_PN="eciadsl-usermode-${PV}"
-
-DESCRIPTION="Driver for various ADSL modems. Also known as EciAdsl"
-SRC_URI="http://eciadsl.flashtux.org/download/${MY_PN}.tar.gz"
-HOMEPAGE="http://eciadsl.flashtux.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-amd64 x86"
-IUSE="tk"
-
-DEPEND="net-dialup/ppp"
-RDEPEND="${DEPEND}
- dev-lang/perl
- tk? ( >=dev-lang/tk-8.3.4 )"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-pagesize.patch
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
- if ! use tk ; then
- rm "${D}"/usr/bin/eciadsl-config-tk
- fi
- dodoc README* TROUBLESHOOTING* ChangeLog || die "failed to install documentation"
-}
-
-pkg_postinst() {
- elog
- elog "Package succesfully installed you should now run "
- elog "eciconf.sh (graphical, requires TCL/TK) or eciconftxt.sh"
- elog
- elog "Paquetage installé avec succés vous devriez maintenant"
- elog "executer eciconf.sh (qui requiert TCL/TK) ou eciconftxt.sh"
- elog
-}
projects / gentoo.git / commitdiff