aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/gigaset/isocdata.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/gigaset/isocdata.c')
-rw-r--r--drivers/isdn/gigaset/isocdata.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/isdn/gigaset/isocdata.c b/drivers/isdn/gigaset/isocdata.c
index 5744eb91b315..e2d93e935530 100644
--- a/drivers/isdn/gigaset/isocdata.c
+++ b/drivers/isdn/gigaset/isocdata.c
@@ -10,10 +10,6 @@
10 * published by the Free Software Foundation; either version 2 of 10 * published by the Free Software Foundation; either version 2 of
11 * the License, or (at your option) any later version. 11 * the License, or (at your option) any later version.
12 * ===================================================================== 12 * =====================================================================
13 * ToDo: ...
14 * =====================================================================
15 * Version: $Id: isocdata.c,v 1.2.2.5 2005/11/13 23:05:19 hjlipp Exp $
16 * =====================================================================
17 */ 13 */
18 14
19#include "gigaset.h" 15#include "gigaset.h"
@@ -196,7 +192,8 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
196 return -EBUSY; 192 return -EBUSY;
197 /* write position could have changed */ 193 /* write position could have changed */
198 if (limit >= (write = atomic_read(&iwb->write))) { 194 if (limit >= (write = atomic_read(&iwb->write))) {
199 pbyte = iwb->data[write]; /* save partial byte */ 195 pbyte = iwb->data[write]; /* save
196 partial byte */
200 limit = write + BAS_OUTBUFPAD; 197 limit = write + BAS_OUTBUFPAD;
201 dbg(DEBUG_STREAM, 198 dbg(DEBUG_STREAM,
202 "%s: filling %d->%d with %02x", 199 "%s: filling %d->%d with %02x",
@@ -213,7 +210,8 @@ int gigaset_isowbuf_getbytes(struct isowbuf_t *iwb, int size)
213 } 210 }
214 dbg(DEBUG_STREAM, "%s: restoring %02x at %d", 211 dbg(DEBUG_STREAM, "%s: restoring %02x at %d",
215 __func__, pbyte, limit); 212 __func__, pbyte, limit);
216 iwb->data[limit] = pbyte; /* restore partial byte */ 213 iwb->data[limit] = pbyte; /* restore
214 partial byte */
217 atomic_set(&iwb->write, limit); 215 atomic_set(&iwb->write, limit);
218 } 216 }
219 isowbuf_donewrite(iwb); 217 isowbuf_donewrite(iwb);
@@ -508,11 +506,13 @@ int gigaset_isoc_buildframe(struct bc_state *bcs, unsigned char *in, int len)
508 switch (bcs->proto2) { 506 switch (bcs->proto2) {
509 case ISDN_PROTO_L2_HDLC: 507 case ISDN_PROTO_L2_HDLC:
510 result = hdlc_buildframe(bcs->hw.bas->isooutbuf, in, len); 508 result = hdlc_buildframe(bcs->hw.bas->isooutbuf, in, len);
511 dbg(DEBUG_ISO, "%s: %d bytes HDLC -> %d", __func__, len, result); 509 dbg(DEBUG_ISO, "%s: %d bytes HDLC -> %d",
510 __func__, len, result);
512 break; 511 break;
513 default: /* assume transparent */ 512 default: /* assume transparent */
514 result = trans_buildframe(bcs->hw.bas->isooutbuf, in, len); 513 result = trans_buildframe(bcs->hw.bas->isooutbuf, in, len);
515 dbg(DEBUG_ISO, "%s: %d bytes trans -> %d", __func__, len, result); 514 dbg(DEBUG_ISO, "%s: %d bytes trans -> %d",
515 __func__, len, result);
516 } 516 }
517 return result; 517 return result;
518} 518}