[svn-commits] kpfleming: trunk r1999 - in /trunk: ./ wct4xxp/base.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 29 13:22:26 2007
New Revision: 1999

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

................
r1998 | kpfleming | 2007-01-29 13:21:33 -0600 (Mon, 29 Jan 2007) | 10 lines

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

........
r1996 | kpfleming | 2007-01-29 13:20:32 -0600 (Mon, 29 Jan 2007) | 2 lines

_really_ fix the non-hotplug firmware case

........

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

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Jan 29 13:22:26 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,1892,1899,1913,1921,1924,1937,1944,1954,1988
+/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,1899,1913,1921,1924,1937,1944,1954,1988,1998

Modified: trunk/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/base.c?view=diff&rev=1999&r1=1998&r2=1999
==============================================================================
--- trunk/wct4xxp/base.c (original)
+++ trunk/wct4xxp/base.c Mon Jan 29 13:22:26 2007
@@ -3107,8 +3107,8 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern const u32 *_binary_OCT6114_64D_ima_size;
-	extern const u32 *_binary_OCT6114_128D_ima_size;
+	extern void *_binary_OCT6114_64D_ima_size;
+	extern void *_binary_OCT6114_128D_ima_size;
 	extern u8 _binary_OCT6114_64D_ima_start[];
 	extern u8 _binary_OCT6114_128D_ima_start[];
 #endif
@@ -3147,7 +3147,13 @@
 		}
 #else
 		embedded_firmware.data = _binary_OCT6114_64D_ima_start;
-		embedded_firmware.size = *_binary_OCT6114_64D_ima_size;
+		/* Yes... this is weird. objcopy gives us a symbol containing
+		   the size of the firmware, not a pointer a variable containing
+		   the size. The only way we can get the value of the symbol
+		   is to take its address, so we define it as a pointer and
+		   then cast that value to the proper type.
+		*/
+		embedded_firmware.size = (size_t) _binary_OCT6114_64D_ima_size;
 #endif
 		break;
 	case 128:
@@ -3159,7 +3165,13 @@
 		}
 #else
 		embedded_firmware.data = _binary_OCT6114_128D_ima_start;
-		embedded_firmware.size = *_binary_OCT6114_128D_ima_size;
+		/* Yes... this is weird. objcopy gives us a symbol containing
+		   the size of the firmware, not a pointer a variable containing
+		   the size. The only way we can get the value of the symbol
+		   is to take its address, so we define it as a pointer and
+		   then cast that value to the proper type.
+		*/
+		embedded_firmware.size = (size_t) _binary_OCT6114_128D_ima_size;
 #endif
 		break;
 	default: