Move CAPI subsystem and AVM drivers to their new place in the tree.

drivers/isdn/Config.in

@@ -16,6 +16,14 @@ if [ "$CONFIG_NET" != "n" ]; then
          source drivers/isdn/i4l/Config.in
       fi
       endmenu
+
+      comment 'CAPI subsystem'
+
+      tristate 'CAPI2.0 support' CONFIG_ISDN_CAPI
+      if [ "$CONFIG_ISDN_CAPI" != "n" ]; then
+         source drivers/isdn/capi/Config.in
+         source drivers/isdn/hardware/Config.in
+      fi
    fi
 fi
 endmenu

drivers/isdn/Makefile

@@ -6,14 +6,15 @@ O_TARGET	:= vmlinux-obj.o
 
 # Object files in subdirectories
 
-mod-subdirs				:= i4l hisax avmb1 eicon
+mod-subdirs				:= i4l hisax capi eicon
 subdir-$(CONFIG_ISDN)			+= i4l
+subdir-$(CONFIG_ISDN_CAPI)		+= capi
+subdir-$(CONFIG_ISDN_CAPI)		+= hardware
 subdir-$(CONFIG_ISDN_DIVERSION)		+= divert
 subdir-$(CONFIG_ISDN_DRV_HISAX)		+= hisax
 subdir-$(CONFIG_ISDN_DRV_ICN)		+= icn
 subdir-$(CONFIG_ISDN_DRV_PCBIT)		+= pcbit
 subdir-$(CONFIG_ISDN_DRV_SC)		+= sc
-subdir-$(CONFIG_ISDN_CAPI)		+= avmb1
 subdir-$(CONFIG_ISDN_DRV_LOOP)		+= isdnloop
 subdir-$(CONFIG_ISDN_DRV_ACT2000)	+= act2000
 subdir-$(CONFIG_ISDN_DRV_EICON)		+= eicon

drivers/isdn/avmb1/Config.in → drivers/isdn/capi/Config.in

@@ -17,17 +17,3 @@ if [ "$CONFIG_ISDN_CAPI" != "n" ]; then
    fi
    dep_tristate    '  CAPI2.0 capidrv interface support' CONFIG_ISDN_CAPI_CAPIDRV $CONFIG_ISDN_CAPI $CONFIG_ISDN
 fi
-
-# CAPI drivers
-
-if [ "$CONFIG_ISDN_CAPI" != "n" ]; then
-   dep_tristate '  AVM B1 ISA support' CONFIG_ISDN_DRV_AVMB1_B1ISA $CONFIG_ISDN_CAPI
-   dep_tristate '  AVM B1 PCI support' CONFIG_ISDN_DRV_AVMB1_B1PCI $CONFIG_ISDN_CAPI $CONFIG_PCI
-   dep_mbool    '    AVM B1 PCI V4 support' CONFIG_ISDN_DRV_AVMB1_B1PCIV4 $CONFIG_ISDN_DRV_AVMB1_B1PCI
-   dep_tristate '  AVM T1/T1-B ISA support' CONFIG_ISDN_DRV_AVMB1_T1ISA $CONFIG_ISDN_CAPI
-   dep_tristate '  AVM B1/M1/M2 PCMCIA support' CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_ISDN_CAPI
-   dep_tristate '  AVM B1/M1/M2 PCMCIA cs module' CONFIG_ISDN_DRV_AVMB1_AVM_CS $CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_PCMCIA
-   dep_tristate '  AVM T1/T1-B PCI support' CONFIG_ISDN_DRV_AVMB1_T1PCI $CONFIG_ISDN_CAPI $CONFIG_PCI
-   dep_tristate '  AVM C4/C2 support' CONFIG_ISDN_DRV_AVMB1_C4 $CONFIG_ISDN_CAPI $CONFIG_PCI
-fi
-

drivers/isdn/capi/Makefile

