[svn-commits] tzafrir: branch linux/tzafrir/dev_subdirs r4769 - /linux/team/tzafrir/dev_sub...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Aug 13 11:36:59 2008
New Revision: 4769

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4769
Log:
Use '!' in device names (tells udev to put devices in subdir).

Modified:
    linux/team/tzafrir/dev_subdirs/drivers/dahdi/dahdi-base.c

Modified: linux/team/tzafrir/dev_subdirs/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/team/tzafrir/dev_subdirs/drivers/dahdi/dahdi-base.c?view=diff&rev=4769&r1=4768&r2=4769
==============================================================================
--- linux/team/tzafrir/dev_subdirs/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/tzafrir/dev_subdirs/drivers/dahdi/dahdi-base.c Wed Aug 13 11:36:59 2008
@@ -5345,7 +5345,7 @@
 	for (x = 0; x < span->channels; x++) {
 		if (span->chans[x]->channo < 250) {
 			char chan_name[32];
-			snprintf(chan_name, sizeof(chan_name), "dahdi%d", 
+			snprintf(chan_name, sizeof(chan_name), "dahdi!%d", 
 					span->chans[x]->channo);
 			CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 
 					span->chans[x]->channo), NULL, chan_name);
@@ -7776,9 +7776,9 @@
 
 int dahdi_register_chardev(struct dahdi_chardev *dev)
 {
-	char udevname[strlen(dev->name) + 3];
-
-	strcpy(udevname, "dahdi");
+	char udevname[strlen(dev->name) + 4];
+
+	strcpy(udevname, "dahdi!");
 	strcat(udevname, dev->name);
 	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, dev->minor), NULL, udevname);
 
@@ -7806,10 +7806,10 @@
 	}
 
 	dahdi_class = class_create(THIS_MODULE, "dahdi");
-	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 253), NULL, "dahditimer");
-	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 254), NULL, "dahdichannel");
-	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 255), NULL, "dahdipseudo");
-	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 0), NULL, "dahdictl");
+	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 253), NULL, "dahdi!timer");
+	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 254), NULL, "dahdi!channel");
+	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 255), NULL, "dahdi!pseudo");
+	CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 0), NULL, "dahdi!ctl");
 
 	module_printk(KERN_INFO, "Telephony Interface Registered on major %d\n", DAHDI_MAJOR);
 	module_printk(KERN_INFO, "Version: %s\n", DAHDI_VERSION);