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

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon May 17 13:56:53 2010
New Revision: 8648

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8648
Log:
hardware_id->span_id: the other parts

Modified:
    linux/team/tzafrir/sysfs/drivers/dahdi/wcb4xxp/base.c
    linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c
    linux/team/tzafrir/sysfs/include/dahdi/kernel.h

Modified: linux/team/tzafrir/sysfs/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/tzafrir/sysfs/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=8648&r1=8647&r2=8648
==============================================================================
--- linux/team/tzafrir/sysfs/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/team/tzafrir/sysfs/drivers/dahdi/wcb4xxp/base.c Mon May 17 13:56:53 2010
@@ -2331,7 +2331,7 @@
 
 		sprintf(bspan->span.name, "B4/%d/%d", b4->cardno, i+1);
 		sprintf(bspan->span.desc, "B4XXP (PCI) Card %d Span %d", b4->cardno, i+1);
-		bspan->span.hardware_port = i;
+		bspan->span.span_id = i;
 		bspan->span.manufacturer = "Digium";
 		dahdi_copy_string(bspan->span.devicetype, b4->variety, sizeof(bspan->span.devicetype));
 		sprintf(bspan->span.location, "PCI Bus %02d Slot %02d",

Modified: linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c?view=diff&rev=8648&r1=8647&r2=8648
==============================================================================
--- linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c (original)
+++ linux/team/tzafrir/sysfs/drivers/dahdi/xpp/xpp_dahdi.c Mon May 17 13:56:53 2010
@@ -1118,7 +1118,7 @@
 	/* The hardware_id is: <Label> */
 	snprintf(span->hardware_id, sizeof(span->hardware_id) - 1, "%s",
 			xbus->label);
-	span->hardware_port = xpd->addr.unit * 10 + xpd->addr.subunit;
+	span->span_id = xpd->addr.unit * 10 + xpd->addr.subunit;
 	/*
 	 * Who said a span and irq have 1-1 relationship?
 	 * Also exporting this low-level detail isn't too wise.

Modified: linux/team/tzafrir/sysfs/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/team/tzafrir/sysfs/include/dahdi/kernel.h?view=diff&rev=8648&r1=8647&r2=8648
==============================================================================
--- linux/team/tzafrir/sysfs/include/dahdi/kernel.h (original)
+++ linux/team/tzafrir/sysfs/include/dahdi/kernel.h Mon May 17 13:56:53 2010
@@ -764,7 +764,7 @@
 	char devicetype[80];		/*!< span's device type */
 	char location[40];		/*!< span device's location in system */
 	char hardware_id[40];		/*!< span device's unique id (serial) */
-	int hardware_port;		/*!< span port number on its device */
+	int span_id;			/*!< span unique number on its device */
 	int deflaw;			/*!< Default law (DAHDI_MULAW or DAHDI_ALAW) */
 	int alarms;			/*!< Pending alarms on span */
 	unsigned long flags;