diff options
Diffstat (limited to 'wct4xxp/base.c')
| -rw-r--r-- | wct4xxp/base.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index bcbeeee..bab8813 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -49,8 +49,8 @@ #include "vpm450m.h" #ifdef HOTPLUG_FIRMWARE -static const char *oct064_firmware = "OCT6114-64D.ima"; -static const char *oct128_firmware = "OCT6114-128D.ima"; +#include "../firmware/zaptel-fw-oct6114-064.h" +#include "../firmware/zaptel-fw-oct6114-128.h" #endif /* @@ -3107,10 +3107,10 @@ static void t4_vpm450_init(struct t4 *wc) struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) - extern void _binary_OCT6114_64D_ima_size; - extern void _binary_OCT6114_128D_ima_size; - extern u8 _binary_OCT6114_64D_ima_start[]; - extern u8 _binary_OCT6114_128D_ima_start[]; + extern void _binary_zaptel_fw_oct6114_064_bin_size; + extern void _binary_zaptel_fw_oct6114_128_bin_size; + extern u8 _binary_zaptel_fw_oct6114_064_bin_start[]; + extern u8 _binary_zaptel_fw_oct6114_128_bin_start[]; #endif if (!vpmsupport) { @@ -3140,38 +3140,38 @@ static void t4_vpm450_init(struct t4 *wc) switch ((vpm_capacity = get_vpm450m_capacity(wc))) { case 64: #if defined(HOTPLUG_FIRMWARE) - if ((request_firmware(&firmware, oct064_firmware, &wc->dev->dev) != 0) || + if ((request_firmware(&firmware, zaptel_fw_oct6114_064, &wc->dev->dev) != 0) || !firmware) { - printk("VPM450: firmware %s not available from userspace\n", oct064_firmware); + printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_oct6114_064); return; } #else - embedded_firmware.data = _binary_OCT6114_64D_ima_start; + embedded_firmware.data = _binary_zaptel_fw_oct6114_064_bin_start; /* Yes... this is weird. objcopy gives us a symbol containing the size of the firmware, not a pointer a variable containing the size. The only way we can get the value of the symbol is to take its address, so we define it as a pointer and then cast that value to the proper type. */ - embedded_firmware.size = (size_t) &_binary_OCT6114_64D_ima_size; + embedded_firmware.size = (size_t) &_binary_zaptel_fw_oct6114_064_bin_size; #endif break; case 128: #if defined(HOTPLUG_FIRMWARE) - if ((request_firmware(&firmware, oct128_firmware, &wc->dev->dev) != 0) || + if ((request_firmware(&firmware, zaptel_fw_oct6114_128, &wc->dev->dev) != 0) || !firmware) { - printk("VPM450: firmware %s not available from userspace\n", oct128_firmware); + printk("VPM450: firmware %s not available from userspace\n", zaptel_fw_oct6114_128); return; } #else - embedded_firmware.data = _binary_OCT6114_128D_ima_start; + embedded_firmware.data = _binary_zaptel_fw_oct6114_128_bin_start; /* Yes... this is weird. objcopy gives us a symbol containing the size of the firmware, not a pointer a variable containing the size. The only way we can get the value of the symbol is to take its address, so we define it as a pointer and then cast that value to the proper type. */ - embedded_firmware.size = (size_t) &_binary_OCT6114_128D_ima_size; + embedded_firmware.size = (size_t) &_binary_zaptel_fw_oct6114_128_bin_size; #endif break; default: |