add separate private data for tx to 1 and 3.

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@97 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/src/isdn/Q921.c b/libs/freetdm/src/isdn/Q921.c
index d0a0bce29e94e20ab3fb6e3214c09e4533628730..9eab78b99e6d1410b8bf632f9d7ddb17ee6320f7 100644 (file)
--- a/libs/freetdm/src/isdn/Q921.c
+++ b/libs/freetdm/src/isdn/Q921.c
@@ -56,7 +56,8 @@ void Q921_InitTrunk(L2TRUNK trunk,
                                        L2INT hsize,\r
                                        Q921TxCB_t cb21,\r
                                        Q921TxCB_t cb23,\r
-                                       void *priv)\r
+                                       void *priv21,\r
+                                       void *priv23)\r
 {\r
        if (trunk->initialized != INITIALIZED_MAGIC) {\r
                MFIFOCreate(trunk->HDLCInQueue, Q921MAXHDLCSPACE, 10);\r
@@ -70,18 +71,19 @@ void Q921_InitTrunk(L2TRUNK trunk,
        trunk->NetUser = NetUser;\r
        trunk->Q921Tx21Proc = cb21;\r
        trunk->Q921Tx23Proc = cb23;\r
-       trunk->PrivateData = priv;\r
+       trunk->PrivateData21 = priv21;\r
+       trunk->PrivateData23 = priv23;\r
        trunk->Q921HeaderSpace = hsize;\r
 }\r
 \r
 static int Q921Tx21Proc(L2TRUNK trunk, L2UCHAR *Msg, L2INT size)\r
 {\r
-       return trunk->Q921Tx21Proc(trunk->PrivateData, Msg, size);\r
+       return trunk->Q921Tx21Proc(trunk->PrivateData21, Msg, size);\r
 }\r
 \r
 int Q921Tx23Proc(L2TRUNK trunk, L2UCHAR *Msg, L2INT size)\r
 {\r
-       return trunk->Q921Tx23Proc(trunk->PrivateData, Msg, size);\r
+       return trunk->Q921Tx23Proc(trunk->PrivateData23, Msg, size);\r
 \r
 }\r
 \r

diff --git a/libs/freetdm/src/isdn/include/Q921.h b/libs/freetdm/src/isdn/include/Q921.h
index 314464d69c369816539556aa9087bdd35260c97f..9338a49c9946706c3dd6eb335a17a17febb20c09 100644 (file)
--- a/libs/freetdm/src/isdn/include/Q921.h
+++ b/libs/freetdm/src/isdn/include/Q921.h
@@ -106,7 +106,8 @@ struct Q921Data
        Q921NetUser_t NetUser;\r
        Q921TxCB_t Q921Tx21Proc;\r
        Q921TxCB_t Q921Tx23Proc;\r
-       void *PrivateData;\r
+       void *PrivateData21;\r
+       void *PrivateData23;\r
        L2INT Q921HeaderSpace;\r
 \r
 };\r
@@ -118,7 +119,8 @@ void Q921_InitTrunk(L2TRUNK trunk,
                                        L2INT hsize,\r
                                        Q921TxCB_t cb21,\r
                                        Q921TxCB_t cb23,\r
-                                       void *priv);\r
+                                       void *priv21,\r
+                                       void *priv23);\r
 int Q921QueueHDLCFrame(L2TRUNK trunk, L2UCHAR *b, L2INT size);\r
 int Q921Rx12(L2TRUNK trunk);\r
 int Q921Rx32(L2TRUNK trunk, L2UCHAR * Mes, L2INT Size);\r