[svn-commits] kpfleming: branch 1.4 r2039 - in /branches/1.4: ./ wct4xxp/base.c

svn-commits at lists.digium.com svn-commits at lists.digium.com
Tue Jan 30 18:34:26 MST 2007


Author: kpfleming
Date: Tue Jan 30 19:34:25 2007
New Revision: 2039

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2039
Log:
Merged revisions 2038 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2038 | kpfleming | 2007-01-30 19:33:25 -0600 (Tue, 30 Jan 2007) | 2 lines

final fix for non-hotplug firmware loading

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wct4xxp/base.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wct4xxp/base.c?view=diff&rev=2039&r1=2038&r2=2039
==============================================================================
--- branches/1.4/wct4xxp/base.c (original)
+++ branches/1.4/wct4xxp/base.c Tue Jan 30 19:34:25 2007
@@ -3102,8 +3102,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
@@ -3148,7 +3148,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:
@@ -3166,7 +3166,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:



More information about the svn-commits mailing list