[zaptel-commits] kpfleming: trunk r1893 - in /trunk: ./ wct4xxp/base.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 15:14:29 2007
New Revision: 1893

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1893
Log:
Merged revisions 1892 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1892 | kpfleming | 2007-01-22 15:13:37 -0600 (Mon, 22 Jan 2007) | 10 lines

Merged revisions 1891 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1891 | kpfleming | 2007-01-22 15:12:35 -0600 (Mon, 22 Jan 2007) | 2 lines

make the non-hotplug firmware case actually compile again

........

................

Modified:
    trunk/   (props changed)
    trunk/wct4xxp/base.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Jan 22 15:14:29 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892

Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=1893&r1=1892&r2=1893
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Mon Jan 22 15:14:29 2007
@@ -3107,10 +3107,10 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern const u32 _binary_OCT6114_64D_size;
-	extern const u32 _binary_OCT6114_128D_size;
-	extern const u8 *_binary_OCT6114_64D_start;
-	extern const u8 *_binary_OCT6114_128D_start;
+	extern const u32 _binary_OCT6114_64D_ima_size;
+	extern const u32 _binary_OCT6114_128D_ima_size;
+	extern u8 _binary_OCT6114_64D_ima_start;
+	extern u8 _binary_OCT6114_128D_ima_start;
 #endif
 
 	if (!vpmsupport) {
@@ -3146,8 +3146,8 @@
 			return;
 		}
 #else
-		embedded_firmware.data = _binary_OCT6114D_64D_ima_start;
-		embedded_firmware.size = _binary_OCT6114D_64D_ima_start;
+		embedded_firmware.data = &_binary_OCT6114_64D_ima_start;
+		embedded_firmware.size = _binary_OCT6114_64D_ima_size;
 #endif
 		break;
 	case 128:
@@ -3158,8 +3158,8 @@
 			return;
 		}
 #else
-		embedded_firmware.data = _binary_OCT6114D_128D_ima_start;
-		embedded_firmware.size = _binary_OCT6114D_128D_ima_start;
+		embedded_firmware.data = &_binary_OCT6114_128D_ima_start;
+		embedded_firmware.size = _binary_OCT6114_128D_ima_size;
 #endif
 		break;
 	default: