diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-08 17:04:11 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-08 17:04:11 +0000 |
| commit | db2602ee74c907582858c1225bb0fffffe604a00 (patch) | |
| tree | f08c566c96008fdca60d6231c653f4804ad5e263 /wct4xxp | |
| parent | b6c017d1b25f9621fd6738419b6cd1377ca6eb3e (diff) | |
clean up firmware handling across wct4xxp, wctc4xxp, wctdm24xxp and wcte12xp drivers to use consistent methods
add non-hotplug firmware loading support to wctdm24xxp and wcte12xp
add license and copyright headers to various files that did not have them
clean up header inclusion in some files
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3365 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
| -rw-r--r-- | wct4xxp/base.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index e656065..f48bc6e 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -45,11 +45,6 @@ #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 @@ -2726,6 +2721,9 @@ static void t4_vpm450_init(struct t4 *wc) extern void _binary_OCT6114_128D_ima_size; extern u8 _binary_OCT6114_64D_ima_start[]; extern u8 _binary_OCT6114_128D_ima_start[]; +#else + static const char oct064_firmware[] = "OCT6114-64D.ima"; + static const char oct128_firmware[] = "OCT6114-128D.ima"; #endif if (!vpmsupport) { @@ -2796,15 +2794,13 @@ static void t4_vpm450_init(struct t4 *wc) if (!(wc->vpm450m = init_vpm450m(wc, laws, wc->numspans, firmware))) { printk("VPM450: Failed to initialize\n"); -#if defined(HOTPLUG_FIRMWARE) - release_firmware(firmware); -#endif + if (firmware != &embedded_firmware) + release_firmware(firmware); return; } -#if defined(HOTPLUG_FIRMWARE) - release_firmware(firmware); -#endif + if (firmware != &embedded_firmware) + release_firmware(firmware); if (vpmdtmfsupport == -1) { printk("VPM450: hardware DTMF disabled.\n"); |