summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2008-05-21 16:48:35 +0000
committerKevin P. Fleming <kpfleming@digium.com>2008-05-21 16:48:35 +0000
commit3b10699608036b8dfab80e25efe1bee493786413 (patch)
treed12bcdeff2e10a57d49aae065d553c1d9d41d174 /include
parent66d8715a0fbf6eae202c27853ba616bcf754d0c7 (diff)
replace zap_ with dahdi_, ZAP_ with DAHDI_
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4321 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'include')
-rw-r--r--include/dahdi/kernel.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h
index 4993c74..e64ed9c 100644
--- a/include/dahdi/kernel.h
+++ b/include/dahdi/kernel.h
@@ -52,29 +52,29 @@
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-#define zap_pci_module pci_register_driver
+#define dahdi_pci_module pci_register_driver
#else
-#define zap_pci_module pci_module_init
+#define dahdi_pci_module pci_module_init
#endif
#ifdef LINUX26
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
-#define ZAP_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id)
+#define DAHDI_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id)
#else
-#define ZAP_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id, struct pt_regs *regs)
+#define DAHDI_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id, struct pt_regs *regs)
#endif
#else
-#define ZAP_IRQ_HANDLER(a) static void a(int irq, void *dev_id, struct pt_regs *regs)
+#define DAHDI_IRQ_HANDLER(a) static void a(int irq, void *dev_id, struct pt_regs *regs)
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-#define ZAP_IRQ_SHARED IRQF_SHARED
-#define ZAP_IRQ_DISABLED IRQF_DISABLED
-#define ZAP_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED
+#define DAHDI_IRQ_SHARED IRQF_SHARED
+#define DAHDI_IRQ_DISABLED IRQF_DISABLED
+#define DAHDI_IRQ_SHARED_DISABLED IRQF_SHARED | IRQF_DISABLED
#else
-#define ZAP_IRQ_SHARED SA_SHIRQ
-#define ZAP_IRQ_DISABLED SA_INTERRUPT
-#define ZAP_IRQ_SHARED_DISABLED SA_SHIRQ | SA_INTERRUPT
+#define DAHDI_IRQ_SHARED SA_SHIRQ
+#define DAHDI_IRQ_DISABLED SA_INTERRUPT
+#define DAHDI_IRQ_SHARED_DISABLED SA_SHIRQ | SA_INTERRUPT
#endif
#include "ecdis.h"
@@ -2093,7 +2093,7 @@ struct torisa_debug {
reduced buffer size to this function (unlike \a strncpy), and the buffer does not need
to be initialized to zeroes prior to calling this function.
*/
-static inline void zap_copy_string(char *dst, const char *src, unsigned int size)
+static inline void dahdi_copy_string(char *dst, const char *src, unsigned int size)
{
while (*src && size) {
*dst++ = *src++;