[dahdi-commits] sruffell: branch linux/mspiceland/dahdi-trunk-adtapiupdatefor117 r5862 - in /...

[SVN commits to the DAHDI project]

Author: sruffell
Date: Tue Jan 27 19:39:03 2009
New Revision: 5862

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=5862
Log:
If the correct firmware version is not loaded on the VPM, make the error a
little more explicit.

Modified:
    linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/   (props changed)
    linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c
    linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c

Propchange: linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/
------------------------------------------------------------------------------
    automerge-email = sruffell at digium.com

Modified: linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=5862&r1=5861&r2=5862
==============================================================================
--- linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wctdm24xxp/base.c Tue Jan 27 19:39:03 2009
@@ -3508,6 +3508,7 @@
 	unsigned short reg;
 	unsigned long flags;
 	enum vpmadt032_init_result res = VPMADT032_FAILED;
+	const int EXPECTED_VPMADT032_VERSION = 0x117;
 
 #ifdef VPM150M_SUPPORT
 	struct wctdm_firmware fw;
@@ -3663,7 +3664,11 @@
 	}
 
 	/* ADT does not handle mismatches in API and firmware */
-	if (vpm150m->version != 0x117) {
+	if (EXPECTED_VPMADT032_VERSION != vpm150m->version) {
+		printk(KERN_ERR "%s: VPMADT032 firmware version 0x%x does " \
+			"not match expected version 0x%x. VPM is disabled.\n",
+			THIS_MODULE->name, vpm150m->version,
+			EXPECTED_VPMADT032_VERSION);
 		res = VPMADT032_APIMISMATCH;
 		goto failed_exit;
 	}

Modified: linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c?view=diff&rev=5862&r1=5861&r2=5862
==============================================================================
--- linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c (original)
+++ linux/team/mspiceland/dahdi-trunk-adtapiupdatefor117/drivers/dahdi/wcte12xp/vpmadt032.c Tue Jan 27 19:39:03 2009
@@ -693,6 +693,7 @@
 	struct t1_firmware fw;
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
+	const int EXPECTED_VPMADT032_VERSION = 0x117;
 #if !defined(HOTPLUG_FIRMWARE)
 	extern void _binary_dahdi_fw_vpmadt032_bin_size;
 	extern u8 _binary_dahdi_fw_vpmadt032_bin_start[];
@@ -889,7 +890,11 @@
 	}
 
 	/* ADT does not handle mismatches in API and firmware */
-	if (vpm150m->version != 0x117) {
+	if (EXPECTED_VPMADT032_VERSION != vpm150m->version) {
+		printk(KERN_ERR "%s: VPMADT032 firmware version 0x%x does " \
+			"not match expected version 0x%x. VPM is disabled.\n",
+			THIS_MODULE->name, vpm150m->version,
+			EXPECTED_VPMADT032_VERSION);
 		goto failed_exit;
 	}