diff options
Diffstat (limited to 'drivers/isdn/gigaset/i4l.c')
-rw-r--r-- | drivers/isdn/gigaset/i4l.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c index 731a675f21b0..e30275d4e148 100644 --- a/drivers/isdn/gigaset/i4l.c +++ b/drivers/isdn/gigaset/i4l.c | |||
@@ -11,10 +11,6 @@ | |||
11 | * published by the Free Software Foundation; either version 2 of | 11 | * published by the Free Software Foundation; either version 2 of |
12 | * the License, or (at your option) any later version. | 12 | * the License, or (at your option) any later version. |
13 | * ===================================================================== | 13 | * ===================================================================== |
14 | * ToDo: ... | ||
15 | * ===================================================================== | ||
16 | * Version: $Id: i4l.c,v 1.3.2.9 2006/02/04 18:28:16 hjlipp Exp $ | ||
17 | * ===================================================================== | ||
18 | */ | 14 | */ |
19 | 15 | ||
20 | #include "gigaset.h" | 16 | #include "gigaset.h" |
@@ -29,7 +25,8 @@ | |||
29 | * parameters: | 25 | * parameters: |
30 | * driverID driver ID as assigned by LL | 26 | * driverID driver ID as assigned by LL |
31 | * channel channel number | 27 | * channel channel number |
32 | * ack if != 0 LL wants to be notified on completion via statcallb(ISDN_STAT_BSENT) | 28 | * ack if != 0 LL wants to be notified on completion via |
29 | * statcallb(ISDN_STAT_BSENT) | ||
33 | * skb skb containing data to send | 30 | * skb skb containing data to send |
34 | * return value: | 31 | * return value: |
35 | * number of accepted bytes | 32 | * number of accepted bytes |
@@ -123,9 +120,6 @@ static int command_from_LL(isdn_ctrl *cntrl) | |||
123 | //dbg(DEBUG_ANY, "Gigaset_HW: Receiving command"); | 120 | //dbg(DEBUG_ANY, "Gigaset_HW: Receiving command"); |
124 | gigaset_debugdrivers(); | 121 | gigaset_debugdrivers(); |
125 | 122 | ||
126 | /* Terminate this call if no device is present. Bt if the command is "ISDN_CMD_LOCK" or | ||
127 | * "ISDN_CMD_UNLOCK" then execute it due to the fact that they are device independent ! | ||
128 | */ | ||
129 | //FIXME "remove test for &connected" | 123 | //FIXME "remove test for &connected" |
130 | if ((!cs || !atomic_read(&cs->connected))) { | 124 | if ((!cs || !atomic_read(&cs->connected))) { |
131 | warn("LL tried to access unknown device with nr. %d", | 125 | warn("LL tried to access unknown device with nr. %d", |
@@ -222,15 +216,15 @@ static int command_from_LL(isdn_ctrl *cntrl) | |||
222 | gigaset_schedule_event(cs); | 216 | gigaset_schedule_event(cs); |
223 | 217 | ||
224 | break; | 218 | break; |
225 | case ISDN_CMD_CLREAZ: /* Do not signal incoming signals */ //FIXME | 219 | case ISDN_CMD_CLREAZ: /* Do not signal incoming signals */ //FIXME |
226 | dbg(DEBUG_ANY, "ISDN_CMD_CLREAZ"); | 220 | dbg(DEBUG_ANY, "ISDN_CMD_CLREAZ"); |
227 | break; | 221 | break; |
228 | case ISDN_CMD_SETEAZ: /* Signal incoming calls for given MSN */ //FIXME | 222 | case ISDN_CMD_SETEAZ: /* Signal incoming calls for given MSN */ //FIXME |
229 | dbg(DEBUG_ANY, | 223 | dbg(DEBUG_ANY, |
230 | "ISDN_CMD_SETEAZ (id:%d, channel: %ld, number: %s)", | 224 | "ISDN_CMD_SETEAZ (id:%d, channel: %ld, number: %s)", |
231 | cntrl->driver, cntrl->arg, cntrl->parm.num); | 225 | cntrl->driver, cntrl->arg, cntrl->parm.num); |
232 | break; | 226 | break; |
233 | case ISDN_CMD_SETL2: /* Set L2 to given protocol */ | 227 | case ISDN_CMD_SETL2: /* Set L2 to given protocol */ |
234 | dbg(DEBUG_ANY, "ISDN_CMD_SETL2 (Channel: %ld, Proto: %lx)", | 228 | dbg(DEBUG_ANY, "ISDN_CMD_SETL2 (Channel: %ld, Proto: %lx)", |
235 | cntrl->arg & 0xff, (cntrl->arg >> 8)); | 229 | cntrl->arg & 0xff, (cntrl->arg >> 8)); |
236 | 230 | ||
@@ -250,7 +244,7 @@ static int command_from_LL(isdn_ctrl *cntrl) | |||
250 | dbg(DEBUG_CMD, "scheduling PROTO_L2"); | 244 | dbg(DEBUG_CMD, "scheduling PROTO_L2"); |
251 | gigaset_schedule_event(cs); | 245 | gigaset_schedule_event(cs); |
252 | break; | 246 | break; |
253 | case ISDN_CMD_SETL3: /* Set L3 to given protocol */ | 247 | case ISDN_CMD_SETL3: /* Set L3 to given protocol */ |
254 | dbg(DEBUG_ANY, "ISDN_CMD_SETL3 (Channel: %ld, Proto: %lx)", | 248 | dbg(DEBUG_ANY, "ISDN_CMD_SETL3 (Channel: %ld, Proto: %lx)", |
255 | cntrl->arg & 0xff, (cntrl->arg >> 8)); | 249 | cntrl->arg & 0xff, (cntrl->arg >> 8)); |
256 | 250 | ||
@@ -396,10 +390,14 @@ int gigaset_isdn_setup_dial(struct at_state_t *at_state, void *data) | |||
396 | } | 390 | } |
397 | 391 | ||
398 | if (bcs->commands[AT_MSN]) | 392 | if (bcs->commands[AT_MSN]) |
399 | snprintf(bcs->commands[AT_MSN], length[AT_MSN], "^SMSN=%s\r", sp->eazmsn); | 393 | snprintf(bcs->commands[AT_MSN], length[AT_MSN], |
400 | snprintf(bcs->commands[AT_BC ], length[AT_BC ], "^SBC=%s\r", bc); | 394 | "^SMSN=%s\r", sp->eazmsn); |
401 | snprintf(bcs->commands[AT_PROTO], length[AT_PROTO], "^SBPR=%u\r", proto); | 395 | snprintf(bcs->commands[AT_BC ], length[AT_BC ], |
402 | snprintf(bcs->commands[AT_ISO ], length[AT_ISO ], "^SISO=%u\r", (unsigned)bcs->channel + 1); | 396 | "^SBC=%s\r", bc); |
397 | snprintf(bcs->commands[AT_PROTO], length[AT_PROTO], | ||
398 | "^SBPR=%u\r", proto); | ||
399 | snprintf(bcs->commands[AT_ISO ], length[AT_ISO ], | ||
400 | "^SISO=%u\r", (unsigned)bcs->channel + 1); | ||
403 | 401 | ||
404 | return 0; | 402 | return 0; |
405 | } | 403 | } |
@@ -441,8 +439,10 @@ int gigaset_isdn_setup_accept(struct at_state_t *at_state) | |||
441 | } | 439 | } |
442 | } | 440 | } |
443 | 441 | ||
444 | snprintf(bcs->commands[AT_PROTO], length[AT_PROTO], "^SBPR=%u\r", proto); | 442 | snprintf(bcs->commands[AT_PROTO], length[AT_PROTO], |
445 | snprintf(bcs->commands[AT_ISO ], length[AT_ISO ], "^SISO=%u\r", (unsigned) bcs->channel + 1); | 443 | "^SBPR=%u\r", proto); |
444 | snprintf(bcs->commands[AT_ISO ], length[AT_ISO ], | ||
445 | "^SISO=%u\r", (unsigned) bcs->channel + 1); | ||
446 | 446 | ||
447 | return 0; | 447 | return 0; |
448 | } | 448 | } |
@@ -542,9 +542,9 @@ int gigaset_register_to_LL(struct cardstate *cs, const char *isdnid) | |||
542 | return -ENOMEM; //FIXME EINVAL/...?? | 542 | return -ENOMEM; //FIXME EINVAL/...?? |
543 | 543 | ||
544 | iif->owner = THIS_MODULE; | 544 | iif->owner = THIS_MODULE; |
545 | iif->channels = cs->channels; /* I am supporting just one channel *//* I was supporting...*/ | 545 | iif->channels = cs->channels; |
546 | iif->maxbufsize = MAX_BUF_SIZE; | 546 | iif->maxbufsize = MAX_BUF_SIZE; |
547 | iif->features = ISDN_FEATURE_L2_TRANS | /* Our device is very advanced, therefore */ | 547 | iif->features = ISDN_FEATURE_L2_TRANS | |
548 | ISDN_FEATURE_L2_HDLC | | 548 | ISDN_FEATURE_L2_HDLC | |
549 | #ifdef GIG_X75 | 549 | #ifdef GIG_X75 |
550 | ISDN_FEATURE_L2_X75I | | 550 | ISDN_FEATURE_L2_X75I | |