[svn-commits] kpfleming: trunk r1829 - in /trunk: ./ build_tools/ wct4xxp/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 15 22:39:38 2007
New Revision: 1829

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

................
r1828 | kpfleming | 2007-01-15 22:38:41 -0600 (Mon, 15 Jan 2007) | 16 lines

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

........
r1826 | kpfleming | 2007-01-15 22:30:00 -0600 (Mon, 15 Jan 2007) | 3 lines

make the 'firmware object' files load the firmware blobs as read-only data
simplify the code that uses the firmware objects a bit

........
r1827 | kpfleming | 2007-01-15 22:37:06 -0600 (Mon, 15 Jan 2007) | 2 lines

use latest Octasic API tag

........

................

Modified:
    trunk/   (props changed)
    trunk/build_tools/make_firmware_object
    trunk/wct4xxp/vpm450m.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Jan 15 22:39:38 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Mon Jan 15 22:39:38 2007
@@ -1,2 +1,2 @@
 menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
-oct612x https://origsvn.digium.com/svn/octasic_api/oct612x/tags/PR43-00/software
+oct612x http://svn.digium.com/svn/octasic_api/oct612x/tags/PR43-01/software

Modified: trunk/build_tools/make_firmware_object
URL: http://svn.digium.com/view/zaptel/trunk/build_tools/make_firmware_object?view=diff&rev=1829&r1=1828&r2=1829
==============================================================================
--- trunk/build_tools/make_firmware_object (original)
+++ trunk/build_tools/make_firmware_object Mon Jan 15 22:39:38 2007
@@ -9,4 +9,4 @@
 bfdname=`objdump -f ${3} | grep -e "${3}:" | sed "s/.*file format \(.*\)/\1/"`
 bfdarch=`objdump -f ${3} | grep -e "architecture:" | sed "s/.*ture: \(.*\),.*/\1/"`
 
-objcopy -I binary ${1} -B ${bfdarch} -O ${bfdname} ${2}
+objcopy -I binary ${1} -B ${bfdarch} -O ${bfdname} ${2} --rename-section .data=.rodata,alloc,load,data,contents,readonly

Modified: trunk/wct4xxp/vpm450m.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/vpm450m.c?view=diff&rev=1829&r1=1828&r2=1829
==============================================================================
--- trunk/wct4xxp/vpm450m.c (original)
+++ trunk/wct4xxp/vpm450m.c Mon Jan 15 22:39:38 2007
@@ -12,11 +12,6 @@
 #include <linux/time.h>
 #ifdef HOTPLUG_FIRMWARE
 #include <linux/firmware.h>
-#else
-extern unsigned char _binary_OCT6114_64D_ima_start;
-extern unsigned int _binary_OCT6114_64D_ima_size;
-extern unsigned char _binary_OCT6114_128D_ima_start;
-extern unsigned int _binary_OCT6114_128D_ima_size;
 #endif
 
 #include "oct6100api/oct6100_api.h"
@@ -44,7 +39,7 @@
 	return cOCT6100_ERR_OK;
 }
 
-UINT32 Oct6100UserMemCopy(PVOID f_pDestination, PVOID f_pSource, UINT32 f_ulLength)
+UINT32 Oct6100UserMemCopy(PVOID f_pDestination, const void *f_pSource, UINT32 f_ulLength)
 {
 	memcpy(f_pDestination, f_pSource, f_ulLength);
 	return cOCT6100_ERR_OK;
@@ -411,10 +406,16 @@
 	ChipOpen.ulImageSize = firmware->size;
 #else
 	if (vpm450m->numchans > 64) {
-		ChipOpen.pbyImageFile = &_binary_OCT6114_128D_ima_start;
+		extern const unsigned char _binary_OCT6114_128D_ima_start[];
+		extern const unsigned int _binary_OCT6114_128D_ima_size;
+
+		ChipOpen.pbyImageFile = _binary_OCT6114_128D_ima_start;
 		ChipOpen.ulImageSize = _binary_OCT6114_128D_ima_size;
 	} else {
-		ChipOpen.pbyImageFile = &_binary_OCT6114_64D_ima_start;
+		extern const unsigned char _binary_OCT6114_64D_ima_start[];
+		extern const unsigned int _binary_OCT6114_64D_ima_size;
+
+		ChipOpen.pbyImageFile = _binary_OCT6114_64D_ima_start;
 		ChipOpen.ulImageSize = _binary_OCT6114_64D_ima_size;
 	}
 #endif