diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-16 01:43:50 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-16 01:43:50 +0000 |
| commit | de9128a1e6b5ef6d91146b5b7d984efb1778fc34 (patch) | |
| tree | bcfcc94bf639aa3b7ad09efb74aefbd71a79e23c /wct4xxp/vpm450m.c | |
| parent | 905c0014c3982c5a88a2b9d0a0f740d39b979be4 (diff) | |
Merged revisions 1820 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r1820 | kpfleming | 2007-01-15 19:37:26 -0600 (Mon, 15 Jan 2007) | 11 lines
Merged revisions 1818 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1818 | kpfleming | 2007-01-15 19:28:54 -0600 (Mon, 15 Jan 2007) | 3 lines
eliminate the fw2h tool, and instead use objcopy to directly make object files from the firmware binary files
pass HOTPLUG_FIRMWARE down to the module build so that we can avoid various compiler warnings
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1822 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp/vpm450m.c')
| -rw-r--r-- | wct4xxp/vpm450m.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/wct4xxp/vpm450m.c b/wct4xxp/vpm450m.c index 8c3ac83..5eb40eb 100644 --- a/wct4xxp/vpm450m.c +++ b/wct4xxp/vpm450m.c @@ -13,8 +13,10 @@ #ifdef HOTPLUG_FIRMWARE #include <linux/firmware.h> #else -#include "vpmoct128_fw.h" -#include "vpmoct064_fw.h" +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" @@ -409,11 +411,11 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans) ChipOpen.ulImageSize = firmware->size; #else if (vpm450m->numchans > 64) { - ChipOpen.pbyImageFile = vpmoct128_fw; - ChipOpen.ulImageSize = sizeof(vpmoct128_fw); + ChipOpen.pbyImageFile = &_binary_OCT6114_128D_ima_start; + ChipOpen.ulImageSize = _binary_OCT6114_128D_ima_size; } else { - ChipOpen.pbyImageFile = vpmoct064_fw; - ChipOpen.ulImageSize = sizeof(vpmoct064_fw); + ChipOpen.pbyImageFile = &_binary_OCT6114_64D_ima_start; + ChipOpen.ulImageSize = _binary_OCT6114_64D_ima_size; } #endif |