[svn-commits] kpfleming: branch mogorman/zaptel-1.2-transcoder r2000 - in /team/mogorman/za...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 29 13:31:17 2007
New Revision: 2000

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2000
Log:
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/mogorman/zaptel-1.2-transcoder/   (props changed)
    team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c
    team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c

Propchange: team/mogorman/zaptel-1.2-transcoder/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 29 13:31:17 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-1989
+/branches/1.2:1-1999

Modified: team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c?view=diff&rev=2000&r1=1999&r2=2000
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c Mon Jan 29 13:31:17 2007
@@ -2679,8 +2679,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
@@ -2719,7 +2719,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:
@@ -2731,7 +2737,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:

Modified: team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c?view=diff&rev=2000&r1=1999&r2=2000
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c Mon Jan 29 13:31:17 2007
@@ -61,7 +61,7 @@
 static const char *tc400m_firmware = "tc400m-firmware.bin";
 #else
 extern u8 _binary_tc400m_firmware_bin_start[];
-extern const size_t *_binary_tc400m_firmware_bin_size;
+extern void *_binary_tc400m_firmware_bin_size;
 #endif
 
 static struct pci_driver driver;
@@ -1433,7 +1433,13 @@
 	}
 #else
 	embedded_firmware.data = _binary_tc400m_firmware_bin_start;
-	embedded_firmware.size = *_binary_tc400m_firmware_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_tc400m_firmware_bin_size;
 #endif
 
 	firmware_ver = firmware->data[0];