hotplug support; new firmware path /lib/firmware; cleaned up old ebuilds (#75117)

13 files changed, 195 insertions, 121 deletions

diff --git a/net-dialup/capi4k-utils/files/20041006/README.gentoo b/net-dialup/capi4k-utils/files/20041006/README.gentoo
index dee179dda060..ea1e3a985ca3 100644
--- a/net-dialup/capi4k-utils/files/20041006/README.gentoo
+++ b/net-dialup/capi4k-utils/files/20041006/README.gentoo
@@ -11,7 +11,7 @@ here an example for the AVM B1 PCI card:
 
 First option is the name of the kernel driver, second is the firmware
 file which will be uploaded to the card. All firmware files for the
-active AVM controllers can be found in /usr/share/isdn which is the
+active AVM controllers can be found in /lib/firmware which is the
 location where all firmware files have to be placed.
 
 The 'cardnr' option can be left '-' if you only have one card.
@@ -29,8 +29,7 @@ So, if all runs smoothly, then fixate it
     rc-update add capi boot
 
 You can now install the package net-dialup/isdn4k-utils if you
-want to use all the legacy ISDN apps, such as 'isdnlog'. The
-needed driver is 'capidrv' (instead of 'hisax'). 
+want to use all the legacy ISDN apps, such as 'isdnlog'.
 
 
 pppdcapiplugin
@@ -46,4 +45,4 @@ and read the rcapid documentation.
 
 
 --
-Stefan Briesenick <sbriesen@gmx.de> 2004-11-13
+Stefan Briesenick <sbriesen@gmx.de> 2004-12-20
diff --git a/net-dialup/capi4k-utils/files/20041006/capi.blacklist b/net-dialup/capi4k-utils/files/20041006/capi.blacklist
new file mode 100644
index 000000000000..8b71e804d8e5
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/capi.blacklist
@@ -0,0 +1,24 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/20041006/capi.blacklist,v 1.1 2004/12/23 20:57:46 mrness Exp $
+
+# CAPI USB is handled via /etc/hotplug/usb/capi.usermap
+fcusb
+fcusb2
+fxusb
+fxusb_CZ
+fcdslusb
+bfusb
+
+# CAPI modules are load from /etc/init.d/capi
+b1isa
+b1pci
+b1pcmcia
+c4
+t1isa
+t1pci
+fcpci
+fcclassic
+fcdsl
+fcdsl2
+fcdslsl
diff --git a/net-dialup/capi4k-utils/files/20041006/capi.confd b/net-dialup/capi4k-utils/files/20041006/capi.confd
new file mode 100644
index 000000000000..6215987018d6
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/capi.confd
@@ -0,0 +1,11 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/20041006/capi.confd,v 1.1 2004/12/23 20:57:46 mrness Exp $
+
+# do you want to use USB hotplug?
+# if disabled, you have to configure your device in /etc/capi.conf
+CAPI_HOTPLUG_USB=1
+
+# should via hotplug added cards generate a beep?
+CAPI_HOTPLUG_BEEP=1
+
diff --git a/net-dialup/capi4k-utils/files/20041006/capi.hotplug b/net-dialup/capi4k-utils/files/20041006/capi.hotplug
new file mode 100644
index 000000000000..6577ff818ff2
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/capi.hotplug
@@ -0,0 +1,95 @@
+#!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/20041006/capi.hotplug,v 1.1 2004/12/23 20:57:46 mrness Exp $
+
+. /etc/conf.d/capi
+
+[ "$CAPI_HOTPLUG_USB" = "0" ] && exit 0
+
+# driver lookup
+cardinfo() {  # <driver>
+	/bin/sed 2>/dev/null -n "s:^\([1-9][0-9]*\) \+${1} \+\([^ ]\+\) \+\([^ ]\+\).*:\1 \3 \2:p" /proc/capi/controller
+}
+
+# AVM firmware loader
+avmusb() {  # <card> <firmware>
+	/usr/sbin/avmcapictrl load "/lib/firmware/${2}" "${1}"
+}
+
+# normalize and split product code
+# only needed, because coldplug gives other results than hotplug :-/
+IFS="/" read _A _B _C < <(echo "${PRODUCT}")
+read VENDOR DEVID PCLASS < <(/usr/bin/printf "%04x %04x %04x" "0x${_A}" "0x${_B}" "0x${_C}")
+VENDID="${VENDOR}/${DEVID}"
+DEVTMP="${DEVICE##/proc/bus/usb/}"
+USBBUS="${DEVTMP%%/*}"
+USBDEV="${DEVTMP##*/}"
+
+LOCK="/tmp/.capi-usb-${USBBUS}-${USBDEV}"
+LOADER=""
+DRIVER=""
+FIRMWARE=""
+
+# select driver and firmware
+case "${VENDID}" in
+	"057c/0c00") # FRITZCARD!USB
+		DRIVER="fcusb"
+		;;
+	"057c/1000") # FRITZCARD!USB v2.0
+		LOADER="avmusb"
+		DRIVER="fcusb2"
+		FIRMWARE="fus2base.frm"
+		;;
+	"057c/1900") # FRITZCARD!USB v2.1
+		LOADER="avmusb"
+		DRIVER="fcusb2"
+		FIRMWARE="fus3base.frm"
+		;;
+	"057c/2000") # FRITZX!USB
+		DRIVER="fxusb"
+		;;
+	"057c/2200") # BlueFRITZ!USB
+		DRIVER="bfusb"
+		;;
+	"057c/2300") # FRITZDSL!USB
+		LOADER="avmusb"
+		DRIVER="fcdslusb"
+		FIRMWARE="fdsubase.frm"
+		;;
+	"057c/2800") # FRITZX!USB OEM
+		DRIVER="fxusb_CZ"
+		;;
+	"057c/3500") # FRITZDSL!USB SL
+		LOADER="avmusb"
+		DRIVER="fcdslslusb"
+		FIRMWARE="fdlubase.frm"
+		;;
+	*) # unknown card
+		echo "unknown USB product: $VENDID"
+		exit 1
+esac
+
+case "$ACTION" in
+	add)
+		/bin/ln 2>/dev/null -s "$$" "$LOCK" || exit 0
+		for MODULE in kernelcapi capi capidrv $DRIVER; do
+			/sbin/modprobe -s $MODULE || exit 1
+		done
+		if [ -n "$LOADER" -a -n "$FIRMWARE" ]; then
+			CNT=0  # wait for udev
+			while [ ! -e /dev/capi20 -a $CNT -lt 10 ]; do
+				sleep 1; : $((CNT++))
+			done
+			read CARD NAME STATUS < <(cardinfo $DRIVER)
+			[ "$STATUS" = "detected" ] && $LOADER $CARD $FIRMWARE
+		fi
+		[ "$CAPI_HOTPLUG_BEEP" = "0" ] || echo -en "\033[10;1200]\a\033[10;262]" > /dev/console
+		/bin/rm -f "$LOCK"
+		;;
+	remove)
+		/sbin/modprobe -sqr $DRIVER
+		[ "$CAPI_HOTPLUG_BEEP" = "0" ] || echo -en "\033[10;300]\a\033[10;262]" > /dev/console
+		;;
+esac
+exit 0
diff --git a/net-dialup/capi4k-utils/files/20041006/capi.initd b/net-dialup/capi4k-utils/files/20041006/capi.initd
new file mode 100644
index 000000000000..947556ab4901
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/capi.initd
@@ -0,0 +1,54 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/20041006/capi.initd,v 1.1 2004/12/23 20:57:46 mrness Exp $
+
+opts="start stop info"
+
+depend() {
+	after isapnp
+}
+
+get_modules() {
+	/usr/bin/cut 2>/dev/null -f2 -d' ' /proc/capi/controller
+}
+
+start() {
+	if [ ! -e /etc/capi.conf ] ; then
+		eerror "You're missing /etc/capi.conf (comes with a capi-driver)."
+		eerror "Emerge net-dialup/fcpci if you are having an AVM Fritz!Card PCI"
+		return 1
+	fi
+
+	ebegin "Loading CAPI"
+
+	/usr/sbin/capiinit 2>/dev/null -c /dev/null prepare
+	/sbin/modprobe -s capidrv
+	
+	if /usr/sbin/capiinit activate ; then
+		while read INFO; do einfo "  $INFO"; done < /proc/capi/controller
+	fi
+	
+	eend $?
+}
+
+stop() {
+	local DRIVERS=$(get_modules)
+
+	ebegin "Unloading CAPI"
+
+	/sbin/modprobe -sqr capidrv	
+	/usr/sbin/capiinit 2>/dev/null stop
+	for DRV in $DRIVERS; do	/sbin/modprobe -sqr $DRV; done
+	
+	eend $?
+}
+
+info() {
+	if [ -e /proc/capi/controller ]; then
+		while read INFO; do einfo "$INFO"; done < /proc/capi/controller
+	else
+		eerror "ERROR: CAPI not loaded"
+		return 1
+	fi
+}
diff --git a/net-dialup/capi4k-utils/files/20041006/capi.usermap b/net-dialup/capi4k-utils/files/20041006/capi.usermap
new file mode 100644
index 000000000000..0285836dd726
--- /dev/null
+++ b/net-dialup/capi4k-utils/files/20041006/capi.usermap
@@ -0,0 +1,8 @@
+capi                 0x0003      0x057c   0x0c00    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+capi                 0x0003      0x057c   0x1000    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+capi                 0x0003      0x057c   0x1900    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+capi                 0x0003      0x057c   0x2000    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+capi                 0x0003      0x057c   0x2200    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+capi                 0x0003      0x057c   0x2300    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+capi                 0x0003      0x057c   0x2800    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+capi                 0x0003      0x057c   0x3500    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
diff --git a/net-dialup/capi4k-utils/files/capi-init-20040810 b/net-dialup/capi4k-utils/files/capi-init-20040810
deleted file mode 100644
index 1493fa559f77..000000000000
--- a/net-dialup/capi4k-utils/files/capi-init-20040810
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi-init-20040810,v 1.2 2004/09/27 10:12:53 dragonheart Exp $
-
-depend() {
-	after isapnp
-}
-
-start() {
-	if [ ! -e /etc/capi.conf ] ; then
-		eerror "You're missing /etc/capi.conf (comes with a capi-driver)."
-		eerror "Emerge net-dialup/fcpci if you are having an AVM Fritz!Card PCI"
-		return 1
-	fi
-	ebegin "Starting CAPI"
-	/sbin/capiinit start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping CAPI"
-	/sbin/capiinit stop
-	eend $?
-}
diff --git a/net-dialup/capi4k-utils/files/capi-init-20041006 b/net-dialup/capi4k-utils/files/capi-init-20041006
deleted file mode 100644
index bfa88b5a3c91..000000000000
--- a/net-dialup/capi4k-utils/files/capi-init-20041006
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capi4k-utils/files/capi-init-20041006,v 1.2 2004/10/31 22:30:12 dragonheart Exp $
-
-depend() {
-	after isapnp
-}
-
-start() {
-	if [ ! -e /etc/capi.conf ] ; then
-		eerror "You're missing /etc/capi.conf (comes with a capi-driver)."
-		eerror "Emerge net-dialup/fcpci if you are having an AVM Fritz!Card PCI"
-		return 1
-	fi
-	ebegin "Starting CAPI"
-	/usr/sbin/capiinit start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping CAPI"
-	/usr/sbin/capiinit stop
-	eend $?
-}
diff --git a/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06-fPIC.patch b/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06-fPIC.patch
deleted file mode 100644
index fc34a613e5be..000000000000
--- a/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06-fPIC.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- capi20/Makefile.am_old	2004-10-30 13:15:45.099518775 +0200
-+++ capi20/Makefile.am	2004-10-30 13:16:13.422481911 +0200
-@@ -14,6 +14,7 @@
- 
- libcapi20dyn_a_SOURCES = capidyn.c
- libcapi20dyn_a_CFLAGS = -fPIC
-+CFLAGS = -fPIC
- # libcapi20_la_LIBADD = $(LIBADD_DL)
- 
- $(OBJECTS): libtool
diff --git a/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06.patch b/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06.patch
deleted file mode 100644
index 7ec19836fe10..000000000000
--- a/net-dialup/capi4k-utils/files/capi4k-utils-2004-10-06.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur capi4k-utils_old/capi20/capiutils.h capi4k-utils/capi20/capiutils.h
---- capi4k-utils_old/capi20/capiutils.h	2004-10-06 17:13:33.000000000 +0200
-+++ capi4k-utils/capi20/capiutils.h	2004-10-14 11:18:07.049529668 +0200
-@@ -918,7 +918,7 @@
- 		,_cstruct BChannelinformation
- 		,_cstruct Keypadfacility
- 		,_cstruct Useruserdata
--                ,_cstruct Facilitydataarra);
-+                ,_cstruct Facilitydataarray);
- unsigned CONNECT_REQ (_cmsg *cmsg, _cword ApplId, _cword Messagenumber
- 		,_cdword adr
- 		,_cword CIPValue
-diff -Naur capi4k-utils_old/capifax/capi.c capi4k-utils/capifax/capi.c
---- capi4k-utils_old/capifax/capi.c	2004-08-10 14:11:20.000000000 +0200
-+++ capi4k-utils/capifax/capi.c	2004-10-14 11:16:52.699740737 +0200
-@@ -82,7 +82,7 @@
- 			 * of the application
- 			 */
- 			ALERT_REQ (CMSG, Appl_Id, 0, CONNECT_IND_PLCI(CMSG),
--				   NULL, NULL, NULL, NULL, NULL);
-+				   NULL, NULL, NULL, NULL);
- 			/* inform the user application */
- 			SetState(Connection, D_ConnectPending);
- 			IncomingCall(Connection, GetCallingPartyNumber (Connection));
-diff -Naur capi4k-utils_old/.config capi4k-utils/.config
---- capi4k-utils_old/.config	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils/.config	2004-02-23 19:29:23.000000000 +0100
-@@ -0,0 +1,11 @@
-+#
-+# Automatically generated by make menuconfig: don't edit
-+#
-+CONFIG_KERNELDIR='/usr/src/linux'
-+CONFIG_BINDIR='/usr/bin'
-+CONFIG_SBINDIR='/usr/sbin'
-+CONFIG_MANDIR='/usr/share/man'
-+CONFIG_AVMCAPICTRL=y
-+CONFIG_CAPIFAX=y
-+CONFIG_RCAPID=y
-+CONFIG_PPPDCAPIPLUGIN=y
-diff -Naur capi4k-utils_old/scripts/autoconf.h capi4k-utils/scripts/autoconf.h
---- capi4k-utils_old/scripts/autoconf.h	1970-01-01 01:00:00.000000000 +0100
-+++ capi4k-utils/scripts/autoconf.h	2004-02-23 19:29:23.000000000 +0100
-@@ -0,0 +1,12 @@
-+/*
-+ * Automatically generated by make menuconfig: don't edit
-+ */
-+#define AUTOCONF_INCLUDED
-+#define CONFIG_KERNELDIR "/usr/src/linux"
-+#define CONFIG_BINDIR "/usr/bin"
-+#define CONFIG_SBINDIR "/usr/sbin"
-+#define CONFIG_MANDIR "/usr/share/man"
-+#define CONFIG_AVMCAPICTRL 1
-+#define CONFIG_CAPIFAX
-+#define CONFIG_RCAPID
-+#define CONFIG_PPPDCAPIPLUGIN 1
diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20040810 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20040810
deleted file mode 100644
index 72474d6b07ac..000000000000
--- a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20040810
+++ /dev/null
@@ -1 +0,0 @@
-MD5 29cf523cbe577a71fd41e2bfc68a36ad capi4k-utils-2004-08-10.tar.gz 837463
diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006
deleted file mode 100644
index 63aefc8b31c8..000000000000
--- a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006
+++ /dev/null
@@ -1 +0,0 @@
-MD5 54992ff362ca44629fdf59773a6864cd capi4k-utils-2004-10-06.tar.gz 743667
diff --git a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2 b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r4
index 34abafb72602..34abafb72602 100644
--- a/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r2
+++ b/net-dialup/capi4k-utils/files/digest-capi4k-utils-20041006-r4