From b9ad924e83a435601f4aaf30a40594f5669183ff Mon Sep 17 00:00:00 2001
From: Moises Silva <moy@sangoma.com>
Date: Thu, 10 Nov 2011 15:16:07 -0500
Subject: [PATCH] freetdm: ftmod_zt - Fix references to ftdmtel that should be
 Zaptel/DAHDI (screwed up during OpenZAP -> FreeTDM renaming)

---
 libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
index 4e7914685b..677bcbbd56 100644
--- a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
+++ b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
@@ -256,7 +256,7 @@ static void zt_build_gains(struct zt_gains *g, float rxgain, float txgain, int c
 }
 
 /**
- * \brief Initialises a range of ftdmtel channels
+ * \brief Initialises a range of Zaptel/DAHDI channels
  * \param span FreeTDM span
  * \param start Initial wanpipe channel number
  * \param end Final wanpipe channel number
@@ -349,7 +349,7 @@ static unsigned zt_open_range(ftdm_span_t *span, unsigned start, unsigned end, f
 				}
 				
 				if (ioctl(CONTROL_FD, codes.CHANCONFIG, &cc)) {
-					ftdm_log(FTDM_LOG_WARNING, "this ioctl fails on older ftdmtel but is harmless if you used ztcfg\n[device %s chan %d fd %d (%s)]\n", chanpath, x, CONTROL_FD, strerror(errno));
+					ftdm_log(FTDM_LOG_WARNING, "this ioctl fails in older zaptel but is harmless if you used ztcfg\n[device %s chan %d fd %d (%s)]\n", chanpath, x, CONTROL_FD, strerror(errno));
 				}
 			}
 
@@ -453,7 +453,7 @@ static unsigned zt_open_range(ftdm_span_t *span, unsigned start, unsigned end, f
 }
 
 /**
- * \brief Initialises an freetdm ftdmtel span from a configuration string
+ * \brief Initialises a freetdm Zaptel/DAHDI span from a configuration string
  * \param span FreeTDM span
  * \param str Configuration string
  * \param type FreeTDM span type
@@ -523,7 +523,7 @@ static FIO_CONFIGURE_SPAN_FUNCTION(zt_configure_span)
 }
 
 /**
- * \brief Process configuration variable for a ftdmtel profile
+ * \brief Process configuration variable for a Zaptel/DAHDI profile
  * \param category Wanpipe profile name
  * \param var Variable name
  * \param val Variable value
@@ -601,7 +601,7 @@ static FIO_CONFIGURE_FUNCTION(zt_configure)
 }
 
 /**
- * \brief Opens a ftdmtel channel
+ * \brief Opens a Zaptel/DAHDI channel
  * \param ftdmchan Channel to open
  * \return Success or failure
  */
@@ -671,7 +671,7 @@ static FIO_OPEN_FUNCTION(zt_open)
 }
 
 /**
- * \brief Closes ftdmtel channel
+ * \brief Closes Zaptel/DAHDI channel
  * \param ftdmchan Channel to close
  * \return Success
  */
@@ -689,7 +689,7 @@ static FIO_CLOSE_FUNCTION(zt_close)
 }
 
 /**
- * \brief Executes an FreeTDM command on a ftdmtel channel
+ * \brief Executes a FreeTDM command on a Zaptel/DAHDI channel
  * \param ftdmchan Channel to execute command on
  * \param command FreeTDM command to execute
  * \param obj Object (unused)
@@ -870,7 +870,7 @@ static FIO_COMMAND_FUNCTION(zt_command)
 }
 
 /**
- * \brief Gets alarms from a ftdmtel Channel
+ * \brief Gets alarms from a Zaptel/DAHDI channel
  * \param ftdmchan Channel to get alarms from
  * \return Success or failure
  */
@@ -893,7 +893,7 @@ static FIO_GET_ALARMS_FUNCTION(zt_get_alarms)
 }
 
 /**
- * \brief Waits for an event on a ftdmtel channel
+ * \brief Waits for an event on a Zaptel/DAHDI channel
  * \param ftdmchan Channel to open
  * \param flags Type of event to wait for
  * \param to Time to wait (in ms)
@@ -967,7 +967,7 @@ pollagain:
 }
 
 /**
- * \brief Checks for events on a ftdmtel span
+ * \brief Checks for events on a Zaptel/DAHDI span
  * \param span Span to check for events
  * \param ms Time to wait for event
  * \return Success if event is waiting or failure if not
@@ -1164,7 +1164,7 @@ FIO_CHANNEL_NEXT_EVENT_FUNCTION(zt_channel_next_event)
 }
 
 /**
- * \brief Retrieves an event from a ftdmtel span
+ * \brief Retrieves an event from a Zaptel/DAHDI span
  * \param span Span to retrieve event from
  * \param event FreeTDM event to return
  * \return Success or failure
@@ -1204,7 +1204,7 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(zt_next_event)
 }
 
 /**
- * \brief Reads data from a ftdmtel channel
+ * \brief Reads data from a Zaptel/DAHDI channel
  * \param ftdmchan Channel to read from
  * \param data Data buffer
  * \param datalen Size of data buffer
@@ -1246,7 +1246,7 @@ static FIO_READ_FUNCTION(zt_read)
 }
 
 /**
- * \brief Writes data to a ftdmtel channel
+ * \brief Writes data to a Zaptel/DAHDI channel
  * \param ftdmchan Channel to write to
  * \param data Data buffer
  * \param datalen Size of data buffer
@@ -1285,7 +1285,7 @@ tryagain:
 }
 
 /**
- * \brief Destroys a ftdmtel Channel
+ * \brief Destroys a Zaptel/DAHDI Channel
  * \param ftdmchan Channel to destroy
  * \return Success
  */
@@ -1298,12 +1298,12 @@ static FIO_CHANNEL_DESTROY_FUNCTION(zt_channel_destroy)
 }
 
 /**
- * \brief Global FreeTDM IO interface for ftdmtel
+ * \brief Global FreeTDM IO interface for Zaptel/DAHDI
  */
 static ftdm_io_interface_t zt_interface;
 
 /**
- * \brief Loads ftdmtel IO module
+ * \brief Loads Zaptel/DAHDI IO module
  * \param fio FreeTDM IO interface
  * \return Success or failure
  */
@@ -1358,7 +1358,7 @@ static FIO_IO_LOAD_FUNCTION(zt_init)
 }
 
 /**
- * \brief Unloads ftdmtel IO module
+ * \brief Unloads Zaptel/DAHDI IO module
  * \return Success
  */
 static FIO_IO_UNLOAD_FUNCTION(zt_destroy)
@@ -1369,7 +1369,7 @@ static FIO_IO_UNLOAD_FUNCTION(zt_destroy)
 }
 
 /**
- * \brief FreeTDM ftdmtel IO module definition
+ * \brief FreeTDM Zaptel/DAHDI IO module definition
  */
 ftdm_module_t ftdm_module = { 
 	"zt",