[svn-commits] kpfleming: branch 1.4 r3388 - in /branches/1.4: wctc4xxp/ wctdm24xxp/ wcte12xp/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Mon Dec 10 11:06:40 2007
New Revision: 3388

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3388
Log:
fix firmware object names for non-hotplug firmware for wctc4xxp, wcte12xp and wctdm24xxp
add VPM reporting in 'devicetype' to wcte12xp
fix VPM reporting in 'devicetype' for wctdm24xxp so it actually works

Modified:
    branches/1.4/wctc4xxp/base.c
    branches/1.4/wctdm24xxp/base.c
    branches/1.4/wcte12xp/base.c
    branches/1.4/wcte12xp/vpmadt032.c

Modified: branches/1.4/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctc4xxp/base.c?view=diff&rev=3388&r1=3387&r2=3388
==============================================================================
--- branches/1.4/wctc4xxp/base.c (original)
+++ branches/1.4/wctc4xxp/base.c Mon Dec 10 11:06:40 2007
@@ -1665,8 +1665,8 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern void _binary_tc400m_firmware_bin_size;
-	extern u8 _binary_tc400m_firmware_bin_start[];
+	extern void _binary_zaptel_fw_tc400m_bin_size;
+	extern u8 _binary_zaptel_fw_tc400m_bin_start[];
 #else
 	static const char tc400m_firmware[] = "zaptel-fw-tc400m.bin";
 #endif
@@ -1755,8 +1755,8 @@
 				return -EIO;
 			}
 #else
-			embedded_firmware.data = _binary_tc400m_firmware_bin_start;
-			embedded_firmware.size = (size_t) &_binary_tc400m_firmware_bin_size;
+			embedded_firmware.data = _binary_zaptel_fw_tc400m_bin_start;
+			embedded_firmware.size = (size_t) &_binary_zaptel_fw_tc400m_bin_size;
 #endif
 
 			dte_firmware_ver = firmware->data[0];

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=3388&r1=3387&r2=3388
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Mon Dec 10 11:06:40 2007
@@ -3077,10 +3077,6 @@
 		 wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1);
 	wc->span.manufacturer = "Digium";
 	strncpy(wc->span.devicetype, wc->variety, sizeof(wc->span.devicetype) - 1);
-	if (wc->vpm)
-		strncat(wc->span.devicetype, " with VPM100M", sizeof(wc->span.devicetype) - 1);
-	else if (wc->vpm150m)
-		strncat(wc->span.devicetype, " with VPMADT032", sizeof(wc->span.devicetype) - 1);
 	if (alawoverride) {
 		printk("ALAW override parameter detected.  Device will be operating in ALAW\n");
 		wc->span.deflaw = ZT_LAW_ALAW;
@@ -3133,6 +3129,11 @@
 			wc->chans[x].sigcap = 0;
 		}
 	}
+
+	if (wc->vpm)
+		strncat(wc->span.devicetype, " with VPM100M", sizeof(wc->span.devicetype) - 1);
+	else if (wc->vpm150m)
+		strncat(wc->span.devicetype, " with VPMADT032", sizeof(wc->span.devicetype) - 1);
 }
 
 static int wctdm_hardware_init(struct wctdm *wc)
@@ -3606,8 +3607,8 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern void _binary_vpmadt032_bin_size;
-	extern u8 _binary_vpmadt032_bin_start[];
+	extern void _binary_zaptel_fw_vpmadt032_bin_size;
+	extern u8 _binary_zaptel_fw_vpmadt032_bin_start[];
 #else
 	static const char vpmadt032_firmware[] = "zaptel-fw-vpmadt032.bin";
 #endif
@@ -3709,8 +3710,8 @@
 			return;
 		}
 #else
-		embedded_firmware.data = _binary_vpmadt032_bin_start;
-		embedded_firmware.size = (size_t) &_binary_vpmadt032_bin_size;
+		embedded_firmware.data = _binary_zaptel_fw_vpmadt032_bin_start;
+		embedded_firmware.size = (size_t) &_binary_zaptel_fw_vpmadt032_bin_size;
 #endif
 		fw.fw = firmware;
 		fw.offset = 0;

Modified: branches/1.4/wcte12xp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/base.c?view=diff&rev=3388&r1=3387&r2=3388
==============================================================================
--- branches/1.4/wcte12xp/base.c (original)
+++ branches/1.4/wcte12xp/base.c Mon Dec 10 11:06:40 2007
@@ -1317,6 +1317,8 @@
 	snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Card %d", wc->variety, wc->num);
 	wc->span.manufacturer = "Digium";
 	strncpy(wc->span.devicetype, wc->variety, sizeof(wc->span.devicetype) - 1);
+	if (wc->vpm150m)
+		strncat(wc->span.devicetype, " with VPMADT032", sizeof(wc->span.devicetype) - 1);
 	snprintf(wc->span.location, sizeof(wc->span.location) - 1,
 		"PCI Bus %02d Slot %02d", wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1);
 

Modified: branches/1.4/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/vpmadt032.c?view=diff&rev=3388&r1=3387&r2=3388
==============================================================================
--- branches/1.4/wcte12xp/vpmadt032.c (original)
+++ branches/1.4/wcte12xp/vpmadt032.c Mon Dec 10 11:06:40 2007
@@ -652,8 +652,8 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern void _binary_vpmadt032_bin_size;
-	extern u8 _binary_vpmadt032_bin_start[];
+	extern void _binary_zaptel_fw_vpmadt032_bin_size;
+	extern u8 _binary_zaptel_fw_vpmadt032_bin_start[];
 #else
 	static const char vpmadt032_firmware[] = "zaptel-fw-vpmadt032.bin";
 #endif
@@ -872,8 +872,8 @@
 			return;
 		}
 #else
-		embedded_firmware.data = _binary_vpmadt032_bin_start;
-		embedded_firmware.size = (size_t) &_binary_vpmadt032_bin_size;
+		embedded_firmware.data = _binary_zaptel_fw_vpmadt032_bin_start;
+		embedded_firmware.size = (size_t) &_binary_zaptel_fw_vpmadt032_bin_size;
 #endif
 		fw.fw = firmware;
 		fw.offset = 0;