+# Makefile for the CAPI subsystem.
+
+# The target object and module list name.
+
+O_TARGET	:= vmlinux-obj.o
+
+# Objects that export symbols.
+
+export-objs	:= kcapi.o capiutil.o capifs.o
+
+# Multipart objects.
+
+kernelcapi-objs	:= kcapi.o
+
+# Ordering constraints: kernelcapi.o first
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_ISDN_CAPI)			+= kernelcapi.o capiutil.o
+obj-$(CONFIG_ISDN_CAPI_CAPI20)		+= capi.o 
+obj-$(CONFIG_ISDN_CAPI_CAPIDRV)		+= capidrv.o
+obj-$(CONFIG_ISDN_CAPI_CAPIFS)		+= capifs.o
+
+# The global Rules.make.
+
+include $(TOPDIR)/Rules.make

drivers/isdn/avmb1/capi.c → drivers/isdn/capi/capi.c

@@ -38,8 +38,8 @@
 #include <linux/kernelcapi.h>
 #include <linux/init.h>
 #include <linux/devfs_fs_kernel.h>
-#include "capiutil.h"
-#include "capicmd.h"
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capicmd.h>
 #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
 #include "capifs.h"
 #endif

drivers/isdn/avmb1/capidrv.c → drivers/isdn/capi/capidrv.c

@@ -30,8 +30,8 @@
 #include <linux/ctype.h>
 #include <linux/init.h>
 
-#include "capiutil.h"
-#include "capicmd.h"
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capicmd.h>
 #include "capidrv.h"
 
 static char *revision = "$Revision: 1.39.6.7 $";

drivers/isdn/avmb1/capiutil.c → drivers/isdn/capi/capiutil.c

@@ -18,7 +18,7 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/config.h>
-#include "capiutil.h"
+#include <linux/isdn/capiutil.h>
 
 MODULE_DESCRIPTION("CAPI4Linux: CAPI message conversion support");
 MODULE_AUTHOR("Carsten Paeth");

drivers/isdn/avmb1/kcapi.c → drivers/isdn/capi/kcapi.c

@@ -25,9 +25,9 @@
 #include <linux/locks.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
-#include "capicmd.h"
-#include "capiutil.h"
-#include "capilli.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capilli.h>
 #ifdef CONFIG_AVMB1_COMPAT
 #include <linux/b1lli.h>
 #endif

drivers/isdn/eicon/eicon_mod.c

@@ -33,7 +33,7 @@
 
 #include "eicon.h"
 
-#include "../avmb1/capicmd.h"  /* this should be moved in a common place */
+#include <linux/isdn/capicmd.h>
 
 #undef N_DATA
 #include "adapter.h"

drivers/isdn/hardware/Config.in

+#
+# ISDN hardware drivers
+#
+
+source drivers/isdn/hardware/avm/Config.in

drivers/isdn/hardware/Makefile

+# Makefile for the CAPI hardware drivers
+
+# The target object and module list name.
+
+O_TARGET	:= vmlinux-obj.o
+
+# Object files in subdirectories
+
+mod-subdirs				:= avm
+subdir-$(CONFIG_CAPI_AVM)		+= avm
+
+obj-y += $(addsuffix /vmlinux-obj.o, $(subdir-y))
+
+# The global Rules.make.
+
+include $(TOPDIR)/Rules.make

drivers/isdn/hardware/avm/Config.in

+#
+# ISDN AVM drivers
+#
+
+mainmenu_option next_comment
+comment 'Drivers for active AVM cards'
+
+bool 'Support AVM cards' CONFIG_CAPI_AVM
+
+if [ "$CONFIG_CAPI_AVM" != "n" ]; then
+   dep_tristate '  AVM B1 ISA support' CONFIG_ISDN_DRV_AVMB1_B1ISA               $CONFIG_ISDN_CAPI
+
+   dep_tristate '  AVM B1 PCI support'            CONFIG_ISDN_DRV_AVMB1_B1PCI    $CONFIG_ISDN_CAPI $CONFIG_PCI
+   dep_mbool    '    AVM B1 PCI V4 support'       CONFIG_ISDN_DRV_AVMB1_B1PCIV4  $CONFIG_ISDN_DRV_AVMB1_B1PCI
+
+   dep_tristate '  AVM T1/T1-B ISA support'       CONFIG_ISDN_DRV_AVMB1_T1ISA    $CONFIG_ISDN_CAPI
+q
+   dep_tristate '  AVM B1/M1/M2 PCMCIA support'   CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_ISDN_CAPI
+
+   dep_tristate '  AVM B1/M1/M2 PCMCIA cs module' CONFIG_ISDN_DRV_AVMB1_AVM_CS   $CONFIG_ISDN_DRV_AVMB1_B1PCMCIA $CONFIG_PCMCIA
+
+   dep_tristate '  AVM T1/T1-B PCI support'       CONFIG_ISDN_DRV_AVMB1_T1PCI    $CONFIG_ISDN_CAPI $CONFIG_PCI
+
+   dep_tristate '  AVM C4/C2 support'             CONFIG_ISDN_DRV_AVMB1_C4       $CONFIG_ISDN_CAPI $CONFIG_PCI
+fi
+
+endmenu

drivers/isdn/avmb1/Makefile → drivers/isdn/hardware/avm/Makefile

-# Makefile for the AVM ISDN device drivers and CAPI subsystem.
+# Makefile for the AVM ISDN device drivers
 
 # The target object and module list name.
 
@@ -6,20 +6,10 @@ O_TARGET	:= vmlinux-obj.o
 
 # Objects that export symbols.
 
-export-objs	:= kcapi.o capiutil.o b1dma.o b1pcmcia.o b1.o capifs.o
-
-# Multipart objects.
-
-kernelcapi-objs	:= kcapi.o
-
-# Ordering constraints: kernelcapi.o first
+export-objs	:= b1dma.o b1pcmcia.o b1.o
 
 # Each configuration option enables a list of files.
 
-obj-$(CONFIG_ISDN_CAPI)			+= kernelcapi.o capiutil.o
-obj-$(CONFIG_ISDN_CAPI_CAPI20)		+= capi.o 
-obj-$(CONFIG_ISDN_CAPI_CAPIDRV)		+= capidrv.o
-obj-$(CONFIG_ISDN_CAPI_CAPIFS)		+= capifs.o
 obj-$(CONFIG_ISDN_DRV_AVMB1_B1ISA)	+= b1isa.o b1.o
 obj-$(CONFIG_ISDN_DRV_AVMB1_B1PCI)	+= b1pci.o b1.o b1dma.o
 obj-$(CONFIG_ISDN_DRV_AVMB1_B1PCMCIA)	+= b1pcmcia.o b1.o

drivers/isdn/avmb1/b1.c → drivers/isdn/hardware/avm/b1.c

@@ -23,10 +23,10 @@
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <linux/netdevice.h>
-#include "capilli.h"
+#include <linux/isdn/capilli.h>
 #include "avmcard.h"
-#include "capicmd.h"
-#include "capiutil.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
 
 static char *revision = "$Revision: 1.1.4.1.2.1 $";
 

drivers/isdn/avmb1/b1dma.c → drivers/isdn/hardware/avm/b1dma.c

@@ -23,10 +23,10 @@
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <linux/netdevice.h>
-#include "capilli.h"
+#include <linux/isdn/capilli.h>
 #include "avmcard.h"
-#include "capicmd.h"
-#include "capiutil.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
 
 #if BITS_PER_LONG != 32
 #error FIXME: driver requires 32-bit platform

drivers/isdn/avmb1/b1isa.c → drivers/isdn/hardware/avm/b1isa.c

@@ -19,9 +19,9 @@
 #include <linux/capi.h>
 #include <linux/init.h>
 #include <asm/io.h>
-#include "capicmd.h"
-#include "capiutil.h"
-#include "capilli.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capilli.h>
 #include "avmcard.h"
 
 static char *revision = "$Revision: 1.10.6.6 $";

drivers/isdn/avmb1/b1pci.c → drivers/isdn/hardware/avm/b1pci.c

@@ -21,9 +21,9 @@
 #include <linux/capi.h>
 #include <asm/io.h>
 #include <linux/init.h>
-#include "capicmd.h"
-#include "capiutil.h"
-#include "capilli.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capilli.h>
 #include "avmcard.h"
 
 static char *revision = "$Revision: 1.1.4.1.2.1 $";

drivers/isdn/avmb1/b1pcmcia.c → drivers/isdn/hardware/avm/b1pcmcia.c

@@ -20,9 +20,9 @@
 #include <asm/io.h>
 #include <linux/capi.h>
 #include <linux/b1pcmcia.h>
-#include "capicmd.h"
-#include "capiutil.h"
-#include "capilli.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capilli.h>
 #include "avmcard.h"
 
 static char *revision = "$Revision: 1.12.6.5 $";

drivers/isdn/avmb1/c4.c → drivers/isdn/hardware/avm/c4.c

@@ -24,9 +24,9 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/netdevice.h>
-#include "capicmd.h"
-#include "capiutil.h"
-#include "capilli.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capilli.h>
 #include "avmcard.h"
 
 static char *revision = "$Revision: 1.1.4.1.2.1 $";

drivers/isdn/avmb1/t1isa.c → drivers/isdn/hardware/avm/t1isa.c

@@ -20,9 +20,9 @@
 #include <linux/kernelcapi.h>
 #include <linux/init.h>
 #include <asm/io.h>
-#include "capicmd.h"
-#include "capiutil.h"
-#include "capilli.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capilli.h>
 #include "avmcard.h"
 
 static char *revision = "$Revision: 1.16.6.7 $";

drivers/isdn/avmb1/t1pci.c → drivers/isdn/hardware/avm/t1pci.c

@@ -21,9 +21,9 @@
 #include <linux/capi.h>
 #include <linux/init.h>
 #include <asm/io.h>
-#include "capicmd.h"
-#include "capiutil.h"
-#include "capilli.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capilli.h>
 #include "avmcard.h"
 
 static char *revision = "$Revision: 1.1.4.1.2.1 $";

drivers/isdn/hisax/callc.c

@@ -20,7 +20,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include "hisax.h"
-#include "../avmb1/capicmd.h"  /* this should be moved in a common place */
+#include <linux/isdn/capicmd.h>
 
 #ifdef MODULE
 #define MOD_USE_COUNT ( GET_USE_COUNT (&__this_module))

drivers/isdn/hisax/hisax.h

@@ -493,7 +493,7 @@ struct BCState {
 	u_char *conmsg;
 	struct timer_list transbusy;
 	struct tq_struct tqueue;
-	int event;
+	unsigned long event;
 	int  (*BC_SetStack) (struct PStack *, struct BCState *);
 	void (*BC_Close) (struct BCState *);
 #ifdef ERROR_STATISTIC

drivers/isdn/hysdn/hysdn_defs.h

@@ -32,9 +32,9 @@
 
 #ifdef CONFIG_HYSDN_CAPI
 #include <linux/capi.h>
-#include "../avmb1/capicmd.h"
-#include "../avmb1/capiutil.h"
-#include "../avmb1/capilli.h"
+#include <linux/isdn/capicmd.h>
+#include <linux/isdn/capiutil.h>
+#include <linux/isdn/capilli.h>
 
 /***************************/
 /*   CAPI-Profile values.  */

drivers/isdn/i4l/Config.in

@@ -39,7 +39,6 @@ source drivers/isdn/sc/Config.in
 source drivers/isdn/act2000/Config.in
 source drivers/isdn/eicon/Config.in
 source drivers/isdn/tpam/Config.in
-source drivers/isdn/avmb1/Config.in
 source drivers/isdn/hysdn/Config.in
 
 endmenu

drivers/isdn/i4l/isdn_common.c

@@ -402,7 +402,7 @@ isdn_all_eaz(int di, int ch)
  * Begin of a CAPI like LL<->HL interface, currently used only for 
  * supplementary service (CAPI 2.0 part III)
  */
-#include "avmb1/capicmd.h"  /* this should be moved in a common place */
+#include <linux/isdn/capicmd.h>
 
 int
 isdn_capi_rec_hl_msg(capi_msg *cm) {

drivers/isdn/i4l/isdn_tty.c

@@ -789,7 +789,7 @@ isdn_tty_modem_hup(modem_info * info, int local)
  * Begin of a CAPI like interface, currently used only for 
  * supplementary service (CAPI 2.0 part III)
  */
-#include "avmb1/capicmd.h"  /* this should be moved in a common place */
+#include <linux/isdn/capicmd.h>
 
 int
 isdn_tty_capi_facility(capi_msg *cm) {