mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
isdn: move capi drivers to staging
I tried to find any indication of whether the capi drivers are still in use, and have not found anything from a long time ago. With public ISDN networks almost completely shut down over the past 12 months, there is very little you can actually do with this hardware. The main remaining use case would be to connect ISDN voice phones to an in-house installation with Asterisk or LCR, but anyone trying this in turn seems to be using either the mISDN driver stack, or out-of-tree drivers from the hardware vendors. I may of course have missed something, so I would suggest moving these three drivers (avm, hysdn, gigaset) into drivers/staging/ just in case someone still uses them. If nobody complains, we can remove them entirely in six months, or otherwise move the core code and any drivers that are still needed back into drivers/isdn. As Paul Bolle notes, he is still testing the gigaset driver as long as he can, but the Dutch ISDN network will be shut down in September 2019, which puts an end to that. Marcel Holtmann still maintains the Bluetooth CMTP profile and wants to keep that alive, so the actual CAPI subsystem code remains in place for now, after all other drivers are gone, CMTP and CAPI can be merged into a single driver directory. Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
99c2aa151a
commit
6d97985072
52 changed files with 81 additions and 42 deletions
20
MAINTAINERS
20
MAINTAINERS
|
@ -6679,9 +6679,7 @@ M: Paul Bolle <pebolle@tiscali.nl>
|
|||
L: gigaset307x-common@lists.sourceforge.net
|
||||
W: http://gigaset307x.sourceforge.net/
|
||||
S: Odd Fixes
|
||||
F: Documentation/isdn/README.gigaset
|
||||
F: drivers/isdn/gigaset/
|
||||
F: include/uapi/linux/gigaset_dev.h
|
||||
F: drivers/staging/isdn/gigaset/
|
||||
|
||||
GNSS SUBSYSTEM
|
||||
M: Johan Hovold <johan@kernel.org>
|
||||
|
@ -8362,15 +8360,25 @@ S: Supported
|
|||
W: http://www.linux-iscsi.org
|
||||
F: drivers/infiniband/ulp/isert
|
||||
|
||||
ISDN SUBSYSTEM
|
||||
ISDN/mISDN SUBSYSTEM
|
||||
M: Karsten Keil <isdn@linux-pingi.de>
|
||||
L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
|
||||
L: netdev@vger.kernel.org
|
||||
W: http://www.isdn4linux.de
|
||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
|
||||
S: Maintained
|
||||
F: drivers/isdn/mISDN
|
||||
F: drivers/isdn/hardware
|
||||
|
||||
ISDN/CAPI SUBSYSTEM
|
||||
M: Karsten Keil <isdn@linux-pingi.de>
|
||||
L: isdn4linux@listserv.isdn4linux.de (subscribers-only)
|
||||
L: netdev@vger.kernel.org
|
||||
W: http://www.isdn4linux.de
|
||||
S: Odd Fixes
|
||||
F: Documentation/isdn/
|
||||
F: drivers/isdn/
|
||||
F: drivers/isdn/capi/
|
||||
F: drivers/staging/isdn/
|
||||
F: net/bluetooth/cmtp/
|
||||
F: include/linux/isdn/
|
||||
F: include/uapi/linux/isdn/
|
||||
|
||||
|
|
|
@ -21,33 +21,8 @@ menuconfig ISDN
|
|||
|
||||
if ISDN
|
||||
|
||||
menuconfig ISDN_CAPI
|
||||
tristate "CAPI 2.0 subsystem"
|
||||
help
|
||||
This provides CAPI (the Common ISDN Application Programming
|
||||
Interface) Version 2.0, a standard making it easy for programs to
|
||||
access ISDN hardware in a device independent way. (For details see
|
||||
<http://www.capi.org/>.) CAPI supports making and accepting voice
|
||||
and data connections, controlling call options and protocols,
|
||||
as well as ISDN supplementary services like call forwarding or
|
||||
three-party conferences (if supported by the specific hardware
|
||||
driver).
|
||||
|
||||
Select this option and the appropriate hardware driver below if
|
||||
you have an ISDN adapter supported by the CAPI subsystem.
|
||||
|
||||
if ISDN_CAPI
|
||||
|
||||
source "drivers/isdn/capi/Kconfig"
|
||||
|
||||
source "drivers/isdn/hardware/Kconfig"
|
||||
|
||||
endif # ISDN_CAPI
|
||||
|
||||
source "drivers/isdn/gigaset/Kconfig"
|
||||
|
||||
source "drivers/isdn/hysdn/Kconfig"
|
||||
|
||||
source "drivers/isdn/mISDN/Kconfig"
|
||||
|
||||
endif # ISDN
|
||||
|
|
|
@ -6,5 +6,3 @@
|
|||
obj-$(CONFIG_ISDN_CAPI) += capi/
|
||||
obj-$(CONFIG_MISDN) += mISDN/
|
||||
obj-$(CONFIG_ISDN) += hardware/
|
||||
obj-$(CONFIG_HYSDN) += hysdn/
|
||||
obj-$(CONFIG_ISDN_DRV_GIGASET) += gigaset/
|
||||
|
|
|
@ -1,4 +1,22 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
menuconfig ISDN_CAPI
|
||||
tristate "CAPI 2.0 subsystem"
|
||||
help
|
||||
This provides CAPI (the Common ISDN Application Programming
|
||||
Interface) Version 2.0, a standard making it easy for programs to
|
||||
access ISDN hardware in a device independent way. (For details see
|
||||
<http://www.capi.org/>.) CAPI supports making and accepting voice
|
||||
and data connections, controlling call options and protocols,
|
||||
as well as ISDN supplementary services like call forwarding or
|
||||
three-party conferences (if supported by the specific hardware
|
||||
driver).
|
||||
|
||||
This subsystem requires a hardware specific driver.
|
||||
See CONFIG_BT_CMTP for the last remaining regular driver
|
||||
in the kernel that uses the CAPI subsystem.
|
||||
|
||||
if ISDN_CAPI
|
||||
|
||||
config CAPI_TRACE
|
||||
bool "CAPI trace support"
|
||||
default y
|
||||
|
@ -34,3 +52,5 @@ config ISDN_CAPI_CAPIDRV_VERBOSE
|
|||
If you say Y here, the capidrv interface will give verbose reasons
|
||||
for disconnecting. This will increase the size of the kernel by 7 KB.
|
||||
If unsure, say N.
|
||||
|
||||
endif
|
||||
|
|
|
@ -13,3 +13,5 @@ obj-$(CONFIG_ISDN_CAPI_CAPIDRV) += capidrv.o
|
|||
|
||||
kernelcapi-y := kcapi.o capiutil.o capilib.o
|
||||
kernelcapi-$(CONFIG_PROC_FS) += kcapi_proc.o
|
||||
|
||||
ccflags-y += -I$(srctree)/$(src)/../include -I$(srctree)/$(src)/../include/uapi
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
#
|
||||
# ISDN hardware drivers
|
||||
#
|
||||
comment "CAPI hardware drivers"
|
||||
|
||||
source "drivers/isdn/hardware/avm/Kconfig"
|
||||
|
|
@ -3,5 +3,4 @@
|
|||
|
||||
# Object files in subdirectories
|
||||
|
||||
obj-$(CONFIG_CAPI_AVM) += avm/
|
||||
obj-$(CONFIG_MISDN) += mISDN/
|
||||
|
|
|
@ -118,4 +118,6 @@ source "drivers/staging/fieldbus/Kconfig"
|
|||
|
||||
source "drivers/staging/kpc2000/Kconfig"
|
||||
|
||||
source "drivers/staging/isdn/Kconfig"
|
||||
|
||||
endif # STAGING
|
||||
|
|
|
@ -49,3 +49,4 @@ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
|
|||
obj-$(CONFIG_EROFS_FS) += erofs/
|
||||
obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/
|
||||
obj-$(CONFIG_KPC2000) += kpc2000/
|
||||
obj-$(CONFIG_ISDN_CAPI) += isdn/
|
||||
|
|
12
drivers/staging/isdn/Kconfig
Normal file
12
drivers/staging/isdn/Kconfig
Normal file
|
@ -0,0 +1,12 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
menu "ISDN CAPI drivers"
|
||||
depends on ISDN_CAPI
|
||||
|
||||
source "drivers/staging/isdn/avm/Kconfig"
|
||||
|
||||
source "drivers/staging/isdn/gigaset/Kconfig"
|
||||
|
||||
source "drivers/staging/isdn/hysdn/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
8
drivers/staging/isdn/Makefile
Normal file
8
drivers/staging/isdn/Makefile
Normal file
|
@ -0,0 +1,8 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Makefile for the kernel ISDN subsystem and device drivers.
|
||||
|
||||
# Object files in subdirectories
|
||||
|
||||
obj-$(CONFIG_CAPI_AVM) += avm/
|
||||
obj-$(CONFIG_HYSDN) += hysdn/
|
||||
obj-$(CONFIG_ISDN_DRV_GIGASET) += gigaset/
|
22
drivers/staging/isdn/TODO
Normal file
22
drivers/staging/isdn/TODO
Normal file
|
@ -0,0 +1,22 @@
|
|||
TODO: Remove in late 2019 unless there are users
|
||||
|
||||
|
||||
I tried to find any indication of whether the capi drivers are
|
||||
still in use, and have not found anything from a long time ago.
|
||||
|
||||
With public ISDN networks almost completely shut down over the past 12
|
||||
months, there is very little you can actually do with this hardware. The
|
||||
main remaining use case would be to connect ISDN voice phones to an
|
||||
in-house installation with Asterisk or LCR, but anyone trying this in
|
||||
turn seems to be using either the mISDN driver stack, or out-of-tree
|
||||
drivers from the hardware vendors.
|
||||
|
||||
I may of course have missed something, so I would suggest moving
|
||||
these into drivers/staging/ just in case someone still uses one
|
||||
of the three remaining in-kernel drivers (avm, hysdn, gigaset).
|
||||
|
||||
If nobody complains, we can remove them entirely in six months,
|
||||
or otherwise move the core code and any drivers that are still
|
||||
needed back into drivers/isdn.
|
||||
|
||||
Arnd Bergmann <arnd@arndb.de>
|
Loading…
Reference in a new issue