<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17437] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17437">17437</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-28 17:17:50 -0500 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: get rid of duplicated ftdm_types.h from previous merge</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeftdm_typesh">freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeprivateftdm_typesh">freeswitch/trunk/libs/freetdm/src/include/private/ftdm_types.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17436 => 17437)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-28 22:17:50 UTC (rev 17436)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-28 22:17:50 UTC (rev 17437)
</span><span class="lines">@@ -284,6 +284,15 @@
</span><span class="cx"> "COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGLINK_CHANGED", "INVALID"
</span><span class="cx"> FTDM_STR2ENUM_P(ftdm_str2ftdm_signal_event, ftdm_signal_event2str, ftdm_signal_event_t)
</span><span class="cx">
</span><ins>+typedef struct ftdm_channel_config {
+ char name[FTDM_MAX_NAME_STR_SZ];
+ char number[FTDM_MAX_NUMBER_STR_SZ];
+ char group_name[FTDM_MAX_NAME_STR_SZ];
+ ftdm_chan_type_t type;
+ float rxgain;
+ float txgain;
+} ftdm_channel_config_t;
+
</ins><span class="cx"> struct ftdm_sigmsg {
</span><span class="cx"> ftdm_signal_event_t event_id;
</span><span class="cx"> uint32_t chan_id;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h (17436 => 17437)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-28 22:17:50 UTC (rev 17436)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h 2010-04-28 22:17:50 UTC (rev 17437)
</span><span class="lines">@@ -38,29 +38,18 @@
</span><span class="cx">
</span><span class="cx"> #ifndef FTDM_TYPES_H
</span><span class="cx"> #define FTDM_TYPES_H
</span><ins>+
+#include "freetdm.h"
+
</ins><span class="cx"> #include "fsk.h"
</span><span class="cx">
</span><span class="cx"> #ifdef WIN32
</span><del>-#define FTDM_INVALID_SOCKET INVALID_HANDLE_VALUE
-#include <windows.h>
-typedef HANDLE ftdm_socket_t;
-typedef unsigned __int64 uint64_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int8 uint8_t;
-typedef __int64 int64_t;
-typedef __int32 int32_t;
-typedef __int16 int16_t;
-typedef __int8 int8_t;
</del><span class="cx"> typedef intptr_t ftdm_ssize_t;
</span><span class="cx"> typedef int ftdm_filehandle_t;
</span><span class="cx"> #else
</span><del>-#define FTDM_INVALID_SOCKET -1
-#include <stdint.h>
</del><span class="cx"> #include <sys/types.h>
</span><span class="cx"> #include <sys/ioctl.h>
</span><span class="cx"> #include <stdarg.h>
</span><del>-typedef int ftdm_socket_t;
</del><span class="cx"> typedef ssize_t ftdm_ssize_t;
</span><span class="cx"> typedef int ftdm_filehandle_t;
</span><span class="cx"> #endif
</span><span class="lines">@@ -68,11 +57,7 @@
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><del>-#define TAG_END NULL
</del><span class="cx">
</span><del>-typedef size_t ftdm_size_t;
-struct ftdm_io_interface;
-
</del><span class="cx"> #define FTDM_COMMAND_OBJ_INT *((int *)obj)
</span><span class="cx"> #define FTDM_COMMAND_OBJ_CHAR_P (char *)obj
</span><span class="cx"> #define FTDM_COMMAND_OBJ_FLOAT *(float *)obj
</span><span class="lines">@@ -167,19 +152,6 @@
</span><span class="cx"> FTDM_STR2ENUM_P(ftdm_str2ftdm_oob_event, ftdm_oob_event2str, ftdm_oob_event_t)
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><del>- FTDM_ALARM_NONE = 0,
- FTDM_ALARM_RECOVER = (1 << 0),
- FTDM_ALARM_LOOPBACK = (1 << 2),
- FTDM_ALARM_YELLOW = (1 << 3),
- FTDM_ALARM_RED = (1 << 4),
- FTDM_ALARM_BLUE = (1 << 5),
- FTDM_ALARM_NOTOPEN = ( 1 << 6),
- FTDM_ALARM_AIS = ( 1 << 7),
- FTDM_ALARM_RAI = ( 1 << 8),
- FTDM_ALARM_GENERAL = ( 1 << 30)
-} ftdm_alarm_flag_t;
-
-typedef enum {
</del><span class="cx"> FTDM_SIGTYPE_NONE,
</span><span class="cx"> FTDM_SIGTYPE_ISDN,
</span><span class="cx"> FTDM_SIGTYPE_RBS,
</span><span class="lines">@@ -189,138 +161,7 @@
</span><span class="cx"> FTDM_SIGTYPE_R2
</span><span class="cx"> } ftdm_signal_type_t;
</span><span class="cx">
</span><del>-/*!
- \brief Signaling status on a given span or specific channel on protocols that support it
- */
</del><span class="cx"> typedef enum {
</span><del>- /* The signaling link is down (no d-chans up in the span/group, MFC-R2 bit pattern unidentified) */
- FTDM_SIG_STATE_DOWN,
- /* The signaling link is suspended (MFC-R2 bit pattern blocked, ss7 blocked?) */
- FTDM_SIG_STATE_SUSPENDED,
- /* The signaling link is ready and calls can be placed */
- FTDM_SIG_STATE_UP,
- /* Invalid status */
- FTDM_SIG_STATE_INVALID
-} ftdm_signaling_status_t;
-#define SIGSTATUS_STRINGS "DOWN", "SUSPENDED", "UP", "INVALID"
-FTDM_STR2ENUM_P(ftdm_str2ftdm_signaling_status, ftdm_signaling_status2str, ftdm_signaling_status_t)
-
-typedef enum {
- FTDM_SIGEVENT_START,
- FTDM_SIGEVENT_STOP,
- FTDM_SIGEVENT_TRANSFER,
- FTDM_SIGEVENT_ANSWER,
- FTDM_SIGEVENT_UP,
- FTDM_SIGEVENT_FLASH,
- FTDM_SIGEVENT_PROGRESS,
- FTDM_SIGEVENT_PROGRESS_MEDIA,
- FTDM_SIGEVENT_NOTIFY,
- FTDM_SIGEVENT_TONE_DETECTED,
- FTDM_SIGEVENT_ALARM_TRAP,
- FTDM_SIGEVENT_ALARM_CLEAR,
- FTDM_SIGEVENT_MISC,
- FTDM_SIGEVENT_COLLECTED_DIGIT,
- FTDM_SIGEVENT_ADD_CALL,
- FTDM_SIGEVENT_RESTART,
- /* Signaling status changed (D-chan up, down, R2 blocked etc) */
- FTDM_SIGEVENT_SIGSTATUS_CHANGED,
- FTDM_SIGEVENT_INVALID
-} ftdm_signal_event_t;
-#define SIGNAL_STRINGS "START", "STOP", "TRANSFER", "ANSWER", "UP", "FLASH", "PROGRESS", \
- "PROGRESS_MEDIA", "NOTIFY", "TONE_DETECTED", "ALARM_TRAP", "ALARM_CLEAR", "MISC", \
- "COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGLINK_CHANGED", "HWSTATUS_CHANGED", "INVALID"
-FTDM_STR2ENUM_P(ftdm_str2ftdm_signal_event, ftdm_signal_event2str, ftdm_signal_event_t)
-
-typedef enum {
- FTDM_EVENT_NONE,
- FTDM_EVENT_DTMF,
- FTDM_EVENT_OOB,
- FTDM_EVENT_COUNT
-} ftdm_event_type_t;
-
-typedef enum {
- FTDM_TOP_DOWN,
- FTDM_BOTTOM_UP
-} ftdm_direction_t;
-
-typedef enum {
- FTDM_SUCCESS,
- FTDM_FAIL,
- FTDM_MEMERR,
- FTDM_TIMEOUT,
- FTDM_NOTIMPL,
- FTDM_CHECKSUM_ERROR,
- FTDM_STATUS_COUNT,
- FTDM_BREAK
-} ftdm_status_t;
-
-typedef enum {
- FTDM_NO_FLAGS = 0,
- FTDM_READ = (1 << 0),
- FTDM_WRITE = (1 << 1),
- FTDM_EVENTS = (1 << 2)
-} ftdm_wait_flag_t;
-
-typedef enum {
- FTDM_CODEC_ULAW = 0,
- FTDM_CODEC_ALAW = 8,
- FTDM_CODEC_SLIN = 10,
- FTDM_CODEC_NONE = (1 << 30)
-} ftdm_codec_t;
-
-typedef enum {
- FTDM_TONE_DTMF = (1 << 0)
-} ftdm_tone_type_t;
-
-typedef enum {
- FTDM_COMMAND_NOOP,
- FTDM_COMMAND_SET_INTERVAL,
- FTDM_COMMAND_GET_INTERVAL,
- FTDM_COMMAND_SET_CODEC,
- FTDM_COMMAND_GET_CODEC,
- FTDM_COMMAND_SET_NATIVE_CODEC,
- FTDM_COMMAND_GET_NATIVE_CODEC,
- FTDM_COMMAND_ENABLE_DTMF_DETECT,
- FTDM_COMMAND_DISABLE_DTMF_DETECT,
- FTDM_COMMAND_SEND_DTMF,
- FTDM_COMMAND_SET_DTMF_ON_PERIOD,
- FTDM_COMMAND_GET_DTMF_ON_PERIOD,
- FTDM_COMMAND_SET_DTMF_OFF_PERIOD,
- FTDM_COMMAND_GET_DTMF_OFF_PERIOD,
- FTDM_COMMAND_GENERATE_RING_ON,
- FTDM_COMMAND_GENERATE_RING_OFF,
- FTDM_COMMAND_OFFHOOK,
- FTDM_COMMAND_ONHOOK,
- FTDM_COMMAND_FLASH,
- FTDM_COMMAND_WINK,
- FTDM_COMMAND_ENABLE_PROGRESS_DETECT,
- FTDM_COMMAND_DISABLE_PROGRESS_DETECT,
- FTDM_COMMAND_TRACE_INPUT,
- FTDM_COMMAND_TRACE_OUTPUT,
- FTDM_COMMAND_ENABLE_CALLERID_DETECT,
- FTDM_COMMAND_DISABLE_CALLERID_DETECT,
- FTDM_COMMAND_ENABLE_ECHOCANCEL,
- FTDM_COMMAND_DISABLE_ECHOCANCEL,
- FTDM_COMMAND_ENABLE_ECHOTRAIN,
- FTDM_COMMAND_DISABLE_ECHOTRAIN,
- FTDM_COMMAND_SET_CAS_BITS,
- FTDM_COMMAND_GET_CAS_BITS,
- FTDM_COMMAND_SET_RX_GAIN,
- FTDM_COMMAND_GET_RX_GAIN,
- FTDM_COMMAND_SET_TX_GAIN,
- FTDM_COMMAND_GET_TX_GAIN,
- FTDM_COMMAND_FLUSH_TX_BUFFERS,
- FTDM_COMMAND_FLUSH_RX_BUFFERS,
- FTDM_COMMAND_FLUSH_BUFFERS,
- FTDM_COMMAND_SET_PRE_BUFFER_SIZE,
- FTDM_COMMAND_SET_LINK_STATUS,
- FTDM_COMMAND_GET_LINK_STATUS,
- FTDM_COMMAND_ENABLE_LOOP,
- FTDM_COMMAND_DISABLE_LOOP,
- FTDM_COMMAND_COUNT
-} ftdm_command_t;
-
-typedef enum {
</del><span class="cx"> FTDM_SPAN_CONFIGURED = (1 << 0),
</span><span class="cx"> FTDM_SPAN_READY = (1 << 1),
</span><span class="cx"> FTDM_SPAN_STATE_CHANGE = (1 << 2),
</span><span class="lines">@@ -332,22 +173,6 @@
</span><span class="cx"> } ftdm_span_flag_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><del>- FTDM_CHAN_TYPE_B,
- FTDM_CHAN_TYPE_DQ921,
- FTDM_CHAN_TYPE_DQ931,
- FTDM_CHAN_TYPE_FXS,
- FTDM_CHAN_TYPE_FXO,
- FTDM_CHAN_TYPE_EM,
- FTDM_CHAN_TYPE_CAS,
- FTDM_CHAN_TYPE_COUNT
-} ftdm_chan_type_t;
-
-#define FTDM_IS_VOICE_CHANNEL(ftdm_chan) ((ftdm_chan)->type != FTDM_CHAN_TYPE_DQ921 && (ftdm_chan)->type != FTDM_CHAN_TYPE_DQ931)
-
-#define CHAN_TYPE_STRINGS "B", "DQ921", "DQ931", "FXS", "FXO", "EM", "CAS", "INVALID"
-FTDM_STR2ENUM_P(ftdm_str2ftdm_chan_type, ftdm_chan_type2str, ftdm_chan_type_t)
-
-typedef enum {
</del><span class="cx"> FTDM_CHANNEL_FEATURE_DTMF_DETECT = (1 << 0),
</span><span class="cx"> FTDM_CHANNEL_FEATURE_DTMF_GENERATE = (1 << 1),
</span><span class="cx"> FTDM_CHANNEL_FEATURE_CODECS = (1 << 2),
</span><span class="lines">@@ -462,121 +287,13 @@
</span><span class="cx"> FTDM_HW_LINK_CONNECTED
</span><span class="cx"> } ftdm_channel_hw_link_status_t;
</span><span class="cx">
</span><del>-typedef struct ftdm_conf_parameter_s {
- const char *var;
- const char *val;
-} ftdm_conf_parameter_t;
-
-typedef struct ftdm_channel ftdm_channel_t;
-typedef struct ftdm_channel_config ftdm_channel_config_t;
-typedef struct ftdm_event ftdm_event_t;
-typedef struct ftdm_sigmsg ftdm_sigmsg_t;
-typedef struct ftdm_span ftdm_span_t;
-typedef struct ftdm_group ftdm_group_t;
-typedef struct ftdm_caller_data ftdm_caller_data_t;
-typedef struct ftdm_io_interface ftdm_io_interface_t;
-
-struct ftdm_stream_handle;
-typedef struct ftdm_stream_handle ftdm_stream_handle_t;
-
</del><span class="cx"> typedef ftdm_status_t (*ftdm_stream_handle_raw_write_function_t) (ftdm_stream_handle_t *handle, uint8_t *data, ftdm_size_t datalen);
</span><span class="cx"> typedef ftdm_status_t (*ftdm_stream_handle_write_function_t) (ftdm_stream_handle_t *handle, const char *fmt, ...);
</span><span class="cx">
</span><del>-#define FIO_CHANNEL_REQUEST_ARGS (ftdm_span_t *span, uint32_t chan_id, ftdm_direction_t direction, ftdm_caller_data_t *caller_data, ftdm_channel_t **ftdmchan)
-#define FIO_CHANNEL_OUTGOING_CALL_ARGS (ftdm_channel_t *ftdmchan)
-#define FIO_CHANNEL_SET_SIG_STATUS_ARGS (ftdm_channel_t *ftdmchan, ftdm_signaling_status_t status)
-#define FIO_CHANNEL_GET_SIG_STATUS_ARGS (ftdm_channel_t *ftdmchan, ftdm_signaling_status_t *status)
-#define FIO_SPAN_SET_SIG_STATUS_ARGS (ftdm_span_t *span, ftdm_signaling_status_t status)
-#define FIO_SPAN_GET_SIG_STATUS_ARGS (ftdm_span_t *span, ftdm_signaling_status_t *status)
-#define FIO_SPAN_POLL_EVENT_ARGS (ftdm_span_t *span, uint32_t ms)
-#define FIO_SPAN_NEXT_EVENT_ARGS (ftdm_span_t *span, ftdm_event_t **event)
-#define FIO_SIGNAL_CB_ARGS (ftdm_sigmsg_t *sigmsg)
-#define FIO_EVENT_CB_ARGS (ftdm_channel_t *ftdmchan, ftdm_event_t *event)
-#define FIO_CODEC_ARGS (void *data, ftdm_size_t max, ftdm_size_t *datalen)
-#define FIO_CONFIGURE_SPAN_ARGS (ftdm_span_t *span, const char *str, ftdm_chan_type_t type, char *name, char *number)
-#define FIO_CONFIGURE_ARGS (const char *category, const char *var, const char *val, int lineno)
-#define FIO_OPEN_ARGS (ftdm_channel_t *ftdmchan)
-#define FIO_CLOSE_ARGS (ftdm_channel_t *ftdmchan)
-#define FIO_CHANNEL_DESTROY_ARGS (ftdm_channel_t *ftdmchan)
-#define FIO_SPAN_DESTROY_ARGS (ftdm_span_t *span)
-#define FIO_COMMAND_ARGS (ftdm_channel_t *ftdmchan, ftdm_command_t command, void *obj)
-#define FIO_WAIT_ARGS (ftdm_channel_t *ftdmchan, ftdm_wait_flag_t *flags, int32_t to)
-#define FIO_GET_ALARMS_ARGS (ftdm_channel_t *ftdmchan)
-#define FIO_READ_ARGS (ftdm_channel_t *ftdmchan, void *data, ftdm_size_t *datalen)
-#define FIO_WRITE_ARGS (ftdm_channel_t *ftdmchan, void *data, ftdm_size_t *datalen)
-#define FIO_IO_LOAD_ARGS (ftdm_io_interface_t **fio)
-#define FIO_IO_UNLOAD_ARGS (void)
-#define FIO_SIG_LOAD_ARGS (void)
-#define FIO_SIG_CONFIGURE_ARGS (ftdm_span_t *span, fio_signal_cb_t sig_cb, va_list ap)
-#define FIO_CONFIGURE_SPAN_SIGNALING_ARGS (ftdm_span_t *span, fio_signal_cb_t sig_cb, ftdm_conf_parameter_t *ftdm_parameters)
-#define FIO_SIG_UNLOAD_ARGS (void)
-#define FIO_API_ARGS (ftdm_stream_handle_t *stream, const char *data)
-
-typedef ftdm_status_t (*fio_channel_request_t) FIO_CHANNEL_REQUEST_ARGS ;
-typedef ftdm_status_t (*fio_channel_outgoing_call_t) FIO_CHANNEL_OUTGOING_CALL_ARGS ;
-typedef ftdm_status_t (*fio_channel_set_sig_status_t) FIO_CHANNEL_SET_SIG_STATUS_ARGS;
-typedef ftdm_status_t (*fio_channel_get_sig_status_t) FIO_CHANNEL_GET_SIG_STATUS_ARGS;
-typedef ftdm_status_t (*fio_span_set_sig_status_t) FIO_SPAN_SET_SIG_STATUS_ARGS;
-typedef ftdm_status_t (*fio_span_get_sig_status_t) FIO_SPAN_GET_SIG_STATUS_ARGS;
-typedef ftdm_status_t (*fio_span_poll_event_t) FIO_SPAN_POLL_EVENT_ARGS ;
-typedef ftdm_status_t (*fio_span_next_event_t) FIO_SPAN_NEXT_EVENT_ARGS ;
-typedef ftdm_status_t (*fio_signal_cb_t) FIO_SIGNAL_CB_ARGS ;
-typedef ftdm_status_t (*fio_event_cb_t) FIO_EVENT_CB_ARGS ;
-typedef ftdm_status_t (*fio_codec_t) FIO_CODEC_ARGS ;
-typedef ftdm_status_t (*fio_configure_span_t) FIO_CONFIGURE_SPAN_ARGS ;
-typedef ftdm_status_t (*fio_configure_t) FIO_CONFIGURE_ARGS ;
-typedef ftdm_status_t (*fio_open_t) FIO_OPEN_ARGS ;
-typedef ftdm_status_t (*fio_close_t) FIO_CLOSE_ARGS ;
-typedef ftdm_status_t (*fio_channel_destroy_t) FIO_CHANNEL_DESTROY_ARGS ;
-typedef ftdm_status_t (*fio_span_destroy_t) FIO_SPAN_DESTROY_ARGS ;
-typedef ftdm_status_t (*fio_get_alarms_t) FIO_GET_ALARMS_ARGS ;
-typedef ftdm_status_t (*fio_command_t) FIO_COMMAND_ARGS ;
-typedef ftdm_status_t (*fio_wait_t) FIO_WAIT_ARGS ;
-typedef ftdm_status_t (*fio_read_t) FIO_READ_ARGS ;
-typedef ftdm_status_t (*fio_write_t) FIO_WRITE_ARGS ;
-typedef ftdm_status_t (*fio_io_load_t) FIO_IO_LOAD_ARGS ;
-typedef ftdm_status_t (*fio_sig_load_t) FIO_SIG_LOAD_ARGS ;
-typedef ftdm_status_t (*fio_sig_configure_t) FIO_SIG_CONFIGURE_ARGS ;
-typedef ftdm_status_t (*fio_configure_span_signaling_t) FIO_CONFIGURE_SPAN_SIGNALING_ARGS ;
-typedef ftdm_status_t (*fio_io_unload_t) FIO_IO_UNLOAD_ARGS ;
-typedef ftdm_status_t (*fio_sig_unload_t) FIO_SIG_UNLOAD_ARGS ;
-typedef ftdm_status_t (*fio_api_t) FIO_API_ARGS ;
-
-
-#define FIO_CHANNEL_REQUEST_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_REQUEST_ARGS
-#define FIO_CHANNEL_OUTGOING_CALL_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_OUTGOING_CALL_ARGS
-#define FIO_CHANNEL_SET_SIG_STATUS_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_SET_SIG_STATUS_ARGS
-#define FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_GET_SIG_STATUS_ARGS
-#define FIO_SPAN_SET_SIG_STATUS_FUNCTION(name) ftdm_status_t name FIO_SPAN_SET_SIG_STATUS_ARGS
-#define FIO_SPAN_GET_SIG_STATUS_FUNCTION(name) ftdm_status_t name FIO_SPAN_GET_SIG_STATUS_ARGS
-#define FIO_SPAN_POLL_EVENT_FUNCTION(name) ftdm_status_t name FIO_SPAN_POLL_EVENT_ARGS
-#define FIO_SPAN_NEXT_EVENT_FUNCTION(name) ftdm_status_t name FIO_SPAN_NEXT_EVENT_ARGS
-#define FIO_SIGNAL_CB_FUNCTION(name) ftdm_status_t name FIO_SIGNAL_CB_ARGS
-#define FIO_EVENT_CB_FUNCTION(name) ftdm_status_t name FIO_EVENT_CB_ARGS
-#define FIO_CODEC_FUNCTION(name) FT_DECLARE_NONSTD(ftdm_status_t) name FIO_CODEC_ARGS
-#define FIO_CONFIGURE_SPAN_FUNCTION(name) ftdm_status_t name FIO_CONFIGURE_SPAN_ARGS
-#define FIO_CONFIGURE_FUNCTION(name) ftdm_status_t name FIO_CONFIGURE_ARGS
-#define FIO_OPEN_FUNCTION(name) ftdm_status_t name FIO_OPEN_ARGS
-#define FIO_CLOSE_FUNCTION(name) ftdm_status_t name FIO_CLOSE_ARGS
-#define FIO_CHANNEL_DESTROY_FUNCTION(name) ftdm_status_t name FIO_CHANNEL_DESTROY_ARGS
-#define FIO_SPAN_DESTROY_FUNCTION(name) ftdm_status_t name FIO_SPAN_DESTROY_ARGS
-#define FIO_GET_ALARMS_FUNCTION(name) ftdm_status_t name FIO_GET_ALARMS_ARGS
-#define FIO_COMMAND_FUNCTION(name) ftdm_status_t name FIO_COMMAND_ARGS
-#define FIO_WAIT_FUNCTION(name) ftdm_status_t name FIO_WAIT_ARGS
-#define FIO_READ_FUNCTION(name) ftdm_status_t name FIO_READ_ARGS
-#define FIO_WRITE_FUNCTION(name) ftdm_status_t name FIO_WRITE_ARGS
-#define FIO_IO_LOAD_FUNCTION(name) ftdm_status_t name FIO_IO_LOAD_ARGS
-#define FIO_SIG_LOAD_FUNCTION(name) ftdm_status_t name FIO_SIG_LOAD_ARGS
-#define FIO_SIG_CONFIGURE_FUNCTION(name) ftdm_status_t name FIO_SIG_CONFIGURE_ARGS
-#define FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(name) ftdm_status_t name FIO_CONFIGURE_SPAN_SIGNALING_ARGS
-#define FIO_IO_UNLOAD_FUNCTION(name) ftdm_status_t name FIO_IO_UNLOAD_ARGS
-#define FIO_SIG_UNLOAD_FUNCTION(name) ftdm_status_t name FIO_SIG_UNLOAD_ARGS
-#define FIO_API_FUNCTION(name) ftdm_status_t name FIO_API_ARGS
-
</del><span class="cx"> #include "ftdm_dso.h"
</span><span class="cx">
</span><span class="cx"> #define FTDM_NODE_NAME_SIZE 50
</span><del>-typedef struct ftdm_conf_node_s {
</del><ins>+struct ftdm_conf_node {
</ins><span class="cx"> /* node name */
</span><span class="cx"> char name[FTDM_NODE_NAME_SIZE];
</span><span class="cx">
</span><span class="lines">@@ -590,16 +307,16 @@
</span><span class="cx"> ftdm_conf_parameter_t *parameters;
</span><span class="cx">
</span><span class="cx"> /* first node child */
</span><del>- struct ftdm_conf_node_s *child;
</del><ins>+ struct ftdm_conf_node *child;
</ins><span class="cx">
</span><span class="cx"> /* next node sibling */
</span><del>- struct ftdm_conf_node_s *next;
</del><ins>+ struct ftdm_conf_node *next;
</ins><span class="cx">
</span><span class="cx"> /* my parent if any */
</span><del>- struct ftdm_conf_node_s *parent;
-} ftdm_conf_node_t;
</del><ins>+ struct ftdm_conf_node *parent;
+};
</ins><span class="cx">
</span><del>-typedef struct {
</del><ins>+typedef struct ftdm_module {
</ins><span class="cx"> char name[256];
</span><span class="cx"> fio_io_load_t io_load;
</span><span class="cx"> fio_io_unload_t io_unload;
</span><span class="lines">@@ -623,29 +340,9 @@
</span><span class="cx"> #define __FUNCTION__ (const char *)__func__
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define FTDM_PRE __FILE__, __FUNCTION__, __LINE__
-#define FTDM_LOG_LEVEL_DEBUG 7
-#define FTDM_LOG_LEVEL_INFO 6
-#define FTDM_LOG_LEVEL_NOTICE 5
-#define FTDM_LOG_LEVEL_WARNING 4
-#define FTDM_LOG_LEVEL_ERROR 3
-#define FTDM_LOG_LEVEL_CRIT 2
-#define FTDM_LOG_LEVEL_ALERT 1
-#define FTDM_LOG_LEVEL_EMERG 0
-
-#define FTDM_LOG_DEBUG FTDM_PRE, FTDM_LOG_LEVEL_DEBUG
-#define FTDM_LOG_INFO FTDM_PRE, FTDM_LOG_LEVEL_INFO
-#define FTDM_LOG_NOTICE FTDM_PRE, FTDM_LOG_LEVEL_NOTICE
-#define FTDM_LOG_WARNING FTDM_PRE, FTDM_LOG_LEVEL_WARNING
-#define FTDM_LOG_ERROR FTDM_PRE, FTDM_LOG_LEVEL_ERROR
-#define FTDM_LOG_CRIT FTDM_PRE, FTDM_LOG_LEVEL_CRIT
-#define FTDM_LOG_ALERT FTDM_PRE, FTDM_LOG_LEVEL_ALERT
-#define FTDM_LOG_EMERG FTDM_PRE, FTDM_LOG_LEVEL_EMERG
-
</del><span class="cx"> typedef struct ftdm_fsk_data_state ftdm_fsk_data_state_t;
</span><span class="cx"> typedef int (*ftdm_fsk_data_decoder_t)(ftdm_fsk_data_state_t *state);
</span><span class="cx"> typedef ftdm_status_t (*ftdm_fsk_write_sample_t)(int16_t *buf, ftdm_size_t buflen, void *user_data);
</span><del>-typedef void (*ftdm_logger_t)(const char *file, const char *func, int line, int level, const char *fmt, ...);
</del><span class="cx"> typedef struct hashtable ftdm_hash_t;
</span><span class="cx"> typedef struct hashtable_iterator ftdm_hash_iterator_t;
</span><span class="cx"> typedef struct key ftdm_hash_key_t;
</span><span class="lines">@@ -655,70 +352,6 @@
</span><span class="cx"> typedef ftdm_status_t (*ftdm_span_start_t)(ftdm_span_t *span);
</span><span class="cx"> typedef ftdm_status_t (*ftdm_span_stop_t)(ftdm_span_t *span);
</span><span class="cx">
</span><del>-typedef enum {
- FTDM_CAUSE_NONE = 0,
- FTDM_CAUSE_UNALLOCATED = 1,
- FTDM_CAUSE_NO_ROUTE_TRANSIT_NET = 2,
- FTDM_CAUSE_NO_ROUTE_DESTINATION = 3,
- FTDM_CAUSE_CHANNEL_UNACCEPTABLE = 6,
- FTDM_CAUSE_CALL_AWARDED_DELIVERED = 7,
- FTDM_CAUSE_NORMAL_CLEARING = 16,
- FTDM_CAUSE_USER_BUSY = 17,
- FTDM_CAUSE_NO_USER_RESPONSE = 18,
- FTDM_CAUSE_NO_ANSWER = 19,
- FTDM_CAUSE_SUBSCRIBER_ABSENT = 20,
- FTDM_CAUSE_CALL_REJECTED = 21,
- FTDM_CAUSE_NUMBER_CHANGED = 22,
- FTDM_CAUSE_REDIRECTION_TO_NEW_DESTINATION = 23,
- FTDM_CAUSE_EXCHANGE_ROUTING_ERROR = 25,
- FTDM_CAUSE_DESTINATION_OUT_OF_ORDER = 27,
- FTDM_CAUSE_INVALID_NUMBER_FORMAT = 28,
- FTDM_CAUSE_FACILITY_REJECTED = 29,
- FTDM_CAUSE_RESPONSE_TO_STATUS_ENQUIRY = 30,
- FTDM_CAUSE_NORMAL_UNSPECIFIED = 31,
- FTDM_CAUSE_NORMAL_CIRCUIT_CONGESTION = 34,
- FTDM_CAUSE_NETWORK_OUT_OF_ORDER = 38,
- FTDM_CAUSE_NORMAL_TEMPORARY_FAILURE = 41,
- FTDM_CAUSE_SWITCH_CONGESTION = 42,
- FTDM_CAUSE_ACCESS_INFO_DISCARDED = 43,
- FTDM_CAUSE_REQUESTED_CHAN_UNAVAIL = 44,
- FTDM_CAUSE_PRE_EMPTED = 45,
- FTDM_CAUSE_FACILITY_NOT_SUBSCRIBED = 50,
- FTDM_CAUSE_OUTGOING_CALL_BARRED = 52,
- FTDM_CAUSE_INCOMING_CALL_BARRED = 54,
- FTDM_CAUSE_BEARERCAPABILITY_NOTAUTH = 57,
- FTDM_CAUSE_BEARERCAPABILITY_NOTAVAIL = 58,
- FTDM_CAUSE_SERVICE_UNAVAILABLE = 63,
- FTDM_CAUSE_BEARERCAPABILITY_NOTIMPL = 65,
- FTDM_CAUSE_CHAN_NOT_IMPLEMENTED = 66,
- FTDM_CAUSE_FACILITY_NOT_IMPLEMENTED = 69,
- FTDM_CAUSE_SERVICE_NOT_IMPLEMENTED = 79,
- FTDM_CAUSE_INVALID_CALL_REFERENCE = 81,
- FTDM_CAUSE_INCOMPATIBLE_DESTINATION = 88,
- FTDM_CAUSE_INVALID_MSG_UNSPECIFIED = 95,
- FTDM_CAUSE_MANDATORY_IE_MISSING = 96,
- FTDM_CAUSE_MESSAGE_TYPE_NONEXIST = 97,
- FTDM_CAUSE_WRONG_MESSAGE = 98,
- FTDM_CAUSE_IE_NONEXIST = 99,
- FTDM_CAUSE_INVALID_IE_CONTENTS = 100,
- FTDM_CAUSE_WRONG_CALL_STATE = 101,
- FTDM_CAUSE_RECOVERY_ON_TIMER_EXPIRE = 102,
- FTDM_CAUSE_MANDATORY_IE_LENGTH_ERROR = 103,
- FTDM_CAUSE_PROTOCOL_ERROR = 111,
- FTDM_CAUSE_INTERWORKING = 127,
- FTDM_CAUSE_SUCCESS = 142,
- FTDM_CAUSE_ORIGINATOR_CANCEL = 487,
- FTDM_CAUSE_CRASH = 500,
- FTDM_CAUSE_SYSTEM_SHUTDOWN = 501,
- FTDM_CAUSE_LOSE_RACE = 502,
- FTDM_CAUSE_MANAGER_REQUEST = 503,
- FTDM_CAUSE_BLIND_TRANSFER = 600,
- FTDM_CAUSE_ATTENDED_TRANSFER = 601,
- FTDM_CAUSE_ALLOTTED_TIMEOUT = 602,
- FTDM_CAUSE_USER_CHALLENGE = 603,
- FTDM_CAUSE_MEDIA_TIMEOUT = 604
-} ftdm_call_cause_t;
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeprivateftdm_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/private/ftdm_types.h (17436 => 17437)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/private/ftdm_types.h 2010-04-28 22:17:50 UTC (rev 17436)
+++ freeswitch/trunk/libs/freetdm/src/include/private/ftdm_types.h 2010-04-28 22:17:50 UTC (rev 17437)
</span><span class="lines">@@ -241,6 +241,7 @@
</span><span class="cx"> FTDM_CHANNEL_USE_RX_GAIN = (1 << 25),
</span><span class="cx"> FTDM_CHANNEL_USE_TX_GAIN = (1 << 26),
</span><span class="cx"> FTDM_CHANNEL_IN_ALARM = (1 << 27),
</span><ins>+ FTDM_CHANNEL_SIG_UP = (1 << 28),
</ins><span class="cx"> } ftdm_channel_flag_t;
</span><span class="cx"> #if defined(__cplusplus) && defined(WIN32)
</span><span class="cx"> // fix C2676
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>