The driver did not mention the existance of the E1 version of the card.

Very USA-centric!
Now it says it is the driver for both the E1 and T1 cards, and reports
the type it actually finds.


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@217 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 11 insertions, 5 deletions

diff --git a/wct1xxp.c b/wct1xxp.c
index d29b0d0..bd9eec3 100755
--- a/wct1xxp.c
+++ b/wct1xxp.c
@@ -20,9 +20,10 @@
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
-   * along with this program; if not, write to the Free Software
+ * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
  *
+ * $Id$
  */
 
 #include <linux/kernel.h>
@@ -753,7 +754,7 @@ static int t1xxp_software_init(struct t1xxp *wc)
 		return -1;
 	wc->num = x;
 	sprintf(wc->span.name, "WCT1/%d", wc->num);
-	sprintf(wc->span.desc, "%s card %d", wc->variety, wc->num);
+	sprintf(wc->span.desc, "%s Card %d", wc->variety, wc->num);
 	wc->span.spanconfig = t1xxp_spanconfig;
 	wc->span.chanconfig = t1xxp_chanconfig;
 	wc->span.startup = t1xxp_startup;
@@ -1249,7 +1250,6 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
 			spin_lock_init(&wc->lock);
 			wc->ioaddr = pci_resource_start(pdev, 0);
 			wc->dev = pdev;
-			wc->variety = (char *)(ent->driver_data);
 			wc->offset = 28;	/* And you thought 42 was the answer */
 
 			wc->writechunk = 
@@ -1286,6 +1286,12 @@ static int __devinit t1xxp_init_one(struct pci_dev *pdev, const struct pci_devic
 			/* Initialize hardware */
 			t1xxp_hardware_init(wc);
 
+			/* We now know which version of card we have */
+			if (wc->ise1)
+				wc->variety = "Digium Wildcard E100P E1/PRA";
+			else
+				wc->variety = "Digium Wildcard T100P T1/PRI";
+
 			/* Misc. software stuff */
 			t1xxp_software_init(wc);
 
@@ -1339,7 +1345,7 @@ static void __devexit t1xxp_remove_one(struct pci_dev *pdev)
 }
 
 static struct pci_device_id t1xxp_pci_tbl[] __devinitdata = {
-	{ 0xe159, 0x0001, 0x6159, PCI_ANY_ID, 0, 0, (unsigned long) "LSS Wildcard T100P T1/PRI Board" },
+	{ 0xe159, 0x0001, 0x6159, PCI_ANY_ID, 0, 0, (unsigned long) "Digium Wildcard T100P T1/PRI or E100P E1/PRA Board" },
 };
 
 static struct pci_driver t1xxp_driver = {
@@ -1366,7 +1372,7 @@ static void __exit t1xxp_cleanup(void)
 }
 
 MODULE_PARM(debug, "i");
-MODULE_DESCRIPTION("Wildcard T100P Zaptel Driver");
+MODULE_DESCRIPTION("Wildcard T100P/E100P Zaptel Driver");
 MODULE_AUTHOR("Mark Spencer <markster@linux-support.net>");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");