projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This was missing at merge:
[lcr.git]
/
gsm_ms.cpp
diff --git
a/gsm_ms.cpp
b/gsm_ms.cpp
index
c8292f9
..
481a4ac
100644
(file)
--- a/
gsm_ms.cpp
+++ b/
gsm_ms.cpp
@@
-37,8
+37,6
@@
void *l23_ctx = NULL;
static int dtmf_timeout(struct lcr_timer *timer, void *instance, int index);
static int dtmf_timeout(struct lcr_timer *timer, void *instance, int index);
-static int dtmf_timeout(struct lcr_timer *timer, void *instance, int index);
-
/*
* constructor
*/
/*
* constructor
*/
@@
-62,12
+60,6
@@
Pgsm_ms::Pgsm_ms(int type, struct mISDNport *mISDNport, char *portname, struct p
memset(&p_m_g_dtmf_timer, 0, sizeof(p_m_g_dtmf_timer));
add_timer(&p_m_g_dtmf_timer, dtmf_timeout, this, 0);
memset(&p_m_g_dtmf_timer, 0, sizeof(p_m_g_dtmf_timer));
add_timer(&p_m_g_dtmf_timer, dtmf_timeout, this, 0);
- p_m_g_dtmf_state = DTMF_ST_IDLE;
- p_m_g_dtmf_index = 0;
- p_m_g_dtmf[0] = '\0';
- memset(&p_m_g_dtmf_timer, 0, sizeof(p_m_g_dtmf_timer));
- add_timer(&p_m_g_dtmf_timer, dtmf_timeout, this, 0);
-
PDEBUG(DEBUG_GSM, "Created new GSMMSPort(%s %s).\n", portname, ms_name);
}
PDEBUG(DEBUG_GSM, "Created new GSMMSPort(%s %s).\n", portname, ms_name);
}