Skip to contentSkip to conversation

ISDN_CAPI_CAPIFS related cleanups

PATCH In review Adrian Bunk 4 participants 14 messages Jan 31, 2006 – Feb 18, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ISDN_CAPI_CAPIFS related cleanups

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

---

 drivers/isdn/capi/Kconfig  |   10 +++++-----
 drivers/isdn/capi/capi.c   |    9 ++-------
 drivers/isdn/capi/capifs.h |    9 +++++++++
 3 files changed, 16 insertions(+), 12 deletions(-)
drivers/isdn/capi/Kconfig renamed from drivers/isdn/capi/Kconfig.old +5 -5
@@ -31,17 +31,17 @@
 config ISDN_CAPI_CAPIFS_BOOL
 	bool "CAPI2.0 filesystem support"
 	depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
-
-config ISDN_CAPI_CAPIFS
-	tristate
-	depends on ISDN_CAPI_CAPIFS_BOOL
-	default ISDN_CAPI_CAPI20
 	help
 	  This option provides a special file system, similar to /dev/pts with
 	  device nodes for the special ttys established by using the
 	  middleware extension above. If you want to use pppd with
 	  pppdcapiplugin to dial up to your ISP, say Y here.
 
+config ISDN_CAPI_CAPIFS
+	tristate
+	depends on ISDN_CAPI_CAPIFS_BOOL
+	default ISDN_CAPI_CAPI20
+
 config ISDN_CAPI_CAPIDRV
 	tristate "CAPI2.0 capidrv interface support"
 	depends on ISDN_CAPI && ISDN_I4L
drivers/isdn/capi/capifs.h renamed from drivers/isdn/capi/capifs.h.old +9 -0
@@ -7,5 +7,14 @@
  *
  */
 
+#ifdef CONFIG_ISDN_CAPI_CAPIFS_BOOL
+
 void capifs_new_ncci(unsigned int num, dev_t device);
 void capifs_free_ncci(unsigned int num);
+
+#else  /*  CONFIG_ISDN_CAPI_CAPIFS_BOOL  */
+
+static inline void capifs_new_ncci(unsigned int num, dev_t device) {}
+static inline void capifs_free_ncci(unsigned int num) {}
+
+#endif  /*  CONFIG_ISDN_CAPI_CAPIFS_BOOL  */
drivers/isdn/capi/capi.c renamed from drivers/isdn/capi/capi.c.old +2 -7
@@ -42,9 +42,8 @@
 #include <linux/devfs_fs_kernel.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
 
 static char *revision = "$Revision: 1.1.2.7 $";
 
@@ -311,9 +310,7 @@
 #ifdef _DEBUG_REFCOUNT
 		printk(KERN_DEBUG "set mp->nccip\n");
 #endif
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
 		capifs_new_ncci(mp->minor, MKDEV(capi_ttymajor, mp->minor));
-#endif
 	}
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
 	for (pp=&cdev->nccis; *pp; pp = &(*pp)->next)
@@ -336,9 +333,7 @@
 			*pp = (*pp)->next;
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
 			if ((mp = np->minorp) != 0) {
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
 				capifs_free_ncci(mp->minor);
-#endif
 				if (mp->tty) {
 					mp->nccip = NULL;
 #ifdef _DEBUG_REFCOUNT
@@ -1520,7 +1515,7 @@
 	proc_init();
 
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
+#ifdef CONFIG_ISDN_CAPI_CAPIFS_BOOL
         compileinfo = " (middleware+capifs)";
 #else
         compileinfo = " (no capifs)";
#1 lore raw

Hi Adrian,

Quoted 4 lines

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

I actually still like to see capifs removed completely. It is not really needed if you gonna use udev. The only thing that it is doing, is to set the correct permissions and make sure that the device nodes are created. And with a 2.6 kernel this can be all done by udev.

Regards

Marcel

#2 lore raw
Quoted 1 line · Marcel Holtmann

Hi Adrian,

Hi Marcel,

Quoted 9 lines
Quoted 4 lines

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

I actually still like to see capifs removed completely. It is not really needed if you gonna use udev. The only thing that it is doing, is to set the correct permissions and make sure that the device nodes are created. And with a 2.6 kernel this can be all done by udev.

udev is not mandatory.

Static /dev is still 100% supported and working fine.

Quoted 3 lines

Regards

Marcel

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#3 lore raw

Hi Adrian,

Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

Quoted 8 lines
Quoted 4 lines

I actually still like to see capifs removed completely. It is not really needed if you gonna use udev. The only thing that it is doing, is to set the correct permissions and make sure that the device nodes are created. And with a 2.6 kernel this can be all done by udev.

udev is not mandatory.

Static /dev is still 100% supported and working fine.

and if you have static /dev then you can use mknod and chown by yourself. If you use CAPI on any newer distribution with the latest 2.6 kernel you will have udev anyway and so no static /dev at all.

Regards

Marcel

#4 lore raw
Quoted 12 lines · Marcel Holtmann

Hi Adrian,

Quoted 10 lines
Quoted 9 lines
Quoted 4 lines

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

I actually still like to see capifs removed completely. It is not really needed if you gonna use udev. The only thing that it is doing, is to set the correct permissions and make sure that the device nodes are created. And with a 2.6 kernel this can be all done by udev.

Quoted 7 lines
Quoted 3 lines

udev is not mandatory.

Static /dev is still 100% supported and working fine.

and if you have static /dev then you can use mknod and chown by yourself. If you use CAPI on any newer distribution with the latest 2.6 kernel you will have udev anyway and so no static /dev at all.

Sorry for my ignorance, but I think capifs was introduced to have own dynamic 'files' like pts and not to have the restrictions of character devices and the needed major/minor numbers.

So changing this to character device nodes may break applications out there.

Armin

#5 lore raw

Hi Armin,

Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
Quoted 9 lines
Quoted 4 lines

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

I actually still like to see capifs removed completely. It is not really needed if you gonna use udev. The only thing that it is doing, is to set the correct permissions and make sure that the device nodes are created. And with a 2.6 kernel this can be all done by udev.

udev is not mandatory.

Static /dev is still 100% supported and working fine.

Quoted 7 lines
Quoted 3 lines

and if you have static /dev then you can use mknod and chown by yourself. If you use CAPI on any newer distribution with the latest 2.6 kernel you will have udev anyway and so no static /dev at all.

Sorry for my ignorance, but I think capifs was introduced to have own dynamic 'files' like pts and not to have the restrictions of character devices and the needed major/minor numbers.

I am under the impression that it was introduced to change the ownership of the device node the current process. Nothing more, nothing less. Please correct me if I am wrong here.

Quoted 2 lines

So changing this to character device nodes may break applications out there.

Actually I stopped compiling in and using capifs over a year ago and I never had any problems with it. However you must ensure that the device has been created by udev, nut nowadays this is no problem.

Regards

Marcel

#6 lore raw
Quoted 20 lines · Marcel Holtmann

Hi Armin,

Quoted 18 lines
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

Quoted 8 lines
Quoted 4 lines

I actually still like to see capifs removed completely. It is not really needed if you gonna use udev. The only thing that it is doing, is to set the correct permissions and make sure that the device nodes are created. And with a 2.6 kernel this can be all done by udev.

udev is not mandatory.

Static /dev is still 100% supported and working fine.

and if you have static /dev then you can use mknod and chown by yourself. If you use CAPI on any newer distribution with the latest 2.6 kernel you will have udev anyway and so no static /dev at all.

Quoted 7 lines
Quoted 3 lines

Sorry for my ignorance, but I think capifs was introduced to have own dynamic 'files' like pts and not to have the restrictions of character devices and the needed major/minor numbers.

I am under the impression that it was introduced to change the ownership of the device node the current process. Nothing more, nothing less. Please correct me if I am wrong here.

I really don't know. Calle should be asked, I think he did that.

Quoted 6 lines
Quoted 2 lines

So changing this to character device nodes may break applications out there.

Actually I stopped compiling in and using capifs over a year ago and I never had any problems with it. However you must ensure that the device has been created by udev, nut nowadays this is no problem.

I use capi-ppp connections with capifs. If you don't use capifs, how do you do ppp over CAPI?

What about the major number? Wouldn't we need a major number then?

If udev is creating the device, it may be not existent when the application expects it. E.g. the application is doing the ioctl to retreive the connection number (filename) and expects to be able to open it. But in case of udev, it might be not done in that time. So the application needs to wait for some time..., but how long? I don't like this idea.

Armin

#7 lore raw

Hi Armin,

Quoted 22 lines
Quoted 22 lines
Quoted 21 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

I actually still like to see capifs removed completely. It is not really needed if you gonna use udev. The only thing that it is doing, is to set the correct permissions and make sure that the device nodes are created. And with a 2.6 kernel this can be all done by udev.

Quoted 7 lines
Quoted 3 lines

udev is not mandatory.

Static /dev is still 100% supported and working fine.

and if you have static /dev then you can use mknod and chown by yourself. If you use CAPI on any newer distribution with the latest 2.6 kernel you will have udev anyway and so no static /dev at all.

Sorry for my ignorance, but I think capifs was introduced to have own dynamic 'files' like pts and not to have the restrictions of character devices and the needed major/minor numbers.

Quoted 5 lines
Quoted 3 lines

I am under the impression that it was introduced to change the ownership of the device node the current process. Nothing more, nothing less. Please correct me if I am wrong here.

I really don't know. Calle should be asked, I think he did that.

I asked him some time ago, but never got a final feedback for it.

Quoted 11 lines
Quoted 6 lines
Quoted 2 lines

So changing this to character device nodes may break applications out there.

Actually I stopped compiling in and using capifs over a year ago and I never had any problems with it. However you must ensure that the device has been created by udev, nut nowadays this is no problem.

I use capi-ppp connections with capifs. If you don't use capifs, how do you do ppp over CAPI?

What about the major number? Wouldn't we need a major number then?

It has already a major number.

Quoted 5 lines

If udev is creating the device, it may be not existent when the application expects it. E.g. the application is doing the ioctl to retreive the connection number (filename) and expects to be able to open it. But in case of udev, it might be not done in that time. So the application needs to wait for some time..., but how long? I don't like this idea.

This is a small race condition that existed with the original udev, but it was easy to work around it. Adding a simple sleep is enough and I did the same with Bluetooth RFCOMM. However it should be work nowadays, but I am not 100% sure. We should check this with the udev guys.

Regards

Marcel

#8 lore raw

Hello,

I have no problems, when capifs is removed, but the pppdcapiplugin has to work without it.
So if you want to remove capifs make sure pppdcapiplugin is working without problems together with udev ...

I'm too busy to check pppdcapiplugin together with udev ....

regards,

calle

Quoted 61 lines · Marcel Holtmann

Hi Armin,

Quoted 22 lines
Quoted 22 lines
Quoted 21 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 4 lines

This patch contains the following cleanups:
- move the help text to the right option
- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

I actually still like to see capifs removed completely. It is not really needed if you gonna use udev. The only thing that it is doing, is to set the correct permissions and make sure that the device nodes are created. And with a 2.6 kernel this can be all done by udev.

Quoted 7 lines
Quoted 3 lines

udev is not mandatory.

Static /dev is still 100% supported and working fine.

and if you have static /dev then you can use mknod and chown by yourself. If you use CAPI on any newer distribution with the latest 2.6 kernel you will have udev anyway and so no static /dev at all.

Sorry for my ignorance, but I think capifs was introduced to have own dynamic 'files' like pts and not to have the restrictions of character devices and the needed major/minor numbers.

Quoted 5 lines
Quoted 3 lines

I am under the impression that it was introduced to change the ownership of the device node the current process. Nothing more, nothing less. Please correct me if I am wrong here.

I really don't know. Calle should be asked, I think he did that.

I asked him some time ago, but never got a final feedback for it.

Quoted 11 lines
Quoted 6 lines
Quoted 2 lines

So changing this to character device nodes may break applications out there.

Actually I stopped compiling in and using capifs over a year ago and I never had any problems with it. However you must ensure that the device has been created by udev, nut nowadays this is no problem.

I use capi-ppp connections with capifs. If you don't use capifs, how do you do ppp over CAPI?

What about the major number? Wouldn't we need a major number then?

It has already a major number.

Quoted 5 lines

If udev is creating the device, it may be not existent when the application expects it. E.g. the application is doing the ioctl to retreive the connection number (filename) and expects to be able to open it. But in case of udev, it might be not done in that time. So the application needs to wait for some time..., but how long? I don't like this idea.

This is a small race condition that existed with the original udev, but it was easy to work around it. Adding a simple sleep is enough and I did the same with Bluetooth RFCOMM. However it should be work nowadays, but I am not 100% sure. We should check this with the udev guys.

Regards

Marcel

#9 lore raw

Hi Calle,

Quoted 6 lines

I have no problems, when capifs is removed, but the pppdcapiplugin has to work without it.
So if you want to remove capifs make sure pppdcapiplugin is working without problems together with udev ...

I'm too busy to check pppdcapiplugin together with udev ....

I posted this patch some time ago (actually April 2004) which made pppd wait for the device node to be created before failing. I used it since then and it still works fine for me.

Regards

Marcel

Index: capiplugin.c
===================================================================
RCS file: /i4ldev/isdn4k-utils/pppdcapiplugin/capiplugin.c,v retrieving revision 1.33

capiplugin.c +5 -0
diff -u -r1.33 capiplugin.c
@@ -1413,6 +1413,11 @@
 	   fatal("capiplugin: failed to get tty devname - %s (%d)",
 			strerror(serrno), serrno);
 	}
+	retry = 0;
+	while (access(tty, 0) != 0 && (retry++ < 4)) {
+	   dbglog("capiplugin: capitty not available, waiting for device ...");
+	   sleep(1);
+	}
 	if (access(tty, 0) != 0 && errno == ENOENT) {
 	      fatal("capiplugin: tty %s doesn't exist - CAPI Filesystem Support not enabled in kernel or not mounted ?", tty);
 	}
#10 lore raw
Quoted 7 lines · Marcel Holtmann

Hi Calle,

Quoted 5 lines

I have no problems, when capifs is removed, but the pppdcapiplugin has to work without it.
So if you want to remove capifs make sure pppdcapiplugin is working without problems together with udev ...

Quoted 5 lines
Quoted 1 line

I'm too busy to check pppdcapiplugin together with udev ....

I posted this patch some time ago (actually April 2004) which made pppd wait for the device node to be created before failing. I used it since then and it still works fine for me.

Oh, I missed that patch. So check it in und remove capifs :-)

calle

Quoted 25 lines

Regards

Marcel

Index: capiplugin.c
===================================================================
RCS file: /i4ldev/isdn4k-utils/pppdcapiplugin/capiplugin.c,v retrieving revision 1.33
diff -u -r1.33 capiplugin.c

capiplugin.c +5 -0
@@ -1413,6 +1413,11 @@
 	   fatal("capiplugin: failed to get tty devname - %s (%d)",
 			strerror(serrno), serrno);
 	}
+	retry = 0;
+	while (access(tty, 0) != 0 && (retry++ < 4)) {
+	   dbglog("capiplugin: capitty not available, waiting for device ...");
+	   sleep(1);
+	}
 	if (access(tty, 0) != 0 && errno == ENOENT) {
 	      fatal("capiplugin: tty %s doesn't exist - CAPI Filesystem Support not enabled in kernel or not mounted ?", tty);
 	}
#11 lore raw
In reply to Adrian Bunk
Quoted 2 lines · Adrian Bunk

This patch contains the following cleanups:
- move the help text to the right option

where did you move it to? I just see the removal of the help text.

Armin

Quoted 103 lines

- replace some #ifdef's in capi.c with dummy functions in capifs.h
- use CONFIG_ISDN_CAPI_CAPIFS_BOOL in one place in capi.c

---

 drivers/isdn/capi/Kconfig  |   10 +++++-----
 drivers/isdn/capi/capi.c   |    9 ++-------
 drivers/isdn/capi/capifs.h |    9 +++++++++
 3 files changed, 16 insertions(+), 12 deletions(-)
drivers/isdn/capi/Kconfig renamed from drivers/isdn/capi/Kconfig.old +5 -5
@@ -31,17 +31,17 @@
 config ISDN_CAPI_CAPIFS_BOOL
 	bool "CAPI2.0 filesystem support"
 	depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
-
-config ISDN_CAPI_CAPIFS
-	tristate
-	depends on ISDN_CAPI_CAPIFS_BOOL
-	default ISDN_CAPI_CAPI20
 	help
 	  This option provides a special file system, similar to /dev/pts with
 	  device nodes for the special ttys established by using the
 	  middleware extension above. If you want to use pppd with
 	  pppdcapiplugin to dial up to your ISP, say Y here.
 
+config ISDN_CAPI_CAPIFS
+	tristate
+	depends on ISDN_CAPI_CAPIFS_BOOL
+	default ISDN_CAPI_CAPI20
+
 config ISDN_CAPI_CAPIDRV
 	tristate "CAPI2.0 capidrv interface support"
 	depends on ISDN_CAPI && ISDN_I4L
drivers/isdn/capi/capifs.h renamed from drivers/isdn/capi/capifs.h.old +9 -0
@@ -7,5 +7,14 @@
  *
  */
 
+#ifdef CONFIG_ISDN_CAPI_CAPIFS_BOOL
+
 void capifs_new_ncci(unsigned int num, dev_t device);
 void capifs_free_ncci(unsigned int num);
+
+#else  /*  CONFIG_ISDN_CAPI_CAPIFS_BOOL  */
+
+static inline void capifs_new_ncci(unsigned int num, dev_t device) {}
+static inline void capifs_free_ncci(unsigned int num) {}
+
+#endif  /*  CONFIG_ISDN_CAPI_CAPIFS_BOOL  */
drivers/isdn/capi/capi.c renamed from drivers/isdn/capi/capi.c.old +2 -7
@@ -42,9 +42,8 @@
 #include <linux/devfs_fs_kernel.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
 
 static char *revision = "$Revision: 1.1.2.7 $";
 
@@ -311,9 +310,7 @@
 #ifdef _DEBUG_REFCOUNT
 		printk(KERN_DEBUG "set mp->nccip\n");
 #endif
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
 		capifs_new_ncci(mp->minor, MKDEV(capi_ttymajor, mp->minor));
-#endif
 	}
 #endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
 	for (pp=&cdev->nccis; *pp; pp = &(*pp)->next)
@@ -336,9 +333,7 @@
 			*pp = (*pp)->next;
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
 			if ((mp = np->minorp) != 0) {
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
 				capifs_free_ncci(mp->minor);
-#endif
 				if (mp->tty) {
 					mp->nccip = NULL;
 #ifdef _DEBUG_REFCOUNT
@@ -1520,7 +1515,7 @@
 	proc_init();
 
 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
+#ifdef CONFIG_ISDN_CAPI_CAPIFS_BOOL
         compileinfo = " (middleware+capifs)";
 #else
         compileinfo = " (no capifs)";

_______________________________________________
isdn4linux mailing list
[email protected]
https://www.isdn4linux.de/mailman/listinfo/isdn4linux

#12 lore raw
Quoted 5 lines · Armin Schindler
Quoted 2 lines · Adrian Bunk

This patch contains the following cleanups:
- move the help text to the right option

where did you move it to? I just see the removal of the help text.

I moved it from ISDN_CAPI_CAPIFS to ISDN_CAPI_CAPIFS_BOOL (diff displays this a bit strange).

Quoted 16 lines

Armin
...

Quoted 14 lines

config ISDN_CAPI_CAPIFS_BOOL

drivers/isdn/capi/Kconfig renamed from drivers/isdn/capi/Kconfig.old +0 -5
 	bool "CAPI2.0 filesystem support"
 	depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
-
-config ISDN_CAPI_CAPIFS
-	tristate
-	depends on ISDN_CAPI_CAPIFS_BOOL
-	default ISDN_CAPI_CAPI20
 	help
 	  This option provides a special file system, similar to /dev/pts with
 	  device nodes for the special ttys established by using the
 	  middleware extension above. If you want to use pppd with
 	  pppdcapiplugin to dial up to your ISP, say Y here.
Quoted 6 lines
Quoted 5 lines
drivers/isdn/capi/Kconfig renamed from drivers/isdn/capi/Kconfig.old +5 -0
+config ISDN_CAPI_CAPIFS
+	tristate
+	depends on ISDN_CAPI_CAPIFS_BOOL
+	default ISDN_CAPI_CAPI20
+

...

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#13 lore raw
Quoted 9 lines · Adrian Bunk
Quoted 5 lines · Armin Schindler
Quoted 2 lines · Adrian Bunk

This patch contains the following cleanups:
- move the help text to the right option

where did you move it to? I just see the removal of the help text.

I moved it from ISDN_CAPI_CAPIFS to ISDN_CAPI_CAPIFS_BOOL (diff displays this a bit strange).

Yes, sorry. I didn't look close enough. I should wait a bit after wake up...

Armin

Quoted 38 lines
Quoted 16 lines

Armin
...

Quoted 14 lines

config ISDN_CAPI_CAPIFS_BOOL

drivers/isdn/capi/Kconfig renamed from drivers/isdn/capi/Kconfig.old +0 -5
 	bool "CAPI2.0 filesystem support"
 	depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
-
-config ISDN_CAPI_CAPIFS
-	tristate
-	depends on ISDN_CAPI_CAPIFS_BOOL
-	default ISDN_CAPI_CAPI20
 	help
 	  This option provides a special file system, similar to /dev/pts with
 	  device nodes for the special ttys established by using the
 	  middleware extension above. If you want to use pppd with
 	  pppdcapiplugin to dial up to your ISP, say Y here.
Quoted 6 lines
Quoted 5 lines
drivers/isdn/capi/Kconfig renamed from drivers/isdn/capi/Kconfig.old +5 -0
+config ISDN_CAPI_CAPIFS
+	tristate
+	depends on ISDN_CAPI_CAPIFS_BOOL
+	default ISDN_CAPI_CAPI20
+

...

cu
Adrian

Signature · 9 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

_______________________________________________
isdn4linux mailing list
[email protected]
https://www.isdn4linux.de/mailman/listinfo/isdn4linux