From 51279fd0ed6db09b723f915c798891d26f914883 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Tue, 16 Jan 2007 04:38:41 +0000 Subject: 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 ........ git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@1828 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- wct4xxp/vpm450m.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'wct4xxp') diff --git a/wct4xxp/vpm450m.c b/wct4xxp/vpm450m.c index 5eb40eb..89874ac 100644 --- a/wct4xxp/vpm450m.c +++ b/wct4xxp/vpm450m.c @@ -12,11 +12,6 @@ #include #ifdef HOTPLUG_FIRMWARE #include -#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 @@ UINT32 Oct6100UserMemSet(PVOID f_pAddress, UINT32 f_ulPattern, UINT32 f_ulLength 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 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans) 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 -- cgit v1.2.3