version bump, hard masked because it is now from the experimental mqueue branch

Package-Manager: portage-2.1_pre3-r1

6 files changed, 279 insertions, 3 deletions

diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog
index fd18b25413ad..b8aa5129ae13 100644
--- a/net-dialup/misdn/ChangeLog
+++ b/net-dialup/misdn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/misdn
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.6 2005/10/17 21:09:53 genstef Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.7 2006/01/01 17:35:07 genstef Exp $
+
+*misdn-20051228 (01 Jan 2006)
+
+  01 Jan 2006; Stefan Schweizer <genstef@gentoo.org> +files/README.hfcmulti,
+  +files/mqueue.modulesd, +misdn-20051228.ebuild:
+  version bump, hard masked because it is now from the experimental mqueue branch
 
 *misdn-20051017 (17 Oct 2005)
 
diff --git a/net-dialup/misdn/Manifest b/net-dialup/misdn/Manifest
index bbf0356e16e9..562af7d40975 100644
--- a/net-dialup/misdn/Manifest
+++ b/net-dialup/misdn/Manifest
@@ -1,14 +1,18 @@
-MD5 494faa716430134c9b3535ceb96b3ba6 ChangeLog 1178
+MD5 b0c932f296220e532bdf279ac1588a20 ChangeLog 1419
+MD5 4be2313e0dafa1a491fc57e2bf3edca8 files/README.hfcmulti 2488
 MD5 591b7a0690f210221ae79ac9f1ae5633 files/change-pci_find_subsys-to-pci_get_subsys.patch 919
 MD5 9b0b0d0760eb4e9f26bd420c16a1dc5d files/digest-misdn-20050409 73
 MD5 3df61544e763fc35f2001a51edfc6f3b files/digest-misdn-20050508 73
 MD5 be8104b2e9408328f43ee4fe05d6bab4 files/digest-misdn-20050514 73
 MD5 92c3a36fcea882f904ffe816753b5447 files/digest-misdn-20050519 73
 MD5 967da5f09499c4d24de3c6030bafd180 files/digest-misdn-20051017 73
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-misdn-20051228 0
 MD5 4966ea8f0ed13958aac99675523e0b57 files/misdn.modulesd 2909
+MD5 2e3de2a37e6ce9be6c8b7892a25de0a5 files/mqueue.modulesd 2900
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 1788ac55437d5f1f6753542295913557 misdn-20050409.ebuild 3316
 MD5 ebea3cc6a50b31c2733de19ec1898085 misdn-20050508.ebuild 3342
 MD5 4fa04d78d54dfa1346e895e697011466 misdn-20050514.ebuild 3342
 MD5 ec4d12a72b13796107b3f34417e2f80d misdn-20050519.ebuild 3342
 MD5 7c81f695492a9f6e97ce6a350e5a3194 misdn-20051017.ebuild 3531
