[svn-commits] tzafrir: branch linux/tzafrir/sysfs r5767 - in /linux/team/tzafrir/sysfs: ./ ...

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Jan 20 11:54:01 2009
New Revision: 5767

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=5767
Log:
Use chanpos instead of channo for sysfs channel identifier

* The name of the channel node is now chan-<spanno>:<chanpos>
  (channo is not relative, and not guaranteed to fit in two digits)
* Remove two useless channel node attributes (chanpos, tonezone)

Modified:
    linux/team/tzafrir/sysfs/README
    linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-sysfs-chan.c

Modified: linux/team/tzafrir/sysfs/README
URL: http://svn.digium.com/svn-view/dahdi/linux/team/tzafrir/sysfs/README?view=diff&rev=5767&r1=5766&r2=5767
==============================================================================
--- linux/team/tzafrir/sysfs/README (original)
+++ linux/team/tzafrir/sysfs/README Tue Jan 20 11:54:01 2009
@@ -443,8 +443,8 @@
 /sys/bus/spans/devices/span-NNN/NNN:MM
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 A sysfs node (directory) that represents channel MM in span NNN. E.g.
-for channel number 40 in dahdi span 3 you will get
-'/sys/bus/spans/devices/span-003/40'. Note that the numbering of the
+for the second channels in dahdi span 3 you will get
+'/sys/bus/spans/devices/span-003/02'. Note that the numbering of the
 channels is global rather than per-span.
 
 Channel attributes will need to be filled in here when there are some.

Modified: linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-sysfs-chan.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-sysfs-chan.c?view=diff&rev=5767&r1=5766&r2=5767
==============================================================================
--- linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-sysfs-chan.c (original)
+++ linux/team/tzafrir/sysfs/drivers/dahdi/dahdi-sysfs-chan.c Tue Jan 20 11:54:01 2009
@@ -119,12 +119,10 @@
 static struct device_attribute chan_dev_attrs[] = {
         __ATTR_RO(name),
         __ATTR_RO(channo),
-        __ATTR_RO(chanpos),
         __ATTR_RO(sig),
         __ATTR_RO(sigcap),
         __ATTR_RO(chan_alarms),
         __ATTR_RO(blocksize),
-        __ATTR_RO(tonezone),
         __ATTR_RO(echocancel),
 #ifdef OPTIMIZE_CHANMUTE
         __ATTR_RO(chanmute),
@@ -162,7 +160,7 @@
 	dev->bus = &dahdi_chan_type;
 	dev->parent = &span->span_device;
 	snprintf(dev->bus_id, BUS_ID_SIZE, "%03d:%02d",
-		span->spanno, chan->channo);
+		span->spanno, chan->chanpos);
 	dev->driver_data = chan;
 	dev->release = chan_release;
 	res = device_register(dev);