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

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 15:13:37 2007
New Revision: 1892

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

........
r1891 | kpfleming | 2007-01-22 15:12:35 -0600 (Mon, 22 Jan 2007) | 2 lines

make the non-hotplug firmware case actually compile again

........

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=1892&r1=1891&r2=1892
==============================================================================
--- branches/1.4/wct4xxp/base.c (original)
+++ branches/1.4/wct4xxp/base.c Mon Jan 22 15:13:37 2007
@@ -3102,10 +3102,10 @@
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern const u32 _binary_OCT6114_64D_size;
-	extern const u32 _binary_OCT6114_128D_size;
-	extern const u8 *_binary_OCT6114_64D_start;
-	extern const u8 *_binary_OCT6114_128D_start;
+	extern const u32 _binary_OCT6114_64D_ima_size;
+	extern const u32 _binary_OCT6114_128D_ima_size;
+	extern u8 _binary_OCT6114_64D_ima_start;
+	extern u8 _binary_OCT6114_128D_ima_start;
 #endif
 
 	if (!vpmsupport) {
@@ -3141,8 +3141,8 @@
 			return;
 		}
 #else
-		embedded_firmware.data = _binary_OCT6114D_64D_ima_start;
-		embedded_firmware.size = _binary_OCT6114D_64D_ima_start;
+		embedded_firmware.data = &_binary_OCT6114_64D_ima_start;
+		embedded_firmware.size = _binary_OCT6114_64D_ima_size;
 #endif
 		break;
 	case 128:
@@ -3153,8 +3153,8 @@
 			return;
 		}
 #else
-		embedded_firmware.data = _binary_OCT6114D_128D_ima_start;
-		embedded_firmware.size = _binary_OCT6114D_128D_ima_start;
+		embedded_firmware.data = &_binary_OCT6114_128D_ima_start;
+		embedded_firmware.size = _binary_OCT6114_128D_ima_size;
 #endif
 		break;
 	default: