diff options
32 files changed, 210 insertions, 253 deletions
@@ -255,38 +255,13 @@ update: fi clean: - -@$(MAKE) -C menuselect clean - rm -f torisatool - rm -f $(BINS) - rm -f *.o ztcfg tzdriver sethdlc sethdlc-new - rm -f $(LTZ_SO) $(LTZ_A) *.lo -ifeq (yes,$(HAS_KSRC)) $(KMAKE) clean -else - rm -f kernel/*.o kernel/*.ko kernel/*/*.o kernel/*/*.ko -endif - @for dir in $(SUBDIRS_UTILS_ALL); do \ - $(MAKE) -C $$dir clean; \ - done $(MAKE) -C firmware clean - rm -rf .tmp_versions - rm -f gendigits tones.h - rm -f libtonezone* - rm -f fxotune - rm -f core - rm -f ztcfg-shared fxstest - rm -rf misdn* - rm -rf mISDNuser* - rm -rf $(GROFF_HTML) - rm -rf README.html xpp/README.Astribank.html zaptel.conf.asciidoc distclean: dist-clean dist-clean: clean - @$(MAKE) -C menuselect dist-clean @$(MAKE) -C firmware dist-clean - rm -f makeopts menuselect.makeopts menuselect-tree - rm -f config.log config.status .PHONY: distclean dist-clean clean version.h all _all install b410p devices programs modules tests devel data stackcheck install-udev config update install-programs install-modules install-include install-libs install-utils-subdirs utils-subdirs uninstall-modules diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild index d6b8d5e..a1a222d 100644 --- a/drivers/dahdi/Kbuild +++ b/drivers/dahdi/Kbuild @@ -54,7 +54,7 @@ $(obj)/makefw: $(src)/makefw.c # set CONFIG_DAHDI_MMX for a number of CPU types. # Right now this part is not enabled, unless you build with -# ZAPTEL_MMX_AUTO=something . +# DAHDI_MMX_AUTO=something . ZAPMMX_WHITELIST_i386 = M586MMX M686 MPENTIUMII MPENTIUMIII MPENTIUMM \ MPENTIUM4 MVIAC3_2 @@ -65,7 +65,7 @@ ZAPMMX_CONFIG_VARS := $(ZAPMMX_WHITELIST_$(ARCH):%=CONFIG_%) # expand them: ZAPMMX_CONFIG_VALS := $(strip $(foreach var,$(ZAPMMX_CONFIG_VARS),$(var)) ) -ifneq (,$(ZAPTEL_MMX_AUTO)) +ifneq (,$(DAHDI_MMX_AUTO)) ifneq (,$(ZAPMMX_CONFIG_VALS)) # TODO: make that CFLAGS_dahdi-base.o += -DCONFIG_DAHDI_MMX diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 34eb2ae..21cbb90 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -1,5 +1,5 @@ /* - * Zapata Telephony Interface Driver + * DAHDI Telephony Interface Driver * * Written by Mark Spencer <markster@digium.com> * Based on previous works, designs, and architectures conceived and @@ -7,7 +7,7 @@ * * Special thanks to Steve Underwood <steve@coppice.org> * for substantial contributions to signal processing functions - * in zaptel and the zapata library. + * in DAHDI and the Zapata library. * * Yury Bokhoncovich <byg@cf1.ru> * Adaptation for 2.4.20+ kernels (HDLC API was changed) @@ -154,7 +154,7 @@ static struct proc_dir_entry *proc_entries[DAHDI_MAX_SPANS]; /* Here are a couple important little additions for devfs */ #ifdef CONFIG_DEVFS_FS -static devfs_handle_t zaptel_devfs_dir; +static devfs_handle_t dahdi_devfs_dir; static devfs_handle_t channel; static devfs_handle_t pseudo; static devfs_handle_t ctl; @@ -419,7 +419,7 @@ static struct dahdi_zone *tone_zones[DAHDI_TONE_ZONE_MAX]; /* Echo cancellation */ #if defined(ECHO_CAN_HPEC) -#include "hpec/hpec_zaptel.h" +#include "hpec/hpec_dahdi.h" #elif defined(ECHO_CAN_STEVE) #include "sec.h" #elif defined(ECHO_CAN_STEVE2) @@ -547,7 +547,7 @@ static inline int fill_alarm_string(char *buf, int count, int alarms) return len; } -static int zaptel_proc_read(char *page, char **start, off_t off, int count, int *eof, void *data) +static int dahdi_proc_read(char *page, char **start, off_t off, int count, int *eof, void *data) { int x, len = 0; long span; @@ -1182,8 +1182,8 @@ static int start_tone(struct dahdi_chan *chan, int tone) static int __warnonce = 1; if (__warnonce) { __warnonce = 0; - /* The tonezones are loaded by ztcfg based on /etc/zaptel.conf. */ - printk(KERN_WARNING "zaptel: Cannot start tones until tone zone is loaded.\n"); + /* The tonezones are loaded by ztcfg based on /etc/dahdi.conf. */ + printk(KERN_WARNING "DAHDI: Cannot start tones until tone zone is loaded.\n"); } /* Note that no tone zone exists at the moment */ res = -ENODATA; @@ -1346,20 +1346,20 @@ static devfs_handle_t register_devfs_channel(struct dahdi_chan *chan, devfs_hand sprintf(path, "%d", chan->chanpos); chan_dev = devfs_register(dir, path, flags, DAHDI_MAJOR, chan->channo, mode, &dahdi_fops, NULL); if (!chan_dev) { - printk("zaptel: Something really bad happened. Unable to register devfs entry\n"); + printk("DAHDI: Something really bad happened. Unable to register devfs entry\n"); return NULL; } /* Set up the path of the destination of the link */ link_offset = devfs_generate_path(chan_dev, link, sizeof(link) - 1); /* Now we need to strip off the leading "zap/". If we don't, then we build a broken symlink */ - path_offset = devfs_generate_path(zaptel_devfs_dir, path, sizeof(path) - 1); /* We'll just "borrow" path for a second */ + path_offset = devfs_generate_path(dahdi_devfs_dir, path, sizeof(path) - 1); /* We'll just "borrow" path for a second */ path_offset = strlen(path+path_offset); link_offset += path_offset; /* Taking out the "zap" */ link_offset++; /* Add one more place for the '/'. The path generated does not contain the '/' we need to strip */ /* Set up the path of the file/link itself */ - tmp_offset = devfs_generate_path(zaptel_devfs_dir, tmp, sizeof(tmp) - 1); + tmp_offset = devfs_generate_path(dahdi_devfs_dir, tmp, sizeof(tmp) - 1); sprintf(buf, "/%d", chan->channo); dahdi_copy_string(path, tmp+tmp_offset, sizeof(path)); strncat(path, buf, sizeof(path) - 1); @@ -2912,8 +2912,8 @@ struct dahdi_tone *dahdi_mf_tone(const struct dahdi_chan *chan, char digit, int static int __warnonce = 1; if (__warnonce) { __warnonce = 0; - /* The tonezones are loaded by ztcfg based on /etc/zaptel.conf. */ - printk(KERN_WARNING "zaptel: Cannot get dtmf tone until tone zone is loaded.\n"); + /* The tonezones are loaded by ztcfg based on /etc/dahdi.conf. */ + printk(KERN_WARNING "DAHDI: Cannot get dtmf tone until tone zone is loaded.\n"); } return NULL; } @@ -4043,7 +4043,7 @@ static int dahdi_ctl_ioctl(struct inode *inode, struct file *file, unsigned int spin_lock_irqsave(&spans[maint.spanno]->lock, flags); break; default: - printk("zaptel: Unknown maintenance event: %d\n", maint.command); + printk("DAHDI: Unknown maintenance event: %d\n", maint.command); } dahdi_alarm_notify(spans[maint.spanno]); /* process alarm-related events */ spin_unlock_irqrestore(&spans[maint.spanno]->lock, flags); @@ -4092,8 +4092,8 @@ static int ioctl_dahdi_dial(struct dahdi_chan *chan, unsigned long data) spin_lock_irqsave(&chan->lock, flags); if (!chan->curzone) { spin_unlock_irqrestore(&chan->lock, flags); - /* The tone zones are loaded by ztcfg from /etc/zaptel.conf */ - printk(KERN_WARNING "zaptel: Cannot dial until a tone zone is loaded.\n"); + /* The tone zones are loaded by ztcfg from /etc/dahdi.conf */ + printk(KERN_WARNING "DAHDI: Cannot dial until a tone zone is loaded.\n"); return -ENODATA; } switch (tdo->op) { @@ -5006,7 +5006,7 @@ static int dahdi_chan_ioctl(struct inode *inode, struct file *file, unsigned int spin_lock_irqsave(&chan->lock, flags); if (!chan->curzone) { spin_unlock_irqrestore(&chan->lock, flags); - printk(KERN_WARNING "zaptel: Cannot start tone until a tone zone is loaded.\n"); + printk(KERN_WARNING "DAHDI: Cannot start tone until a tone zone is loaded.\n"); return -ENODATA; } if (chan->txstate != DAHDI_TXSTATE_ONHOOK) { @@ -5185,19 +5185,19 @@ int dahdi_register(struct dahdi_span *span, int prefmaster) if (maxspans < x + 1) maxspans = x + 1; } else { - printk(KERN_ERR "Too many zapata spans registered\n"); + printk(KERN_ERR "Too many DAHDI spans registered\n"); return -EBUSY; } span->flags |= DAHDI_FLAG_REGISTERED; span->spanno = x; spin_lock_init(&span->lock); if (!span->deflaw) { - printk("zaptel: Span %s didn't specify default law. Assuming mulaw, please fix driver!\n", span->name); + printk("DAHDI: Span %s didn't specify default law. Assuming mulaw, please fix driver!\n", span->name); span->deflaw = DAHDI_LAW_MULAW; } if (span->echocan && span->echocan_with_params) { - printk("zaptel: Span %s implements both echocan and echocan_with_params functions, preserving only echocan_with_params, please fix driver!\n", span->name); + printk("DAHDI: Span %s implements both echocan and echocan_with_params functions, preserving only echocan_with_params, please fix driver!\n", span->name); span->echocan = NULL; } @@ -5207,15 +5207,15 @@ int dahdi_register(struct dahdi_span *span, int prefmaster) } #ifdef CONFIG_PROC_FS - sprintf(tempfile, "zaptel/%d", span->spanno); - proc_entries[span->spanno] = create_proc_read_entry(tempfile, 0444, NULL , zaptel_proc_read, (int *)(long)span->spanno); + sprintf(tempfile, "dahdi/%d", span->spanno); + proc_entries[span->spanno] = create_proc_read_entry(tempfile, 0444, NULL , dahdi_proc_read, (int *)(long)span->spanno); #endif #ifdef CONFIG_DEVFS_FS { char span_name[50]; sprintf(span_name, "span%d", span->spanno); - span->dhandle = devfs_mk_dir(zaptel_devfs_dir, span_name, NULL); + span->dhandle = devfs_mk_dir(dahdi_devfs_dir, span_name, NULL); for (x = 0; x < span->channels; x++) { struct dahdi_chan *chan = &span->chans[x]; chan->fhandle = register_devfs_channel(chan, chan->span->dhandle); /* Register our stuff with devfs */ @@ -5269,7 +5269,7 @@ int dahdi_unregister(struct dahdi_span *span) if (debug) printk("Unregistering Span '%s' with %d channels\n", span->name, span->channels); #ifdef CONFIG_PROC_FS - sprintf(tempfile, "zaptel/%d", span->spanno); + sprintf(tempfile, "dahdi/%d", span->spanno); remove_proc_entry(tempfile, NULL); #endif /* CONFIG_PROC_FS */ #ifdef CONFIG_DEVFS_FS @@ -5485,7 +5485,7 @@ static inline void __dahdi_process_getaudio_chunk(struct dahdi_chan *ss, unsigne for (x=0;x<DAHDI_CHUNKSIZE;x++) { /* Check for echo cancel disabling tone */ if (echo_can_disable_detector_update(&ms->txecdis, getlin[x])) { - printk("zaptel Disabled echo canceller because of tone (tx) on channel %d\n", ss->channo); + printk("DAHDI Disabled echo canceller because of tone (tx) on channel %d\n", ss->channo); ms->echocancel = 0; ms->echostate = ECHO_STATE_IDLE; ms->echolastupdate = 0; @@ -6439,7 +6439,7 @@ static inline void __dahdi_process_putaudio_chunk(struct dahdi_chan *ss, unsigne if (ms->ec) { for (x=0;x<DAHDI_CHUNKSIZE;x++) { if (echo_can_disable_detector_update(&ms->rxecdis, putlin[x])) { - printk("zaptel Disabled echo canceller because of tone (rx) on channel %d\n", ss->channo); + printk("DAHDI Disabled echo canceller because of tone (rx) on channel %d\n", ss->channo); ms->echocancel = 0; ms->echostate = ECHO_STATE_IDLE; ms->echolastupdate = 0; @@ -7589,7 +7589,7 @@ int dahdi_receive(struct dahdi_span *span) } MODULE_AUTHOR("Mark Spencer <markster@digium.com>"); -MODULE_DESCRIPTION("Zapata Telephony Interface"); +MODULE_DESCRIPTION("DAHDI Telephony Interface"); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); #endif @@ -7695,7 +7695,7 @@ int dahdi_register_chardev(struct dahdi_chardev *dev) #endif /* CONFIG_DAHDI_UDEV */ #ifdef CONFIG_DEVFS_FS - dev->devfs_handle = devfs_register(zaptel_devfs_dir, dev->name, DEVFS_FL_DEFAULT, DAHDI_MAJOR, dev->minor, mode, &dahdi_fops, NULL); + dev->devfs_handle = devfs_register(dahdi_devfs_dir, dev->name, DEVFS_FL_DEFAULT, DAHDI_MAJOR, dev->minor, mode, &dahdi_fops, NULL); #endif /* CONFIG_DEVFS_FS */ return 0; @@ -7718,11 +7718,11 @@ static int __init dahdi_init(void) { int res = 0; #ifdef CONFIG_PROC_FS - proc_entries[0] = proc_mkdir("zaptel", NULL); + proc_entries[0] = proc_mkdir("dahdi", NULL); #endif #ifdef CONFIG_DAHDI_UDEV /* udev support functions */ - dahdi_class = class_create(THIS_MODULE, "zaptel"); + dahdi_class = class_create(THIS_MODULE, "dahdi"); CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 253), NULL, "zaptimer"); CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 254), NULL, "zapchannel"); CLASS_DEV_CREATE(dahdi_class, MKDEV(DAHDI_MAJOR, 255), NULL, "zappseudo"); @@ -7733,22 +7733,22 @@ static int __init dahdi_init(void) { { umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO; - devfs_register_chrdev(DAHDI_MAJOR, "zaptel", &dahdi_fops); - if (!(zaptel_devfs_dir = devfs_mk_dir(NULL, "zap", NULL))) + devfs_register_chrdev(DAHDI_MAJOR, "dahdi", &dahdi_fops); + if (!(dahdi_devfs_dir = devfs_mk_dir(NULL, "zap", NULL))) return -EBUSY; /* This would be bad */ - timer = devfs_register(zaptel_devfs_dir, "timer", DEVFS_FL_DEFAULT, DAHDI_MAJOR, 253, mode, &dahdi_fops, NULL); - channel = devfs_register(zaptel_devfs_dir, "channel", DEVFS_FL_DEFAULT, DAHDI_MAJOR, 254, mode, &dahdi_fops, NULL); - pseudo = devfs_register(zaptel_devfs_dir, "pseudo", DEVFS_FL_DEFAULT, DAHDI_MAJOR, 255, mode, &dahdi_fops, NULL); - ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, DAHDI_MAJOR, 0, mode, &dahdi_fops, NULL); + timer = devfs_register(dahdi_devfs_dir, "timer", DEVFS_FL_DEFAULT, DAHDI_MAJOR, 253, mode, &dahdi_fops, NULL); + channel = devfs_register(dahdi_devfs_dir, "channel", DEVFS_FL_DEFAULT, DAHDI_MAJOR, 254, mode, &dahdi_fops, NULL); + pseudo = devfs_register(dahdi_devfs_dir, "pseudo", DEVFS_FL_DEFAULT, DAHDI_MAJOR, 255, mode, &dahdi_fops, NULL); + ctl = devfs_register(dahdi_devfs_dir, "ctl", DEVFS_FL_DEFAULT, DAHDI_MAJOR, 0, mode, &dahdi_fops, NULL); } #else - if ((res = register_chrdev(DAHDI_MAJOR, "zaptel", &dahdi_fops))) { + if ((res = register_chrdev(DAHDI_MAJOR, "dahdi", &dahdi_fops))) { printk(KERN_ERR "Unable to register DAHDI character device handler on %d\n", DAHDI_MAJOR); return res; } #endif /* CONFIG_DEVFS_FS */ - printk(KERN_INFO "Zapata Telephony Interface Registered on major %d\n", DAHDI_MAJOR); + printk(KERN_INFO "DAHDI Telephony Interface Registered on major %d\n", DAHDI_MAJOR); printk(KERN_INFO "DAHDI Version: %s\n", DAHDI_VERSION); echo_can_init(); dahdi_conv_init(); @@ -7765,10 +7765,10 @@ static void __exit dahdi_cleanup(void) { int x; #ifdef CONFIG_PROC_FS - remove_proc_entry("zaptel", NULL); + remove_proc_entry("dahdi", NULL); #endif - printk(KERN_INFO "Zapata Telephony Interface Unloaded\n"); + printk(KERN_INFO "DAHDI Telephony Interface Unloaded\n"); for (x = 0; x < DAHDI_TONE_ZONE_MAX; x++) { if (tone_zones[x]) kfree(tone_zones[x]); @@ -7779,8 +7779,8 @@ static void __exit dahdi_cleanup(void) { devfs_unregister(channel); devfs_unregister(pseudo); devfs_unregister(ctl); - devfs_unregister(zaptel_devfs_dir); - devfs_unregister_chrdev(DAHDI_MAJOR, "zaptel"); + devfs_unregister(dahdi_devfs_dir); + devfs_unregister_chrdev(DAHDI_MAJOR, "dahdi"); #else #ifdef CONFIG_DAHDI_UDEV class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 253)); /* timer */ @@ -7789,7 +7789,7 @@ static void __exit dahdi_cleanup(void) { class_device_destroy(dahdi_class, MKDEV(DAHDI_MAJOR, 0)); /* ctl */ class_destroy(dahdi_class); #endif /* CONFIG_DAHDI_UDEV */ - unregister_chrdev(DAHDI_MAJOR, "zaptel"); + unregister_chrdev(DAHDI_MAJOR, "dahdi"); #endif #ifdef CONFIG_DAHDI_WATCHDOG watchdog_cleanup(); diff --git a/drivers/dahdi/dahdi_config.h b/drivers/dahdi/dahdi_config.h index 997efb4..327182b 100644 --- a/drivers/dahdi/dahdi_config.h +++ b/drivers/dahdi/dahdi_config.h @@ -46,7 +46,7 @@ /* #define CONFIG_CALC_XLAW */ /* - * Define if you want MMX optimizations in zaptel + * Define if you want MMX optimizations in DAHDI * * Note: CONFIG_DAHDI_MMX is generally incompatible with AMD * processors and can cause system instability! @@ -82,7 +82,7 @@ #endif /* ifndef ECHO_CAN_FROMENV */ /* * Define to turn off the echo canceler disable tone detector, - * which will cause zaptel to ignore the 2100 Hz echo cancel disable + * which will cause dahdi to ignore the 2100 Hz echo cancel disable * tone. */ /* #define NO_ECHOCAN_DISABLE */ @@ -185,7 +185,7 @@ /* * Enable sync_tick() calls. Allows low-level drivers to synchronize - * their internal clocks to the zaptel master clock. + * their internal clocks to the dahdi master clock. */ #define DAHDI_SYNC_TICK diff --git a/drivers/dahdi/dahdi_dummy.c b/drivers/dahdi/dahdi_dummy.c index bd08863..da6e687 100644 --- a/drivers/dahdi/dahdi_dummy.c +++ b/drivers/dahdi/dahdi_dummy.c @@ -1,5 +1,5 @@ /* - * Dummy DAHDI Driver for Zapata Telephony interface + * Dummy DAHDI Driver for DAHDI Telephony interface * * Required: usb-uhci module and kernel > 2.4.4 OR kernel > 2.6.0 * @@ -263,9 +263,9 @@ extern uhci_t **uhci_devices; #endif -#define DAHDI_RATE 1000 /* zaptel ticks per second */ -#define DAHDI_TIME (1000000 / DAHDI_RATE) /* zaptel tick time in us */ -#define DAHDI_TIME_NS (DAHDI_TIME * 1000) /* zaptel tick time in ns */ +#define DAHDI_RATE 1000 /* DAHDI ticks per second */ +#define DAHDI_TIME (1000000 / DAHDI_RATE) /* DAHDI tick time in us */ +#define DAHDI_TIME_NS (DAHDI_TIME * 1000) /* DAHDI tick time in ns */ /* Different bits of the debug variable: */ #define DEBUG_GENERAL (1 << 0) @@ -386,7 +386,7 @@ static void ztdummy_interrupt(int irq, void *dev_id, struct pt_regs *regs) static int ztdummy_initialize(struct ztdummy *ztd) { - /* Zapata stuff */ + /* DAHDI stuff */ sprintf(ztd->span.name, "ZTDUMMY/1"); snprintf(ztd->span.desc, sizeof(ztd->span.desc) - 1, "%s (source: " CLOCK_SRC ") %d", ztd->span.name, 1); sprintf(ztd->chan.name, "ZTDUMMY/%d/%d", 1, 0); @@ -438,7 +438,7 @@ int init_module(void) memset(ztd, 0x0, sizeof(struct ztdummy)); if (ztdummy_initialize(ztd)) { - printk(KERN_ERR "ztdummy: Unable to intialize zaptel driver\n"); + printk(KERN_ERR "ztdummy: Unable to intialize DAHDI driver\n"); kfree(ztd); return -ENODEV; } @@ -451,7 +451,7 @@ int init_module(void) ztd->rtc_task.private_data = ztd; err = rtc_register(&ztd->rtc_task); if (err < 0) { - printk(KERN_ERR "ztdummy: Unable to register zaptel rtc driver\n"); + printk(KERN_ERR "ztdummy: Unable to register DAHDI rtc driver\n"); dahdi_unregister(&ztd->span); kfree(ztd); return err; diff --git a/drivers/dahdi/dahdi_dummy.h b/drivers/dahdi/dahdi_dummy.h index c829fba..0fb8175 100644 --- a/drivers/dahdi/dahdi_dummy.h +++ b/drivers/dahdi/dahdi_dummy.h @@ -1,5 +1,5 @@ /* - * Dummy DAHDI Driver for Zapata Telephony interface + * Dummy DAHDI Driver for DAHDI Telephony interface * * Written by Robert Pleh <robert.pleh@hermes.si> * diff --git a/drivers/dahdi/dahdi_dynamic_loc.c b/drivers/dahdi/dahdi_dynamic_loc.c index e475166..df0d95d 100644 --- a/drivers/dahdi/dahdi_dynamic_loc.c +++ b/drivers/dahdi/dahdi_dynamic_loc.c @@ -22,7 +22,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * - * Note : a zaptel source must exist prior to loading this driver + * Note : a DAHDI timing source must exist prior to loading this driver * * Address syntax : * <key>:<id>[:<monitor id>] diff --git a/drivers/dahdi/digits.h b/drivers/dahdi/digits.h index 160fdc7..183b90a 100644 --- a/drivers/dahdi/digits.h +++ b/drivers/dahdi/digits.h @@ -1,5 +1,5 @@ /* - * Zapata Telephony + * DAHDI Telephony * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/drivers/dahdi/hpec/hpec.h b/drivers/dahdi/hpec/hpec.h index 7e90f12..995e8e0 100644 --- a/drivers/dahdi/hpec/hpec.h +++ b/drivers/dahdi/hpec/hpec.h @@ -1,5 +1,5 @@ /* - * Zapata Telephony Interface to Digium High-Performance Echo Canceller + * DAHDI Telephony Interface to Digium High-Performance Echo Canceller * * Copyright (C) 2006 Digium, Inc. * diff --git a/drivers/dahdi/hpec/hpec_dahdi.h b/drivers/dahdi/hpec/hpec_dahdi.h index 6fc4d39..bb54e8e 100644 --- a/drivers/dahdi/hpec/hpec_dahdi.h +++ b/drivers/dahdi/hpec/hpec_dahdi.h @@ -1,5 +1,5 @@ /* - * Zapata Telephony Interface to Digium High-Performance Echo Canceller + * DAHDI Telephony Interface to Digium High-Performance Echo Canceller * * Copyright (C) 2006 Digium, Inc. * diff --git a/drivers/dahdi/hpec/hpec_user.h b/drivers/dahdi/hpec/hpec_user.h index fcaae3d..4f78c50 100644 --- a/drivers/dahdi/hpec/hpec_user.h +++ b/drivers/dahdi/hpec/hpec_user.h @@ -1,5 +1,5 @@ /* - * Zapata Telephony Interface to Digium High-Performance Echo Canceller + * DAHDI Telephony Interface to Digium High-Performance Echo Canceller * * Copyright (C) 2006 Digium, Inc. * diff --git a/drivers/dahdi/pciradio.c b/drivers/dahdi/pciradio.c index 251d089..081551e 100644 --- a/drivers/dahdi/pciradio.c +++ b/drivers/dahdi/pciradio.c @@ -1,5 +1,5 @@ /* - * PCI RADIO Card Zapata Telephony PCI Quad Radio Interface driver + * PCI RADIO Card DAHDI Telephony PCI Quad Radio Interface driver * * Written by Jim Dixon <jim@lambdatel.com> * Based on previous work by Mark Spencer <markster@digium.com> @@ -106,8 +106,8 @@ With driver: 303826 (1.5 %) #define RAD_CTCSS_ACQUIRE_TIME 10 #define RAD_CTCSS_TALKOFF_TIME 1000 -#define DAHDI_RADPAR_CTCSSACQUIRETIME 18 /* DEBUG only, this belongs in zaptel.h */ -#define DAHDI_RADPAR_CTCSSTALKOFFTIME 19 /* DEBUG only, this belongs in zaptel.h */ +#define DAHDI_RADPAR_CTCSSACQUIRETIME 18 /* DEBUG only, this belongs in dahdi.h */ +#define DAHDI_RADPAR_CTCSSTALKOFFTIME 19 /* DEBUG only, this belongs in dahdi.h */ /* * MX828 Commands @@ -1494,7 +1494,7 @@ static int pciradio_initialize(struct pciradio *rad) { int x; - /* Zapata stuff */ + /* DAHDI stuff */ sprintf(rad->span.name, "PCIRADIO/%d", rad->pos); sprintf(rad->span.desc, "Board %d", rad->pos + 1); rad->span.deflaw = DAHDI_LAW_MULAW; @@ -1519,7 +1519,7 @@ static int pciradio_initialize(struct pciradio *rad) rad->span.pvt = rad; if (dahdi_register(&rad->span, 0)) { - printk("Unable to register span with zaptel\n"); + printk("Unable to register span with DAHDI\n"); return -1; } return 0; @@ -1922,7 +1922,7 @@ module_param(debug, int, 0600); MODULE_PARM(debug, "i"); #endif -MODULE_DESCRIPTION("Zapata Telephony PCI Radio Card DAHDI Driver"); +MODULE_DESCRIPTION("DAHDI Telephony PCI Radio Card DAHDI Driver"); MODULE_AUTHOR("Jim Dixon <jim@lambdatel.com>"); #ifdef MODULE_LICENSE diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c index 305b18a..ca10f73 100644 --- a/drivers/dahdi/wcfxo.c +++ b/drivers/dahdi/wcfxo.c @@ -1,5 +1,5 @@ /* - * Wilcard X100P FXO Interface Driver for Zapata Telephony interface + * Wildcard X100P FXO Interface Driver for DAHDI Telephony interface * * Written by Mark Spencer <markster@digium.com> * Matthew Fredrickson <creslin@digium.com> @@ -658,7 +658,7 @@ static int wcfxo_hooksig(struct dahdi_chan *chan, dahdi_txsig_t txsig) static int wcfxo_initialize(struct wcfxo *wc) { - /* Zapata stuff */ + /* DAHDI stuff */ sprintf(wc->span.name, "WCFXO/%d", wc->pos); snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Board %d", wc->variety, wc->pos + 1); sprintf(wc->chan.name, "WCFXO/%d/%d", wc->pos, 0); @@ -685,7 +685,7 @@ static int wcfxo_initialize(struct wcfxo *wc) wc->span.pvt = wc; wc->chan.pvt = wc; if (dahdi_register(&wc->span, 0)) { - printk("Unable to register span with zaptel\n"); + printk("Unable to register span with DAHDI\n"); return -1; } return 0; diff --git a/drivers/dahdi/wct1xxp.c b/drivers/dahdi/wct1xxp.c index 1fcd843..36be131 100644 --- a/drivers/dahdi/wct1xxp.c +++ b/drivers/dahdi/wct1xxp.c @@ -1,5 +1,5 @@ /* - * Linux Support Services, Inc. Wildcard T100P T1/PRI card Driver + * Digium, Inc. Wildcard T100P T1/PRI card Driver * * Written by Mark Spencer <markster@digium.com> * Matthew Fredrickson <creslin@digium.com> @@ -798,7 +798,7 @@ static int t1xxp_software_init(struct t1xxp *wc) wc->chans[x].chanpos = x + 1; } if (dahdi_register(&wc->span, 0)) { - printk("Unable to register span with zaptel\n"); + printk("Unable to register span with DAHDI\n"); return -1; } return 0; 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> * diff --git a/drivers/dahdi/wctc4xxp/Kbuild b/drivers/dahdi/wctc4xxp/Kbuild index 9684569..de426cf 100644 --- a/drivers/dahdi/wctc4xxp/Kbuild +++ b/drivers/dahdi/wctc4xxp/Kbuild @@ -11,8 +11,8 @@ endif wctc4xxp-objs := base.o ifneq ($(HOTPLUG_FIRMWARE),yes) -wctc4xxp-objs += $(FIRM_DIR)/zaptel-fw-tc400m.o +wctc4xxp-objs += $(FIRM_DIR)/dahdi-fw-tc400m.o endif -$(obj)/$(FIRM_DIR)/zaptel-fw-tc400m.o: $(obj)/base.o - $(MAKE) -C $(obj)/$(FIRM_DIR) zaptel-fw-tc400m.o +$(obj)/$(FIRM_DIR)/dahdi-fw-tc400m.o: $(obj)/base.o + $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-tc400m.o diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index f6b9c98..8f71f07 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -1664,10 +1664,10 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) - extern void _binary_zaptel_fw_tc400m_bin_size; - extern u8 _binary_zaptel_fw_tc400m_bin_start[]; + extern void _binary_dahdi_fw_tc400m_bin_size; + extern u8 _binary_dahdi_fw_tc400m_bin_start[]; #else - static const char tc400m_firmware[] = "zaptel-fw-tc400m.bin"; + static const char tc400m_firmware[] = "dahdi-fw-tc400m.bin"; #endif if (!initd_ifaces) { @@ -1754,8 +1754,8 @@ static int __devinit wcdte_init_one(struct pci_dev *pdev, const struct pci_devic return -EIO; } #else - embedded_firmware.data = _binary_zaptel_fw_tc400m_bin_start; - embedded_firmware.size = (size_t) &_binary_zaptel_fw_tc400m_bin_size; + embedded_firmware.data = _binary_dahdi_fw_tc400m_bin_start; + embedded_firmware.size = (size_t) &_binary_dahdi_fw_tc400m_bin_size; #endif dte_firmware_ver = firmware->data[0]; diff --git a/drivers/dahdi/wctc4xxp/codec_test.c b/drivers/dahdi/wctc4xxp/codec_test.c index abea9e9..c9c2897 100644 --- a/drivers/dahdi/wctc4xxp/codec_test.c +++ b/drivers/dahdi/wctc4xxp/codec_test.c @@ -1,5 +1,5 @@ /* - * Wilcard TC400B Digium Transcoder Engine Interface Driver for Zapata Telephony interface test tool. + * Wilcard TC400B Digium Transcoder Engine Interface Driver for DAHDI Telephony interface test tool. * * Written by Matt O'Gorman <mogorman@digium.com> * diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c index 970c939..601ae8a 100644 --- a/drivers/dahdi/wctdm.c +++ b/drivers/dahdi/wctdm.c @@ -1,5 +1,5 @@ /* - * Wilcard TDM400P TDM FXS/FXO Interface Driver for Zapata Telephony interface + * Wilcard TDM400P TDM FXS/FXO Interface Driver for DAHDI Telephony interface * * Written by Mark Spencer <markster@digium.com> * Matthew Fredrickson <creslin@digium.com> @@ -2036,7 +2036,7 @@ static int wctdm_initialize(struct wctdm *wc) { int x; - /* 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, @@ -2068,7 +2068,7 @@ static int wctdm_initialize(struct wctdm *wc) wc->span.pvt = wc; if (dahdi_register(&wc->span, 0)) { - printk("Unable to register span with zaptel\n"); + printk("Unable to register span with DAHDI\n"); return -1; } return 0; diff --git a/drivers/dahdi/wctdm.h b/drivers/dahdi/wctdm.h index 144e838..96c0d50 100644 --- a/drivers/dahdi/wctdm.h +++ b/drivers/dahdi/wctdm.h @@ -1,5 +1,5 @@ /* - * Wilcard S100P FXS Interface Driver for Zapata Telephony interface + * Wilcard S100P FXS Interface Driver for DAHDI Telephony interface * * Written by Mark Spencer <markster@linux-support.net> * 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> diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c index c928f9e..ef2c6be 100644 --- a/drivers/dahdi/wcte11xp.c +++ b/drivers/dahdi/wcte11xp.c @@ -1016,7 +1016,7 @@ static int t1xxp_software_init(struct t1 *wc) wc->chans[x].chanpos = x + 1; } if (dahdi_register(&wc->span, 0)) { - printk("Unable to register span with zaptel\n"); + printk("Unable to register span with DAHDI\n"); return -1; } return 0; diff --git a/drivers/dahdi/wcte12xp/Kbuild b/drivers/dahdi/wcte12xp/Kbuild index 9fd642a..31ea38b 100644 --- a/drivers/dahdi/wcte12xp/Kbuild +++ b/drivers/dahdi/wcte12xp/Kbuild @@ -11,8 +11,8 @@ endif wcte12xp-objs := base.o vpmadt032.o GpakApi.o ../voicebus.o ifneq ($(HOTPLUG_FIRMWARE),yes) -wcte12xp-objs += $(FIRM_DIR)/zaptel-fw-vpmadt032.o +wcte12xp-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/wcte12xp/vpmadt032.c b/drivers/dahdi/wcte12xp/vpmadt032.c index 835cdb5..f8e385b 100644 --- a/drivers/dahdi/wcte12xp/vpmadt032.c +++ b/drivers/dahdi/wcte12xp/vpmadt032.c @@ -697,10 +697,10 @@ void t1_vpm150m_init(struct t1 *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"; struct pci_dev* pdev = voicebus_get_pci_dev(wc->vb); #endif @@ -840,8 +840,8 @@ void t1_vpm150m_init(struct t1 *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; diff --git a/drivers/dahdi/xpp/Kbuild b/drivers/dahdi/xpp/Kbuild index f7f180b..376f592 100644 --- a/drivers/dahdi/xpp/Kbuild +++ b/drivers/dahdi/xpp/Kbuild @@ -14,7 +14,7 @@ EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \ -g # -ifneq (,$(shell grep -w echo_can_state_t $(ZAP_KERNEL)/zaptel.h)) +ifneq (,$(shell grep -w echo_can_state_t $(ZAP_KERNEL)/dahdi.h)) EXTRA_CFLAGS += -DZAPTEL_EC_TYPEDEF endif diff --git a/firmware/Makefile b/firmware/Makefile index 9c0e126..03a9560 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -1,9 +1,9 @@ # -# Zaptel +# DAHDI # # Makefile for firmware downloading/installation # -# Copyright (C) 2007, Digium, Inc. +# Copyright (C) 2007-2008, Digium, Inc. # # Joshua Colp <jcolp@digium.com> # @@ -24,23 +24,23 @@ VPMADT032_VERSION:=1.07 FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases -# Firmware files should use the naming convention: zaptel-fw-<base name>-<sub name>-<version> or zaptel-fw-<base name>-<version> -# First example: zaptel-fw-oct6114-064-1.05.01 +# Firmware files should use the naming convention: dahdi-fw-<base name>-<sub name>-<version> or dahdi-fw-<base name>-<version> +# First example: dahdi-fw-oct6114-064-1.05.01 # This means this is version 1.05.01 of the oct6114 64 firmware -# Second example: zaptel-fw-tc400m-MR5.6 +# Second example: dahdi-fw-tc400m-MR5.6 # This means this is version MR5.6 of the tc400m firmware # Build a list of firmware package filenames we need -FIRMWARE:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz) -FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz) -FIRMWARE:=$(FIRMWARE:FIRMWARE-TC400M=zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz) -FIRMWARE:=$(FIRMWARE:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz) +FIRMWARE:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz) +FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz) +FIRMWARE:=$(FIRMWARE:FIRMWARE-TC400M=dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz) +FIRMWARE:=$(FIRMWARE:FIRMWARE-VPMADT032=dahdi-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz) # Build a list of object files if hotplug will not be used -OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=zaptel-fw-oct6114-064.o) -OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=zaptel-fw-oct6114-128.o) -OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=zaptel-fw-tc400m.o) -OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMADT032=zaptel-fw-vpmadt032.o) +OBJECT_FILES:=$(MENUSELECT_FIRMWARE:FIRMWARE-OCT6114-064=dahdi-fw-oct6114-064.o) +OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128.o) +OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=dahdi-fw-tc400m.o) +OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMADT032=dahdi-fw-vpmadt032.o) # If "fetch" is used, --continue is not a valid option. ifeq ($(WGET),wget) @@ -62,106 +62,106 @@ have_download: fi # Download and extract firmware tarballs -zaptel-fw-oct6114-064-%.tar.gz: have_download -ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) +dahdi-fw-oct6114-064-%.tar.gz: have_download +ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) - @echo "Installing zaptel-fw-oct6114-064.bin to hotplug firmware directories" + @echo "Installing dahdi-fw-oct6114-064.bin to hotplug firmware directories" if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ - rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-*; \ - touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ + rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-*; \ + touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION); \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/lib/firmware; \ - rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-*; \ - touch $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-oct6114-064.bin $(DESTDIR)/lib/firmware; \ + rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-*; \ + touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-064-$(OCT6114_064_VERSION); \ fi endif else - @echo "Firmware zaptel-fw-oct6114-064.bin is already installed with required version $(OCT6114_064_VERSION)" + @echo "Firmware dahdi-fw-oct6114-064.bin is already installed with required version $(OCT6114_064_VERSION)" endif -zaptel-fw-oct6114-128-%.tar.gz: have_download -ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) +dahdi-fw-oct6114-128-%.tar.gz: have_download +ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) - @echo "Installing zaptel-fw-oct6114-128.bin to hotplug firmware directories" + @echo "Installing dahdi-fw-oct6114-128.bin to hotplug firmware directories" if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ - rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-*; \ - touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ + rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-*; \ + touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION); \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-oct6114-128.bin $(DESTDIR)/lib/firmware; \ - rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-*; \ - touch $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-oct6114-128.bin $(DESTDIR)/lib/firmware; \ + rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-*; \ + touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-128-$(OCT6114_128_VERSION); \ fi endif else - @echo "Firmware zaptel-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)" + @echo "Firmware dahdi-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)" endif -zaptel-fw-tc400m-%.tar.gz: have_download -ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) +dahdi-fw-tc400m-%.tar.gz: have_download +ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) - @echo "Installing zaptel-fw-tc400m.bin to hotplug firmware directories" + @echo "Installing dahdi-fw-tc400m.bin to hotplug firmware directories" if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ - rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-*; \ - touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ + rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-*; \ + touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION); \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-tc400m.bin $(DESTDIR)/lib/firmware; \ - rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-*; \ - touch $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/lib/firmware; \ + rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-*; \ + touch $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION); \ fi endif else - @echo "Firmware zaptel-fw-tc400m.bin is already installed with required version $(TC400M_VERSION)" + @echo "Firmware dahdi-fw-tc400m.bin is already installed with required version $(TC400M_VERSION)" endif -zaptel-fw-vpmadt032-%.tar.gz: have_download -ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) +dahdi-fw-vpmadt032-%.tar.gz: have_download +ifeq ($(shell if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "yes"; else echo "no"; fi),yes) @echo "Attempting to download $@" @if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; @if test ! -f $@; then exit 1; fi; \ (cat $@ | gzip -d | tar -xf -) ifeq ($(HOTPLUG_FIRMWARE),yes) - @echo "Installing zaptel-fw-vpmadt032.bin to hotplug firmware directories" + @echo "Installing dahdi-fw-vpmadt032.bin to hotplug firmware directories" if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ - rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-*; \ - touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-vpmadt032.bin $(DESTDIR)/usr/lib/hotplug/firmware; \ + rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-*; \ + touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION); \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - $(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(DESTDIR)/lib/firmware; \ - rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-*; \ - touch $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION); \ + $(INSTALL) -m 644 dahdi-fw-vpmadt032.bin $(DESTDIR)/lib/firmware; \ + rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-*; \ + touch $(DESTDIR)/lib/firmware/.dahdi-fw-vpmadt032-$(VPMADT032_VERSION); \ fi endif else - @echo "Firmware zaptel-fw-vpmadt032.bin is already installed with required version $(VPMADT032_VERSION)" + @echo "Firmware dahdi-fw-vpmadt032.bin is already installed with required version $(VPMADT032_VERSION)" endif # Clean up any downloaded/extracted firmware packages dist-clean: clean - rm -f zaptel-fw-*.bin - rm -f zaptel-fw-*.tar.gz + rm -f dahdi-fw-*.bin + rm -f dahdi-fw-*.tar.gz # Clean up anything we built clean: - rm -f zaptel-fw-*.o + rm -f dahdi-fw-*.o # Create object files suitable for linking against object-build: $(FIRMWARE) $(OBJECT_FILES) @@ -169,33 +169,33 @@ object-build: $(FIRMWARE) $(OBJECT_FILES) # Install all downloaded firmware images for hotplug usage and build headers for inclusion hotplug-install: $(FIRMWARE) -# Uninstall any installed zaptel firmware images from hotplug firmware directories +# Uninstall any installed dahdi firmware images from hotplug firmware directories hotplug-uninstall: if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \ - rm -f $(DESTDIR)/usr/lib/hotplug/firmware/zaptel-fw-*.bin; \ - rm -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw*; \ + rm -f $(DESTDIR)/usr/lib/hotplug/firmware/dahdi-fw-*.bin; \ + rm -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw*; \ fi if [ -d $(DESTDIR)/lib/firmware ]; then \ - rm -f $(DESTDIR)/lib/firmware/zaptel-fw-*.bin; \ - rm -f $(DESTDIR)/lib/firmware/.zaptel-fw*; \ + rm -f $(DESTDIR)/lib/firmware/dahdi-fw-*.bin; \ + rm -f $(DESTDIR)/lib/firmware/.dahdi-fw*; \ fi # Build object file of an oct6114 064 firmware image for linking -zaptel-fw-oct6114-064.o: zaptel-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz zaptel-fw-oct6114-064.bin - @echo Making firmware object file for zaptel-fw-oct6114-064.bin - ../build_tools/make_firmware_object zaptel-fw-oct6114-064.bin $@ +dahdi-fw-oct6114-064.o: dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz dahdi-fw-oct6114-064.bin + @echo Making firmware object file for dahdi-fw-oct6114-064.bin + ../build_tools/make_firmware_object dahdi-fw-oct6114-064.bin $@ # Build object file of an oct6114 128 firmware image for linking -zaptel-fw-oct6114-128.o: zaptel-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz zaptel-fw-oct6114-128.bin - @echo Making firmware object file for zaptel-fw-oct6114-128.bin - ../build_tools/make_firmware_object zaptel-fw-oct6114-128.bin $@ +dahdi-fw-oct6114-128.o: dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz dahdi-fw-oct6114-128.bin + @echo Making firmware object file for dahdi-fw-oct6114-128.bin + ../build_tools/make_firmware_object dahdi-fw-oct6114-128.bin $@ # Build object file of a TC400M firmware image for linking -zaptel-fw-tc400m.o: zaptel-fw-tc400m-$(TC400M_VERSION).tar.gz zaptel-fw-tc400m.bin - @echo Making firmware object file for zaptel-fw-tc400m.bin - ../build_tools/make_firmware_object zaptel-fw-tc400m.bin $@ +dahdi-fw-tc400m.o: dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz dahdi-fw-tc400m.bin + @echo Making firmware object file for dahdi-fw-tc400m.bin + ../build_tools/make_firmware_object dahdi-fw-tc400m.bin $@ # Build object file of a VPMADT032 firmware image for linking -zaptel-fw-vpmadt032.o: zaptel-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz zaptel-fw-vpmadt032.bin - @echo Making firmware object file for zaptel-fw-vpmadt032.bin - ../build_tools/make_firmware_object zaptel-fw-vpmadt032.bin $@ +dahdi-fw-vpmadt032.o: dahdi-fw-vpmadt032-$(VPMADT032_VERSION).tar.gz dahdi-fw-vpmadt032.bin + @echo Making firmware object file for dahdi-fw-vpmadt032.bin + ../build_tools/make_firmware_object dahdi-fw-vpmadt032.bin $@ diff --git a/firmware/firmware.xml b/firmware/firmware.xml deleted file mode 100644 index cedafd1..0000000 --- a/firmware/firmware.xml +++ /dev/null @@ -1,18 +0,0 @@ - <category name="MENUSELECT_FIRMWARE" displayname="Binary Firmware Packages" positive_output="yes"> - <member name="FIRMWARE-OCT6114-064" displayname="Digium VPMOCT064M" > - <defaultenabled>yes</defaultenabled> - <depend>wct4xxp</depend> - </member> - <member name="FIRMWARE-OCT6114-128" displayname="Digium VPMOCT128M/VPM450M"> - <defaultenabled>yes</defaultenabled> - <depend>wct4xxp</depend> - </member> - <member name="FIRMWARE-TC400M" displayname="Digium TC400M" > - <defaultenabled>yes</defaultenabled> - <depend>wctc4xxp</depend> - </member> - <member name="FIRMWARE-VPMADT032" displayname="Digium VPMADT032" > - <defaultenabled>yes</defaultenabled> - <depend>wctdm24xxp</depend> - </member> - </category> diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 38288fa..8f0a51d 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1,12 +1,12 @@ /* - * Zapata Telephony Interface + * DAHDI Telephony Interface * * Written by Mark Spencer <markster@linux-suppot.net> * Based on previous works, designs, and architectures conceived and * written by Jim Dixon <jim@lambdatel.com>. * * Copyright (C) 2001 Jim Dixon / Zapata Telephony. - * Copyright (C) 2001 - 2006 Digium, Inc. + * Copyright (C) 2001 - 2008 Digium, Inc. * * All rights reserved. * @@ -85,7 +85,7 @@ #include <linux/devfs_fs_kernel.h> #else #undef CONFIG_DEVFS_FS -//#warning "DAHDI doesn't support DEVFS in post 2.4 kernels. Disabling DEVFS in zaptel" +//#warning "DAHDI doesn't support DEVFS in post 2.4 kernels. Disabling DEVFS in DAHDI" #endif #endif /* CONFIG_DEVFS_FS */ #endif /* __KERNEL__ */ @@ -382,7 +382,7 @@ typedef struct dahdi_dynamic_span { char addr[40]; /* Destination address */ int numchans; /* Number of channels */ int timing; /* Timing source preference */ - int spanno; /* Span number (filled in by zaptel) */ + int spanno; /* Span number (filled in by DAHDI) */ } DAHDI_DYNAMIC_SPAN; /* Define the max # of outgoing DTMF, MFR1 or MFR2 digits to queue in-kernel */ @@ -1314,7 +1314,7 @@ struct dahdi_chan { #endif spinlock_t lock; char name[40]; /* Name */ - /* Specified by zaptel */ + /* Specified by DAHDI */ int channo; /* DAHDI Channel number */ int chanpos; unsigned long flags; @@ -1347,7 +1347,7 @@ struct dahdi_chan { /* Whether or not we have allocated gains or are using the default */ int gainalloc; - /* Specified by driver, readable by zaptel */ + /* Specified by driver, readable by DAHDI */ void *pvt; /* Private channel data */ struct file *file; /* File structure */ @@ -1357,7 +1357,7 @@ struct dahdi_chan { int sigcap; /* Capability for signalling */ __u32 chan_alarms; /* alarms status */ - /* Used only by zaptel -- NO DRIVER SERVICEABLE PARTS BELOW */ + /* Used only by DAHDI -- NO DRIVER SERVICEABLE PARTS BELOW */ /* Buffer declarations */ u_char *readbuf[DAHDI_MAX_NUM_BUFS]; /* read buffer */ int inreadbuf; @@ -1427,7 +1427,7 @@ struct dahdi_chan { int confmute; /* conference mute mode */ /* Incoming and outgoing conference chunk queues for - communicating between zaptel master time and + communicating between DAHDI master time and other boards */ struct confq confin; struct confq confout; @@ -1681,8 +1681,8 @@ struct dahdi_span { /* Opt: Used to tell an onboard HDLC controller that there is data ready to transmit */ void (*hdlc_hard_xmit)(struct dahdi_chan *chan); - /* Used by zaptel only -- no user servicable parts inside */ - int spanno; /* Span number for zaptel */ + /* Used by DAHDI only -- no user servicable parts inside */ + int spanno; /* Span number for DAHDI */ int offset; /* Offset within a given card */ int lastalarms; /* Previous alarms */ @@ -1768,7 +1768,7 @@ int dahdi_dynamic_register(struct dahdi_dynamic_driver *driver); /* Unregister a dynamic driver */ void dahdi_dynamic_unregister(struct dahdi_dynamic_driver *driver); -/* Receive on a span. The zaptel interface will handle all the calculations for +/* Receive on a span. The DAHDI interface will handle all the calculations for all member channels of the span, pulling the data from the readchunk buffer */ int dahdi_receive(struct dahdi_span *span); @@ -1778,7 +1778,7 @@ int dahdi_transmit(struct dahdi_span *span); /* Abort the buffer currently being receive with event "event" */ void dahdi_hdlc_abort(struct dahdi_chan *ss, int event); -/* Indicate to zaptel that the end of frame was received and rotate buffers */ +/* Indicate to DAHDI that the end of frame was received and rotate buffers */ void dahdi_hdlc_finish(struct dahdi_chan *ss); /* Put a chunk of data into the current receive buffer */ @@ -1860,10 +1860,10 @@ extern u_char __dahdi_lin2mu[16384]; extern u_char __dahdi_lin2a[16384]; #endif -/* Used by dynamic zaptel -- don't use directly */ +/* Used by dynamic DAHDI -- don't use directly */ void dahdi_set_dynamic_ioctl(int (*func)(unsigned int cmd, unsigned long data)); -/* Used privately by zaptel. Avoid touching directly */ +/* Used privately by DAHDI. Avoid touching directly */ struct dahdi_tone { int fac1; int init_v2_1; |