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/base.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/base.c')
-rw-r--r-- | wct4xxp/base.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index 1ba83ae..6cbfbc5 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -50,6 +50,11 @@ #include "wct4xxp.h" #include "vpm450m.h" +#ifdef HOTPLUG_FIRMWARE +static const char *oct064_firmware = "OCT6114-64D.ima"; +static const char *oct128_firmware = "OCT6114-128D.ima"; +#endif + /* * Tasklets provide better system interactive response at the cost of the * possibility of losing a frame of data at very infrequent intervals. If @@ -62,10 +67,6 @@ /* #define ENABLE_TASKLETS */ -/* Firmware filenames, used for hotplug firmware loading */ -static const char *oct064_firmware = "OCT6114-64D.ima"; -static const char *oct128_firmware = "OCT6114-128D.ima"; - /* Work queues are a way to better distribute load on SMP systems */ #ifdef LINUX26 /* |