missing changes from previous commit.

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

diff --git a/libs/freetdm/src/isdn/Q921.c b/libs/freetdm/src/isdn/Q921.c
index 3f768e411655391928caabb7bf2eccd8f657164a..1a7e3d402b385a9712a8445d7f85f48dea981452 100644 (file)
--- a/libs/freetdm/src/isdn/Q921.c
+++ b/libs/freetdm/src/isdn/Q921.c
@@ -90,7 +90,7 @@ void Q921Init()
                                if your trunk is not TE (user) mode (i.e. NET).\r
 \r
 *****************************************************************************/\r
-int Q921_InitTrunk(long trunk, int sapi, int tei, Q921NetUser_t NetUser)\r
+int Q921_InitTrunk(long trunk, L2UCHAR sapi, L2UCHAR tei, Q921NetUser_t NetUser)\r
 {\r
        if (trunk > Q921MAXTRUNK)\r
                return 0;\r
@@ -173,9 +173,9 @@ int Q921SendI(int trunk, L2UCHAR Sapi, char cr, L2UCHAR Tei, char pf, L2UCHAR *m
 int Q921Rx32(long trunk, L2UCHAR * Mes, L2INT Size)\r
 {\r
        return Q921SendI(trunk, \r
-                                       Q921DevSpace[x].sapi, \r
-                                       Q921DevSpace[x].NetUser == Q921_TE ? 0 : 1;\r
-                                       Q921DevSpace[x].tei, \r
+                                       Q921DevSpace[trunk].sapi, \r
+                                       Q921DevSpace[trunk].NetUser == Q921_TE ? 0 : 1,\r
+                                       Q921DevSpace[trunk].tei, \r
                                        0, \r
                                        Mes, \r
                                        Size);\r

diff --git a/libs/freetdm/src/isdn/include/Q921.h b/libs/freetdm/src/isdn/include/Q921.h
index cec349820a6b591c5a591a0635818b0ecebd16b8..aba3fab9a0939bf687e78a21c7cc2881a1e0f52a 100644 (file)
--- a/libs/freetdm/src/isdn/include/Q921.h
+++ b/libs/freetdm/src/isdn/include/Q921.h
@@ -110,19 +110,19 @@ typedef struct
     L2UCHAR vs;\r
     L2UCHAR vr;\r
     L2INT state;\r
-       L2INT sapi;\r
-       L2INT tei;\r
+       L2UCHAR sapi;\r
+       L2UCHAR tei;\r
        Q921NetUser_t NetUser;\r
 \r
 }Q921Data;\r
 \r
 void Q921Init();\r
-int Q921_InitTrunk(long trunk, int sapi, int tei, Q921NetUser_t NetUser);\r
+int Q921_InitTrunk(long trunk, L2UCHAR sapi, L2UCHAR tei, Q921NetUser_t NetUser);\r
 void Q921SetHeaderSpace(int hspace);\r
 void Q921SetTx21CB(int (*callback)(int dev, L2UCHAR *, int));\r
 void Q921SetTx23CB(int (*callback)(int dev, L2UCHAR *, int));\r
 int Q921QueueHDLCFrame(int trunk, L2UCHAR *b, int size);\r
 int Q921Rx12(long trunk);\r
-\r
+int Q921Rx32(long trunk, L2UCHAR * Mes, L2INT Size);\r
 #endif\r
 \r