diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-22 11:35:33 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-22 11:35:33 +0000 |
| commit | 49a66e309c5c7564027efa4cf823fac6b374a751 (patch) | |
| tree | 567f6b5f8f853468c1ccc7396d387363ac0a8729 /drivers/dahdi/wct4xxp | |
| parent | 796225defc1043e11fc7209e50a20cc896b350e7 (diff) | |
fix up all remaining references to zaptel/zapata (except for the ones in credits that need to be left alone)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4324 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wct4xxp')
| -rw-r--r-- | drivers/dahdi/wct4xxp/Kbuild | 10 | ||||
| -rw-r--r-- | drivers/dahdi/wct4xxp/base.c | 20 | ||||
| -rw-r--r-- | drivers/dahdi/wct4xxp/wct4xxp.h | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/drivers/dahdi/wct4xxp/Kbuild b/drivers/dahdi/wct4xxp/Kbuild index ca8d0d7..5d60d8e 100644 --- a/drivers/dahdi/wct4xxp/Kbuild +++ b/drivers/dahdi/wct4xxp/Kbuild @@ -11,11 +11,11 @@ endif wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x) ifneq ($(HOTPLUG_FIRMWARE),yes) -wct4xxp-objs += $(FIRM_DIR)/zaptel-fw-oct6114-064.o $(FIRM_DIR)/zaptel-fw-oct6114-128.o +wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o endif -$(obj)/$(FIRM_DIR)/zaptel-fw-oct6114-064.o: $(obj)/base.o - $(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-oct6114-064.o +$(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-064.o: $(obj)/base.o + $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-oct6114-064.o -$(obj)/$(FIRM_DIR)/zaptel-fw-oct6114-128.o: $(obj)/base.o - $(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-oct6114-128.o +$(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-128.o: $(obj)/base.o + $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-oct6114-128.o diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 78bdb29..0665327 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -3124,13 +3124,13 @@ 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_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[]; + extern void _binary_dahdi_fw_oct6114_064_bin_size; + extern void _binary_dahdi_fw_oct6114_128_bin_size; + extern u8 _binary_dahdi_fw_oct6114_064_bin_start[]; + extern u8 _binary_dahdi_fw_oct6114_128_bin_start[]; #else - static const char oct064_firmware[] = "zaptel-fw-oct6114-064.bin"; - static const char oct128_firmware[] = "zaptel-fw-oct6114-128.bin"; + static const char oct064_firmware[] = "dahdi-fw-oct6114-064.bin"; + static const char oct128_firmware[] = "dahdi-fw-oct6114-128.bin"; #endif if (!vpmsupport) { @@ -3166,14 +3166,14 @@ static void t4_vpm450_init(struct t4 *wc) return; } #else - embedded_firmware.data = _binary_zaptel_fw_oct6114_064_bin_start; + embedded_firmware.data = _binary_dahdi_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_zaptel_fw_oct6114_064_bin_size; + embedded_firmware.size = (size_t) &_binary_dahdi_fw_oct6114_064_bin_size; #endif break; case 128: @@ -3184,14 +3184,14 @@ static void t4_vpm450_init(struct t4 *wc) return; } #else - embedded_firmware.data = _binary_zaptel_fw_oct6114_128_bin_start; + embedded_firmware.data = _binary_dahdi_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_zaptel_fw_oct6114_128_bin_size; + embedded_firmware.size = (size_t) &_binary_dahdi_fw_oct6114_128_bin_size; #endif break; default: diff --git a/drivers/dahdi/wct4xxp/wct4xxp.h b/drivers/dahdi/wct4xxp/wct4xxp.h index 60b8154..893c317 100644 --- a/drivers/dahdi/wct4xxp/wct4xxp.h +++ b/drivers/dahdi/wct4xxp/wct4xxp.h @@ -1,5 +1,5 @@ /* - * Wilcard T400P FXS Interface Driver for Zapata Telephony interface + * Wilcard T400P FXS Interface Driver for DAHDI Telephony interface * * Written by Mark Spencer <markster@linux-support.net> * |