diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-16 04:39:38 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-16 04:39:38 +0000 |
| commit | 7a6513be6160ac434ca4c92f2ddb8b748cf5aa50 (patch) | |
| tree | ae0511aae87cc8bf92242dacdb728950e2f8beba /wct4xxp | |
| parent | de9128a1e6b5ef6d91146b5b7d984efb1778fc34 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1829 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
| -rw-r--r-- | wct4xxp/vpm450m.c | 17 |
1 files changed, 9 insertions, 8 deletions
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 <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 @@ 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 |