[svn-commits] kpfleming: branch 1.2 r2038 - /branches/1.2/wct4xxp/base.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 30 19:33:25 2007
New Revision: 2038

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2038
Log:
final fix for non-hotplug firmware loading

Modified:
    branches/1.2/wct4xxp/base.c

Modified: branches/1.2/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wct4xxp/base.c?view=diff&rev=2038&r1=2037&r2=2038
==============================================================================
--- branches/1.2/wct4xxp/base.c (original)
+++ branches/1.2/wct4xxp/base.c Tue Jan 30 19:33:25 2007
@@ -2679,8 +2679,8 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern void *_binary_OCT6114_64D_ima_size;
-	extern void *_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
@@ -2725,7 +2725,7 @@
 		   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;
+		embedded_firmware.size = (size_t) &_binary_OCT6114_64D_ima_size;
 #endif
 		break;
 	case 128:
@@ -2743,7 +2743,7 @@
 		   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;
+		embedded_firmware.size = (size_t) &_binary_OCT6114_128D_ima_size;
 #endif
 		break;
 	default: