[svn-commits] tzafrir: linux/trunk r10283 - /linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Wed Oct 26 14:06:57 2011
New Revision: 10283

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10283
Log:
xpp: more informative span description:

 * Contains the hardware_id and the local span number

Signed-off-by: Oron Peled <oron.peled at xorcom.com>

Modified:
    linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c

Modified: linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c?view=diff&rev=10283&r1=10282&r2=10283
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp_dahdi.c Wed Oct 26 14:06:57 2011
@@ -977,8 +977,14 @@
 	struct dahdi_span *span = &PHONEDEV(xpd).span;
 
 	snprintf(span->name, MAX_SPANNAME, "%s/%s", xpd->xbus->busname, xpd->xpdname);
-	snprintf(span->desc, MAX_SPANDESC, "Xorcom XPD #%02d/%1d%1d: %s",
-			xpd->xbus->num, xpd->addr.unit, xpd->addr.subunit, xpd->type_name);
+	/*
+	 * The "Xorcom XPD" is a prefix in one of the regexes we
+	 * use in our dahdi_genconf to match for PRI cards.
+	 * FIXME: After moving completely to sysfs, we can remove
+	 * this horseshit.
+	 */
+	snprintf(span->desc, MAX_SPANDESC, "Xorcom XPD [%s].%d: %s",
+			xpd->xbus->label, span->offset + 1, xpd->type_name);
 }
 EXPORT_SYMBOL(xpd_set_spanname);