+MD5 62df3397b4ec41da0abcc423ab262989 misdn-20051228.ebuild 3577
diff --git a/net-dialup/misdn/files/README.hfcmulti b/net-dialup/misdn/files/README.hfcmulti
new file mode 100644
index 000000000000..1b29369e3fdf
--- /dev/null
+++ b/net-dialup/misdn/files/README.hfcmulti
@@ -0,0 +1,61 @@
+ * hfcmulti - low level driver for hfc-4s/hfc-8s/hfc-e1 based cards
+ * module parameters:
+
+ * type:
+        Value 1 = HFC-E1 (1 port) 0x01
+        Value 4 = HFC-4S (4 ports) 0x04
+        Value 8 = HFC-8S (8 ports) 0x08
+        Bit 8   = uLaw (instead of aLaw)
+        Bit 9   = Enable DTMF detection on all B-channels
+        Bit 10  = spare
+        Bit 11  = Set PCM bus into slave mode.
+        Bit 12  = Ignore missing frame clock on PCM bus.
+        Bit 13  = Use direct RX clock for PCM sync rather than PLL. (E1 only)
+        Bit 14  = Use external ram (128K)
+        Bit 15  = Use external ram (512K)
+        Bit 16  = Use 64 timeslots instead of 32
+        Bit 17  = Use 128 timeslots instead of anything else
+
+ * protocol:
+        NOTE: Must be given for all ports, not for the number of cards.
+        HFC-4S/HFC-8S/HFC-E1 bits:
+        Bit 0-3 = protocol
+        Bit 4   = NT-Mode
+        Bit 5   = PTP (instead of multipoint)
+
+        HFC-4S/HFC-8S only bits:
+        Bit 16  = Use master clock for this S/T interface (ony once per chip).
+        Bit 17  = transmitter line setup (non capacitive mode) DONT CARE!
+        Bit 18  = Disable E-channel. (No E-channel processing)
+        Bit 19  = Register E-channel as D-stack (TE-mode only)
+
+        HFC-E1 only bits:
+        Bit 16  = interface: 0=copper, 1=optical
+        Bit 17  = reserved (later for 32 B-channels transparent mode)
+        Bit 18  = Report LOS
+        Bit 19  = Report AIS
+        Bit 20  = Report SLIP
+        Bit 21-22 = elastic jitter buffer (1-3), Use 0 for default.
+        (all other bits are reserved and shall be 0)
+
+ * layermask:
+        NOTE: Must be given for all ports, not for the number of cards.
+        mask of layers to be used for D-channel stack
+
+ * debug:
+        NOTE: only one debug value must be given for all cards
+        enable debugging (see hfc_multi.h for debug options)
+
+ * poll:
+        NOTE: only one poll value must be given for all cards
+        Give the number of samples for each fifo process.
+        By default 128 is used. Decrease to reduce delay, increase to
+        reduce cpu load. If unsure, don't mess with it!
+        Valid is 8, 16, 32, 64, 128, 256.
+
+ * pcm:
+        NOTE: only one pcm value must be given for all cards
+        Give the id of the PCM bus. All PCM busses with the same ID
+        are expected to be connected and have equal slots.
+        Only one chip of the PCM bus must be master, the others slave.
+        -1 means no support of PCM bus.
diff --git a/net-dialup/misdn/files/digest-misdn-20051228 b/net-dialup/misdn/files/digest-misdn-20051228
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net-dialup/misdn/files/digest-misdn-20051228
diff --git a/net-dialup/misdn/files/mqueue.modulesd b/net-dialup/misdn/files/mqueue.modulesd
new file mode 100644
index 000000000000..fd9d032a874f
--- /dev/null
+++ b/net-dialup/misdn/files/mqueue.modulesd
@@ -0,0 +1,100 @@
+# Options for the mISDN card drivers
+#
+# There's currently no documentation available. You should check
+# the comments in the source code for available parameters and
+# the possible values.
+#
+# Important notice: FAX is not (yet) possible with mISDN, even
+# with the Sedlbauer Speedfax+, but voice and PPP works.
+#
+options avmfritz protocol=0x2 layermask=0x0
+options hfcpci   protocol=0x2 layermask=0x0
+options hfcmulti protocol=0x2 layermask=0x0
+options hfcsusb  protocol=0x2 layermask=0x0
+options hfcsmini protocol=0x2 layermask=0x0
+options xhfc     protocol=0x2 layermask=0x0
+options sedlfax  protocol=0x2 layermask=0x0
+options w6692pci protocol=0x2 layermask=0x0
+
+# mISDN framework
+install mISDN \
+/sbin/modprobe mISDN_core debug=0 && \
+/sbin/modprobe mISDN_l1   debug=0 && \
+/sbin/modprobe mISDN_l2   debug=0 && \
+/sbin/modprobe l3udss1    debug=0 && \
+/sbin/modprobe mISDN_dsp  debug=0xf options=0x0 && \
+/sbin/modprobe mISDN_capi debug=0
+remove mISDN \
+/sbin/modprobe -r mISDN_capi   && \
+/sbin/modprobe -r mISDN_dsp    && \
+/sbin/modprobe -r l3udss1      && \
+/sbin/modprobe -r mISDN_l2     && \
+/sbin/modprobe -r mISDN_l1     && \
+/sbin/modprobe -r mISDN_core
+
+# AVM Fritz!PCI and ISA PnP 
+install avmfritz \
+/sbin/modprobe mISDN && \
+/sbin/modprobe --ignore-install avmfritz
+remove avmfritz \
+/sbin/modprobe -r --ignore-remove avmfritz && \
+/sbin/modprobe -r mISDN
+
+# Colognechip HFC PCI
+install hfcpci \
+/sbin/modprobe mISDN && \
+/sbin/modprobe --ignore-install hfcpci
+remove hfcpci \
+/sbin/modprobe -r --ignore-remove hfcpci && \
+/sbin/modprobe -r mISDN
+
+# Colognechip HFC-4S / HFC-8S / HFC-E1
+install hfcmulti \
+/sbin/modprobe mISDN && \
+/sbin/modprobe --ignore-install hfcmulti
+remove hfcmulti \
+/sbin/modprobe -r --ignore-remove hfcmulti && \
+/sbin/modprobe -r mISDN
+
+# Colognechip HFC-S USB 
+install hfcsusb \
+/sbin/modprobe mISDN && \
+/sbin/modprobe --ignore-install hfcsusb
+remove hfcsusb \
+/sbin/modprobe -r --ignore-remove hfcsusb && \
+/sbin/modprobe -r mISDN
+
+# Colognechip HFC-S Mini
+install hfcsmini \
+/sbin/modprobe mISDN && \
+/sbin/modprobe --ignore-install hfcsmini
+remove hfcsmini \
+/sbin/modprobe -r --ignore-remove hfcsmini && \
+/sbin/modprobe -r mISDN
+
+# Colognechip XHFC
+install xhfc \
+/sbin/modprobe mISDN && \
+/sbin/modprobe --ignore-install xhfc
+remove xhfc \
+/sbin/modprobe -r --ignore-remove xhfc && \
+/sbin/modprobe -r mISDN
+
+# Sedlbauer Speedfax+
+# Important: For the sedlbauer speed fax+ to work properly
+# you have to download the firmware 'ISAR.BIN' onto the card.
+install sedlfax \
+/sbin/modprobe mISDN && \
+/sbin/modprobe --ignore-install sedlfax
+remove sedlfax \
+/sbin/modprobe -r --ignore-remove sedlfax && \
+/sbin/modprobe -r mISDN
+#/sbin/modprobe -r faxl3\
+
+# Winbond W6692 PCI
+install w6692pci \
+/sbin/modprobe mISDN && \
+/sbin/modprobe --ignore-install w6692pci
+remove w6692pci \
+/sbin/modprobe -r --ignore-remove w6692pci && \
+/sbin/modprobe -r mISDN
diff --git a/net-dialup/misdn/misdn-20051228.ebuild b/net-dialup/misdn/misdn-20051228.ebuild
new file mode 100644
index 000000000000..8c54d1b65c1a
--- /dev/null
+++ b/net-dialup/misdn/misdn-20051228.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-20051228.ebuild,v 1.1 2006/01/01 17:35:07 genstef Exp $
+
+inherit eutils linux-mod cvs
+
+MY_P="mISDN"
+DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6 (mqueue branch)."
+HOMEPAGE="http://www.isdn4linux.de/mISDN"
+SRC_URI=""
+ECVS_SERVER="cvs.isdn4linux.de:/i4ldev"
+ECVS_MODULE="${MY_P}"
+ECVS_TOP_DIR="${DISTDIR}/cvs-src/${MY_P}"
+ECVS_BRANCH="mqueue"
+ECVS_PASS="readonly"
+ECVS_CO_OPTS="-D ${PV}"
+ECVS_UP_OPTS="-dP ${ECVS_CO_OPTS}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+RDEPEND=">=net-dialup/capi4k-utils-20050322-r1"
+S="${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN"
+
+MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "hfcsmini" "xhfc" "sedlfax" "w6692pci")
+MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "HFCMINI" "XHFC" "SPEEDFAX" "W6692" )
+
+pkg_setup() {
+	CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL"
+	linux-mod_pkg_setup
+	MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:)
+	mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:)
+	mISDN_l2(net:) mISDN_dsp(net:)"
+	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} MINCLUDES=${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y"
+	BUILD_TARGETS="modules"
+	#I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m
+	# the i4l->capi simulation seems to be only for kernel 2.4
+
+	if [ -n "${MISDN_CARDS}" ]; then
+		#Check existence of user selected cards
+		for USERCARD in ${MISDN_CARDS} ; do
+			for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
+				if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then
+					MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
+					#[ "sedlfax" = "${MISDN_MODULES[CARD]}" ] && MODULE_NAMES="${MODULE_NAMES} faxl3(net:)"
+					BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
+					continue 2
+				fi
+			done
+			die "Module ${USERCARD} not present in ${P}"
+		done
+	else
+		einfo
+		einfo "You can control the modules which are built with the variable"
+		einfo "MISDN_CARDS which should contain a blank separated list"
+		einfo "of a selection from the following cards:"
+		einfo "   ${MISDN_MODULES[*]}"
+		einfo
+		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
+		ewarn "adjustments in /etc/make.conf."
+
+		# enable everything
+		for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do
+			MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)"
+			#[ "sedlfax" = "${MISDN_MODULES[CARD]}" ] && MODULE_NAMES="${MODULE_NAMES} faxl3(net:)"
+			BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y"
+		done
+	fi
+}
+
+src_unpack() {
+	cvs_src_unpack
+	cd ${S}
+	mv Makefile.v2.6 Makefile
+	sed -i "s:^\s.owner = THIS_MODULE,$::" hfcs_usb.c || die 1
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/include/linux
+	doins "${WORKDIR}/${MY_P}/include/linux/"*.h
+
+	insinto /etc/modules.d
+	newins "${FILESDIR}/${ECVS_BRANCH}.modulesd" "${PN}"
+
+	dodir /etc/udev/rules.d
+	echo 'KERNEL="obj-*", NAME="mISDN", GROUP="dialout"' \
+		> "${D}/etc/udev/rules.d/53-${PN}.rules"
+
+	dodoc Kconfig.v2.6
+	dodoc "${WORKDIR}/${MY_P}/"*misdn-init
+	dodoc "${FILESDIR}/README.hfcmulti"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	ewarn
+	ewarn "This driver is still under heavy development"
+	ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org"
+	ewarn "Please report driver bugs to the mISDN mailing-list:"
+	ewarn "    https://www.isdn4linux.de/mailman/listinfo/isdn4linux"
+}