[svn-commits] file: branch file/zaptel-firmware r2004 - in /team/file/zaptel-firmware: ./ w...

[svn-commits at lists.digium.com]

Author: file
Date: Mon Jan 29 15:08:28 2007
New Revision: 2004

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

................
r1988 | kpfleming | 2007-01-27 11:16:03 -0500 (Sat, 27 Jan 2007) | 10 lines

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

........
r1987 | kpfleming | 2007-01-27 10:14:54 -0600 (Sat, 27 Jan 2007) | 2 lines

properly reference the size symbol produced by objcopy

........

................
r1998 | kpfleming | 2007-01-29 14:21:33 -0500 (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:
    team/file/zaptel-firmware/   (props changed)
    team/file/zaptel-firmware/wct4xxp/base.c

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 29 15:08:28 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1983
+/branches/1.4:1-2003

Modified: team/file/zaptel-firmware/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/base.c?view=diff&rev=2004&r1=2003&r2=2004
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/base.c (original)
+++ team/file/zaptel-firmware/wct4xxp/base.c Mon Jan 29 15:08:28 2007
@@ -3102,8 +3102,8 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern const u32 _binary_zaptel_fw_octasic_064_bin_size;
-	extern const u32 _binary_zaptel_fw_octasic_128_bin_size;
+	extern void *_binary_zaptel_fw_octasic_064_bin_size;
+	extern void *_binary_zaptel_fw_octasic_128_bin_size;
 	extern u8 _binary_zaptel_fw_octasic_064_bin_start[];
 	extern u8 _binary_zaptel_fw_octasic_128_bin_start[];
 #endif
@@ -3143,6 +3143,13 @@
 #else
 		embedded_firmware.data = _binary_zaptel_fw_octasic_064_bin_start;
 		embedded_firmware.size = _binary_zaptel_fw_octasic_064_bin_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_zaptel_fw_octasic_064_size;
 #endif
 		break;
 	case 128:
@@ -3154,7 +3161,13 @@
 		}
 #else
 		embedded_firmware.data = _binary_zaptel_fw_octasic_128_bin_start;
-		embedded_firmware.size = _binary_zaptel_fw_octasic_128_bin_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_zaptel_fw_octasic_128_size;
 #endif
 		break;
 	default: