projects
/
lcr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed includes to latest mISDNuser structures.
[lcr.git]
/
bchannel.c
diff --git
a/bchannel.c
b/bchannel.c
index
51423a1
..
f49572b
100644
(file)
--- a/
bchannel.c
+++ b/
bchannel.c
@@
-25,9
+25,9
@@
#include <sys/socket.h>
#include <mISDNif.h>
#include <sys/socket.h>
#include <mISDNif.h>
-#
define AF_COMPATIBILITY_FUNC 1
-#define MISDN_OLD_AF_COMPATIBILITY 1
-#include <
compat_af_isdn
.h>
+#
include <mISDN/mISDNcompat.h>
+int __af_isdn = MISDN_AF_ISDN;
+#include <
mISDN/q931
.h>
#define HAVE_ATTRIBUTE_always_inline 1
#define HAVE_ARPA_INET_H 1
#define HAVE_ATTRIBUTE_always_inline 1
#define HAVE_ARPA_INET_H 1
@@
-74,8
+74,6
@@
static void bchannel_send_queue(struct bchannel *bchannel);
int bchannel_initialize(void)
{
int bchannel_initialize(void)
{
- init_af_isdn();
-
return 0;
}
return 0;
}
@@
-449,9
+447,9
@@
void bchannel_transmit(struct bchannel *bchannel, unsigned char *data, int len)
bchannel->test = (bchannel->test + len) & 7;
#endif
if (bchannel->nodsp_queue) {
bchannel->test = (bchannel->test + len) & 7;
#endif
if (bchannel->nodsp_queue) {
- space = (bchannel->nodsp_queue_out - bchannel->nodsp_queue_in) & (QUEUE_BUFFER_SIZE - 1);
+ space = (bchannel->nodsp_queue_out - bchannel->nodsp_queue_in
- 1
) & (QUEUE_BUFFER_SIZE - 1);
if (len > space) {
if (len > space) {
- CERROR(bchannel->call, NULL, "Queue buffer overflow
.\n"
);
+ CERROR(bchannel->call, NULL, "Queue buffer overflow
, space is %d, len is %d.\n", space, len
);
return;
}
p = buff + MISDN_HEADER_LEN;
return;
}
p = buff + MISDN_HEADER_LEN;
@@
-485,6
+483,11
@@
static void bchannel_send_queue(struct bchannel *bchannel)
len = (bchannel->nodsp_queue_in - bchannel->nodsp_queue_out) & (QUEUE_BUFFER_SIZE - 1);
if (len == 0)
return; /* mISDN driver received all load */
len = (bchannel->nodsp_queue_in - bchannel->nodsp_queue_out) & (QUEUE_BUFFER_SIZE - 1);
if (len == 0)
return; /* mISDN driver received all load */
+#if 0
+ printf("%4d:(%s|%s)\n", bchannel->nodsp_queue_out,
+ "----------------------------------------------------------------"+64-len/(8192/64),
+ " "+len/(8192/64));
+#endif
if (len > 1024)
len = 1024;
frm->prim = PH_DATA_REQ;
if (len > 1024)
len = 1024;
frm->prim = PH_DATA_REQ;