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/wctdm24xxp | |
| 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/wctdm24xxp')
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/Kbuild | 6 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 18 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/wctdm24xxp.h | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/dahdi/wctdm24xxp/Kbuild b/drivers/dahdi/wctdm24xxp/Kbuild index b2699e2..51220b9 100644 --- a/drivers/dahdi/wctdm24xxp/Kbuild +++ b/drivers/dahdi/wctdm24xxp/Kbuild @@ -11,8 +11,8 @@ endif wctdm24xxp-objs := base.o GpakCust.o GpakApi.o ../voicebus.o ifneq ($(HOTPLUG_FIRMWARE),yes) -wctdm24xxp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o +wctdm24xxp-objs += $(FIRM_DIR)/dahdi-fw-vpmadt032.o endif -$(obj)/$(FIRM_DIR)/zaptel-fw-vpmadt032.o: $(obj)/base.o - $(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-vpmadt032.o +$(obj)/$(FIRM_DIR)/dahdi-fw-vpmadt032.o: $(obj)/base.o + $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-vpmadt032.o diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index f1a749e..9acf6f1 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -1,5 +1,5 @@ /* - * Wildcard TDM2400P TDM FXS/FXO Interface Driver for Zapata Telephony interface + * Wildcard TDM2400P TDM FXS/FXO Interface Driver for DAHDI Telephony interface * * Written by Mark Spencer <markster@digium.com> * Support for TDM800P and VPM150M by Matthew Fredrickson <creslin@digium.com> @@ -2842,7 +2842,7 @@ static int wctdm_initialize(struct wctdm *wc) int x; struct pci_dev *pdev = voicebus_get_pci_dev(wc->vb); - /* Zapata stuff */ + /* DAHDI stuff */ sprintf(wc->span.name, "WCTDM/%d", wc->pos); snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Board %d", wc->variety, wc->pos + 1); snprintf(wc->span.location, sizeof(wc->span.location) - 1, @@ -3306,10 +3306,10 @@ static enum vpmadt032_init_result wctdm_vpm150m_init(struct wctdm *wc) struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) - extern void _binary_zaptel_fw_vpmadt032_bin_size; - extern u8 _binary_zaptel_fw_vpmadt032_bin_start[]; + extern void _binary_dahdi_fw_vpmadt032_bin_size; + extern u8 _binary_dahdi_fw_vpmadt032_bin_start[]; #else - static const char vpmadt032_firmware[] = "zaptel-fw-vpmadt032.bin"; + static const char vpmadt032_firmware[] = "dahdi-fw-vpmadt032.bin"; #endif gpakDownloadStatus_t downloadstatus; gpakPingDspStat_t pingstatus; @@ -3410,8 +3410,8 @@ static enum vpmadt032_init_result wctdm_vpm150m_init(struct wctdm *wc) goto failed_exit; } #else - embedded_firmware.data = _binary_zaptel_fw_vpmadt032_bin_start; - embedded_firmware.size = (size_t) &_binary_zaptel_fw_vpmadt032_bin_size; + embedded_firmware.data = _binary_dahdi_fw_vpmadt032_bin_start; + embedded_firmware.size = (size_t) &_binary_dahdi_fw_vpmadt032_bin_size; #endif fw.fw = firmware; fw.offset = 0; @@ -3843,9 +3843,9 @@ retry: /* Final initialization */ wctdm_post_initialize(wc); - /* We should be ready for zaptel to come in now. */ + /* We should be ready for DAHDI to come in now. */ if (dahdi_register(&wc->span, 0)) { - printk("Unable to register span with zaptel\n"); + printk("Unable to register span with DAHDI\n"); return -1; } diff --git a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h index dca7ae5..3dedcdc 100644 --- a/drivers/dahdi/wctdm24xxp/wctdm24xxp.h +++ b/drivers/dahdi/wctdm24xxp/wctdm24xxp.h @@ -1,5 +1,5 @@ /* - * Wildcard TDM2400P TDM FXS/FXO Interface Driver for Zapata Telephony interface + * Wildcard TDM2400P TDM FXS/FXO Interface Driver for DAHDI Telephony interface * * Written by Mark Spencer <markster@digium.com> * Support for TDM800P and VPM150M by Matthew Fredrickson <creslin@digium.com> |