summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/isdn/i4l/isdn_common.c48
-rw-r--r--drivers/isdn/i4l/isdn_common.h11
-rw-r--r--drivers/isdn/i4l/isdn_net.c428
-rw-r--r--drivers/isdn/i4l/isdn_tty.c36
-rw-r--r--include/linux/isdn.h2
-rw-r--r--include/linux/isdnif.h2
-rw-r--r--init/main.c1
7 files changed, 279 insertions, 249 deletions
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 464abbc87775..b5eff0c62a0d 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -19,6 +19,7 @@
#include <linux/vmalloc.h>
#include <linux/isdn.h>
#include <linux/smp_lock.h>
+#include <linux/ctype.h>
#include "isdn_common.h"
#include "isdn_tty.h"
#include "isdn_net.h"
@@ -2166,6 +2167,53 @@ isdn_slot_command(int sl, int cmd, isdn_ctrl *ctrl)
return isdn_command(ctrl);
}
+int
+isdn_slot_dial(int sl, struct dial_info *dial)
+{
+ isdn_ctrl cmd;
+ int retval;
+ char *msn = isdn_slot_map_eaz2msn(sl, dial->msn);
+
+ /* check for DOV */
+ if (dial->si1 == 7 && tolower(dial->phone[0]) == 'v') { /* DOV call */
+ dial->si1 = 1;
+ dial->phone++; /* skip v/V */
+ }
+
+ strcpy(isdn_slot_num(sl), dial->phone);
+ isdn_slot_set_usage(sl, isdn_slot_usage(sl) | ISDN_USAGE_OUTGOING);
+
+ retval = isdn_slot_command(sl, ISDN_CMD_CLREAZ, &cmd);
+ if (retval)
+ return retval;
+
+ strcpy(cmd.parm.num, msn);
+ retval = isdn_slot_command(sl, ISDN_CMD_SETEAZ, &cmd);
+
+ cmd.arg = dial->l2_proto << 8;
+ cmd.parm.fax = dial->fax;
+ retval = isdn_slot_command(sl, ISDN_CMD_SETL2, &cmd);
+ if (retval)
+ return retval;
+
+ cmd.arg = dial->l3_proto << 8;
+ retval = isdn_slot_command(sl, ISDN_CMD_SETL3, &cmd);
+ if (retval)
+ return retval;
+
+ cmd.parm.setup.si1 = dial->si1;
+ cmd.parm.setup.si2 = dial->si2;
+ strcpy(cmd.parm.setup.eazmsn, msn);
+ strcpy(cmd.parm.setup.phone, dial->phone);
+
+ printk(KERN_INFO "ISDN: slot %d: Dialing %s -> %s (SI %d/%d) (B %d/%d)\n",
+ sl, cmd.parm.setup.eazmsn, cmd.parm.setup.phone,
+ cmd.parm.setup.si1, cmd.parm.setup.si2,
+ dial->l2_proto, dial->l3_proto);
+
+ return isdn_slot_command(sl, ISDN_CMD_DIAL, &cmd);
+}
+
void
isdn_slot_all_eaz(int sl)
{
diff --git a/drivers/isdn/i4l/isdn_common.h b/drivers/isdn/i4l/isdn_common.h
index 7b7063375ce4..ee5863cd9409 100644
--- a/drivers/isdn/i4l/isdn_common.h
+++ b/drivers/isdn/i4l/isdn_common.h
@@ -42,10 +42,21 @@ extern int isdn_add_channels(driver *, int, int, int);
extern void isdn_dumppkt(char *, u_char *, int, int);
#endif
+struct dial_info {
+ int l2_proto;
+ int l3_proto;
+ struct T30_s *fax;
+ unsigned char si1;
+ unsigned char si2;
+ unsigned char *msn;
+ unsigned char *phone;
+};
+
extern int isdn_get_free_slot(int, int, int, int, int, char *);
extern void isdn_slot_free(int slot, int usage);
extern void isdn_slot_all_eaz(int slot);
extern int isdn_slot_command(int slot, int cmd, isdn_ctrl *);
+extern int isdn_slot_dial(int slot, struct dial_info *dial);
extern char *isdn_slot_map_eaz2msn(int slot, char *msn);
extern int isdn_slot_write(int slot, struct sk_buff *);
extern int isdn_slot_readbchan(int slot, u_char *, u_char *, int);
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index ffd6031d6e5d..d32522654c46 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -556,6 +556,124 @@ isdn_net_stat_callback(int idx, isdn_ctrl *c)
return 0;
}
+/* Initiate dialout. Set phone-number-pointer to first number
+ * of interface.
+ */
+static int
+init_dialout(isdn_net_local *lp)
+{
+ unsigned long flags;
+
+ save_flags(flags);
+ cli();
+ lp->dial = lp->phone[1];
+ restore_flags(flags);
+
+ if (!lp->dial) {
+ printk(KERN_WARNING "%s: phone number deleted?\n",
+ lp->name);
+ isdn_net_hangup(&lp->netdev->dev);
+ return 0;
+ }
+ if (lp->dialtimeout > 0 &&
+ (lp->dialstarted == 0 ||
+ time_after(jiffies, lp->dialstarted + lp->dialtimeout + lp->dialwait))) {
+ lp->dialstarted = jiffies;
+ lp->dialwait_timer = 0;
+ }
+ lp->dialstate = 2;
+ return 1;
+}
+
+/* Setup interface, dial current phone-number, switch to next number.
+ * If list of phone-numbers is exhausted, increment
+ * retry-counter.
+ */
+static int
+do_dialout(isdn_net_local *lp)
+{
+ unsigned long flags;
+
+ if(dev->global_flags & ISDN_GLOBAL_STOPPED || (ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_OFF)) {
+ char *s;
+ if (dev->global_flags & ISDN_GLOBAL_STOPPED)
+ s = "dial suppressed: isdn system stopped";
+ else
+ s = "dial suppressed: dialmode `off'";
+ isdn_net_unreachable(&lp->netdev->dev, 0, s);
+ isdn_net_hangup(&lp->netdev->dev);
+ return 0;
+ }
+
+ save_flags(flags);
+ cli();
+ if (!lp->dial) {
+ restore_flags(flags);
+ printk(KERN_WARNING "%s: phone number deleted?\n",
+ lp->name);
+ isdn_net_hangup(&lp->netdev->dev);
+ return 0;
+ }
+ if (!strncmp(lp->dial->num, "LEASED", strlen("LEASED"))) {
+ restore_flags(flags);
+ lp->dialstate = 4;
+ printk(KERN_INFO "%s: Open leased line ...\n", lp->name);
+ } else {
+ struct dial_info dial = {
+ .l2_proto = lp->l2_proto,
+ .l3_proto = lp->l3_proto,
+ .si1 = 7,
+ .si2 = 0,
+ .msn = lp->msn,
+ .phone = lp->dial->num,
+ };
+ if(lp->dialtimeout > 0) {
+ if (time_after(jiffies, lp->dialstarted + lp->dialtimeout)) {
+ restore_flags(flags);
+ lp->dialwait_timer = jiffies + lp->dialwait;
+ lp->dialstarted = 0;
+ isdn_net_unreachable(&lp->netdev->dev, 0, "dial: timed out");
+ isdn_net_hangup(&lp->netdev->dev);
+ return 0;
+ }
+ }
+ /*
+ * Switch to next number or back to start if at end of list.
+ */
+ if (!(lp->dial = (isdn_net_phone *) lp->dial->next)) {
+ lp->dial = lp->phone[1];
+ lp->dialretry++;
+
+ if (lp->dialretry > lp->dialmax) {
+ restore_flags(flags);
+ if (lp->dialtimeout == 0) {
+ lp->dialwait_timer = jiffies + lp->dialwait;
+ lp->dialstarted = 0;
+ isdn_net_unreachable(&lp->netdev->dev, 0, "dial: tried all numbers dialmax times");
+ }
+ isdn_net_hangup(&lp->netdev->dev);
+ return 0;
+ }
+ }
+ restore_flags(flags);
+ lp->dtimer = 0;
+ isdn_slot_dial(lp->isdn_slot, &dial);
+ }
+ lp->huptimer = 0;
+ lp->outgoing = 1;
+ if (lp->chargeint) {
+ lp->hupflags |= ISDN_HAVECHARGE;
+ lp->hupflags &= ~ISDN_WAITCHARGE;
+ } else {
+ lp->hupflags |= ISDN_WAITCHARGE;
+ lp->hupflags &= ~ISDN_HAVECHARGE;
+ }
+ lp->dialstate =
+ (lp->cbdelay &&
+ (lp->flags & ISDN_NET_CBOUT)) ? 12 : 4;
+ return 1;
+}
+
/*
* Perform dialout for net-interfaces and timeout-handling for
* D-Channel-up and B-Channel-up Messages.
@@ -571,11 +689,9 @@ isdn_net_dial(void)
{
isdn_net_dev *p = dev->netdev;
int anymore = 0;
- unsigned long flags;
isdn_ctrl cmd;
- u_char *phone_number;
- while (p) {
+ for (p = dev->netdev; p; p = p->next) {
isdn_net_local *lp = p->local;
#ifdef ISDN_DEBUG_NET_DIAL
@@ -583,234 +699,106 @@ isdn_net_dial(void)
printk(KERN_DEBUG "%s: dialstate=%d\n", lp->name, lp->dialstate);
#endif
switch (lp->dialstate) {
- case 0:
- /* Nothing to do for this interface */
- break;
- case 1:
- /* Initiate dialout. Set phone-number-pointer to first number
- * of interface.
- */
- save_flags(flags);
- cli();
- lp->dial = lp->phone[1];
- restore_flags(flags);
- if (!lp->dial) {
- printk(KERN_WARNING "%s: phone number deleted?\n",
- lp->name);
- isdn_net_hangup(&p->dev);
- break;
- }
- anymore = 1;
-
- if(lp->dialtimeout > 0)
- if(lp->dialstarted == 0 || time_after(jiffies, lp->dialstarted + lp->dialtimeout + lp->dialwait)) {
- lp->dialstarted = jiffies;
- lp->dialwait_timer = 0;
- }
-
- lp->dialstate++;
- /* Fall through */
- case 2:
- /* Prepare dialing. Clear EAZ, then set EAZ. */
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_CLREAZ, &cmd);
- sprintf(cmd.parm.num, "%s", isdn_slot_map_eaz2msn(lp->isdn_slot, lp->msn));
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_SETEAZ, &cmd);
- lp->dialretry = 0;
- anymore = 1;
- lp->dialstate++;
- /* Fall through */
- case 3:
- /* Setup interface, dial current phone-number, switch to next number.
- * If list of phone-numbers is exhausted, increment
- * retry-counter.
- */
- if(dev->global_flags & ISDN_GLOBAL_STOPPED || (ISDN_NET_DIALMODE(*lp) == ISDN_NET_DM_OFF)) {
- char *s;
- if (dev->global_flags & ISDN_GLOBAL_STOPPED)
- s = "dial suppressed: isdn system stopped";
- else
- s = "dial suppressed: dialmode `off'";
- isdn_net_unreachable(&p->dev, 0, s);
- isdn_net_hangup(&p->dev);
- break;
- }
- cmd.arg = lp->l2_proto << 8;
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_SETL2, &cmd);
- cmd.arg = lp->l3_proto << 8;
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_SETL3, &cmd);
- save_flags(flags);
- cli();
- if (!lp->dial) {
- restore_flags(flags);
- printk(KERN_WARNING "%s: phone number deleted?\n",
- lp->name);
- isdn_net_hangup(&p->dev);
- break;
- }
- if (!strncmp(lp->dial->num, "LEASED", strlen("LEASED"))) {
- restore_flags(flags);
- lp->dialstate = 4;
- printk(KERN_INFO "%s: Open leased line ...\n", lp->name);
- } else {
- if(lp->dialtimeout > 0)
- if (time_after(jiffies, lp->dialstarted + lp->dialtimeout)) {
- restore_flags(flags);
- lp->dialwait_timer = jiffies + lp->dialwait;
- lp->dialstarted = 0;
- isdn_net_unreachable(&p->dev, 0, "dial: timed out");
- isdn_net_hangup(&p->dev);
- break;
- }
-
- cmd.parm.setup.si2 = 0;
-
- /* check for DOV */
- phone_number = lp->dial->num;
- if ((*phone_number == 'v') ||
- (*phone_number == 'V')) { /* DOV call */
- cmd.parm.setup.si1 = 1;
- } else { /* DATA call */
- cmd.parm.setup.si1 = 7;
- }
-
- strcpy(cmd.parm.setup.phone, phone_number);
- /*
- * Switch to next number or back to start if at end of list.
- */
- if (!(lp->dial = (isdn_net_phone *) lp->dial->next)) {
- lp->dial = lp->phone[1];
- lp->dialretry++;
-
- if (lp->dialretry > lp->dialmax) {
- restore_flags(flags);
- if (lp->dialtimeout == 0) {
- lp->dialwait_timer = jiffies + lp->dialwait;
- lp->dialstarted = 0;
- isdn_net_unreachable(&p->dev, 0, "dial: tried all numbers dialmax times");
- }
- isdn_net_hangup(&p->dev);
- break;
- }
- }
- restore_flags(flags);
- sprintf(cmd.parm.setup.eazmsn, "%s",
- isdn_slot_map_eaz2msn(lp->isdn_slot, lp->msn));
- if (lp->isdn_slot >= 0) {
- strcpy(isdn_slot_num(lp->isdn_slot), cmd.parm.setup.phone);
- isdn_slot_set_usage(lp->isdn_slot, isdn_slot_usage(lp->isdn_slot) | ISDN_USAGE_OUTGOING);
- }
- printk(KERN_INFO "%s: dialing %d %s... %s\n", lp->name,
- lp->dialretry, cmd.parm.setup.phone,
- (cmd.parm.setup.si1 == 1) ? "DOV" : "");
- lp->dtimer = 0;
-#ifdef ISDN_DEBUG_NET_DIAL
- printk(KERN_DEBUG "dial: d=%d c=%d\n", lp->isdn_device,
- lp->isdn_channel);
-#endif
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_DIAL, &cmd);
- }
- lp->huptimer = 0;
- lp->outgoing = 1;
- if (lp->chargeint) {
- lp->hupflags |= ISDN_HAVECHARGE;
- lp->hupflags &= ~ISDN_WAITCHARGE;
- } else {
- lp->hupflags |= ISDN_WAITCHARGE;
- lp->hupflags &= ~ISDN_HAVECHARGE;
- }
- anymore = 1;
- lp->dialstate =
- (lp->cbdelay &&
- (lp->flags & ISDN_NET_CBOUT)) ? 12 : 4;
- break;
- case 4:
- /* Wait for D-Channel-connect.
- * If timeout, switch back to state 3.
- * Dialmax-handling moved to state 3.
- */
- if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10)
+ case 0:
+ /* Nothing to do for this interface */
+ break;
+ case 1:
+ anymore = init_dialout(lp);
+ /* Fall through */
+ case 2:
+ lp->dialretry = 0;
+ anymore = 1;
+ lp->dialstate++;
+ /* Fall through */
+ case 3:
+ anymore = do_dialout(lp);
+ break;
+ case 4:
+ /* Wait for D-Channel-connect.
+ * If timeout, switch back to state 3.
+ * Dialmax-handling moved to state 3.
+ */
+ if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10)
lp->dialstate = 3;
- anymore = 1;
- break;
- case 5:
- /* Got D-Channel-Connect, send B-Channel-request */
- anymore = 1;
- lp->dtimer = 0;
- lp->dialstate++;
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_ACCEPTB, &cmd);
- break;
- case 6:
- /* Wait for B- or D-Channel-connect. If timeout,
- * switch back to state 3.
- */
+ anymore = 1;
+ break;
+ case 5:
+ /* Got D-Channel-Connect, send B-Channel-request */
+ anymore = 1;
+ lp->dtimer = 0;
+ lp->dialstate++;
+ isdn_slot_command(lp->isdn_slot, ISDN_CMD_ACCEPTB, &cmd);
+ break;
+ case 6:
+ /* Wait for B- or D-Channel-connect. If timeout,
+ * switch back to state 3.
+ */
#ifdef ISDN_DEBUG_NET_DIAL
- printk(KERN_DEBUG "dialtimer2: %d\n", lp->dtimer);
+ printk(KERN_DEBUG "dialtimer2: %d\n", lp->dtimer);
#endif
- if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10)
- lp->dialstate = 3;
- anymore = 1;
- break;
- case 7:
- /* Got incoming Call, setup L2 and L3 protocols,
- * then wait for D-Channel-connect
- */
+ if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10)
+ lp->dialstate = 3;
+ anymore = 1;
+ break;
+ case 7:
+ /* Got incoming Call, setup L2 and L3 protocols,
+ * then wait for D-Channel-connect
+ */
#ifdef ISDN_DEBUG_NET_DIAL
- printk(KERN_DEBUG "dialtimer4: %d\n", lp->dtimer);
+ printk(KERN_DEBUG "dialtimer4: %d\n", lp->dtimer);
#endif
- cmd.arg = lp->l2_proto << 8;
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_SETL2, &cmd);
- cmd.arg = lp->l3_proto << 8;
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_SETL3, &cmd);
- if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT15)
- isdn_net_hangup(&p->dev);
- else {
- anymore = 1;
- lp->dialstate++;
- }
- break;
- case 9:
- /* Got incoming D-Channel-Connect, send B-Channel-request */
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_ACCEPTB, &cmd);
+ cmd.arg = lp->l2_proto << 8;
+ isdn_slot_command(lp->isdn_slot, ISDN_CMD_SETL2, &cmd);
+ cmd.arg = lp->l3_proto << 8;
+ isdn_slot_command(lp->isdn_slot, ISDN_CMD_SETL3, &cmd);
+ if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT15)
+ isdn_net_hangup(&p->dev);
+ else {
anymore = 1;
- lp->dtimer = 0;
lp->dialstate++;
- break;
- case 8:
- case 10:
- /* Wait for B- or D-channel-connect */
+ }
+ break;
+ case 9:
+ /* Got incoming D-Channel-Connect, send B-Channel-request */
+ isdn_slot_command(lp->isdn_slot, ISDN_CMD_ACCEPTB, &cmd);
+ anymore = 1;
+ lp->dtimer = 0;
+ lp->dialstate++;
+ break;
+ case 8:
+ case 10:
+ /* Wait for B- or D-channel-connect */
#ifdef ISDN_DEBUG_NET_DIAL
- printk(KERN_DEBUG "dialtimer4: %d\n", lp->dtimer);
+ printk(KERN_DEBUG "dialtimer4: %d\n", lp->dtimer);
#endif
- if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10)
- isdn_net_hangup(&p->dev);
- else
- anymore = 1;
- break;
- case 11:
- /* Callback Delay */
- if (lp->dtimer++ > lp->cbdelay)
- lp->dialstate = 1;
- anymore = 1;
- break;
- case 12:
- /* Remote does callback. Hangup after cbdelay, then wait for incoming
- * call (in state 4).
- */
- if (lp->dtimer++ > lp->cbdelay)
- {
- printk(KERN_INFO "%s: hangup waiting for callback ...\n", lp->name);
- lp->dtimer = 0;
- lp->dialstate = 4;
- isdn_slot_command(lp->isdn_slot, ISDN_CMD_HANGUP, &cmd);
- isdn_slot_all_eaz(lp->isdn_slot);
- }
+ if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10)
+ isdn_net_hangup(&p->dev);
+ else
anymore = 1;
- break;
- default:
- printk(KERN_WARNING "isdn_net: Illegal dialstate %d for device %s\n",
- lp->dialstate, lp->name);
+ break;
+ case 11:
+ /* Callback Delay */
+ if (lp->dtimer++ > lp->cbdelay)
+ lp->dialstate = 1;
+ anymore = 1;
+ break;
+ case 12:
+ /* Remote does callback. Hangup after cbdelay, then wait for incoming
+ * call (in state 4).
+ */
+ if (lp->dtimer++ > lp->cbdelay) {
+ printk(KERN_INFO "%s: hangup waiting for callback ...\n", lp->name);
+ lp->dtimer = 0;
+ lp->dialstate = 4;
+ isdn_slot_command(lp->isdn_slot, ISDN_CMD_HANGUP, &cmd);
+ isdn_slot_all_eaz(lp->isdn_slot);
+ }
+ anymore = 1;
+ break;
+ default:
+ printk(KERN_WARNING "isdn_net: Illegal dialstate %d for device %s\n",
+ lp->dialstate, lp->name);
}
- p = (isdn_net_dev *) p->next;
}
isdn_timer_ctrl(ISDN_TIMER_NETDIAL, anymore);
}
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 48e3981ae04b..2e06c1627bd2 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -626,7 +626,6 @@ isdn_tty_dial(char *n, modem_info * info, atemu * m)
int usg = ISDN_USAGE_MODEM;
int si = 7;
int l2 = m->mdmreg[REG_L2PROT];
- isdn_ctrl cmd;
ulong flags;
int i;
int j;
@@ -656,36 +655,29 @@ isdn_tty_dial(char *n, modem_info * info, atemu * m)
restore_flags(flags);
isdn_tty_modem_result(RESULT_NO_DIALTONE, info);
} else {
+ struct dial_info dial = {
+ .l2_proto = l2,
+ .l3_proto = m->mdmreg[REG_L3PROT],
+ .si1 = si,
+ .si2 = m->mdmreg[REG_SI2],
+ .msn = m->msn,
+ .phone = n,
+ };
info->isdn_slot = i;
isdn_slot_set_m_idx(i, info->line);
info->last_dir = 1;
+ info->last_l2 = l2;
strcpy(info->last_num, n);
- isdn_slot_set_usage(i, isdn_slot_usage(i) | ISDN_USAGE_OUTGOING);
restore_flags(flags);
- isdn_slot_command(info->isdn_slot, ISDN_CMD_CLREAZ, &cmd);
- strcpy(cmd.parm.num, isdn_slot_map_eaz2msn(info->isdn_slot, m->msn));
- isdn_slot_command(info->isdn_slot, ISDN_CMD_SETEAZ, &cmd);
- info->last_l2 = l2;
- cmd.arg = l2 << 8;
- isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL2, &cmd);
- cmd.arg = m->mdmreg[REG_L3PROT] << 8;
#ifdef CONFIG_ISDN_TTY_FAX
if (l2 == ISDN_PROTO_L2_FAX) {
- cmd.parm.fax = info->fax;
+ dial.fax = info->fax;
info->fax->direction = ISDN_TTY_FAX_CONN_OUT;
}
#endif
- isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL3, &cmd);
- sprintf(cmd.parm.setup.phone, "%s", n);
- sprintf(cmd.parm.setup.eazmsn, "%s",
- isdn_slot_map_eaz2msn(info->isdn_slot, m->msn));
- cmd.parm.setup.si1 = si;
- cmd.parm.setup.si2 = m->mdmreg[REG_SI2];
info->dialing = 1;
info->emu.carrierwait = 0;
- strcpy(isdn_slot_num(i), n);
- isdn_info_update();
- isdn_slot_command(info->isdn_slot, ISDN_CMD_DIAL, &cmd);
+ isdn_slot_dial(info->isdn_slot, &dial);
isdn_timer_ctrl(ISDN_TIMER_CARRIER, 1);
}
}
@@ -852,9 +844,6 @@ isdn_tty_resume(char *id, modem_info * info, atemu * m)
info->last_dir = 1;
// strcpy(info->last_num, n);
restore_flags(flags);
- isdn_slot_command(info->isdn_slot, ISDN_CMD_CLREAZ, &cmd);
- strcpy(cmd.parm.num, isdn_slot_map_eaz2msn(info->isdn_slot, m->msn));
- isdn_slot_command(info->isdn_slot, ISDN_CMD_SETEAZ, &cmd);
info->last_l2 = l2;
cmd.arg = l2 << 8;
isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL2, &cmd);
@@ -930,9 +919,6 @@ isdn_tty_send_msg(modem_info * info, atemu * m, char *msg)
isdn_slot_set_usage(i, isdn_slot_usage(i) | ISDN_USAGE_OUTGOING);
info->last_dir = 1;
restore_flags(flags);
- isdn_slot_command(info->isdn_slot, ISDN_CMD_CLREAZ, &cmd);
- strcpy(cmd.parm.num, isdn_slot_map_eaz2msn(info->isdn_slot, m->msn));
- isdn_slot_command(info->isdn_slot, ISDN_CMD_SETEAZ, &cmd);
info->last_l2 = l2;
cmd.arg = l2 << 8;
isdn_slot_command(info->isdn_slot, ISDN_CMD_SETL2, &cmd);
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 393daa74c73d..8255506b4b31 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -391,7 +391,7 @@ typedef struct isdn_net_dev_s {
channels, which are currently
online */
spinlock_t queue_lock; /* lock to protect queue */
- void *next; /* Pointer to next isdn-interface */
+ struct isdn_net_dev_s *next; /* Pointer to next isdn-interface */
struct net_device dev; /* interface to upper levels */
#ifdef CONFIG_ISDN_PPP
ippp_bundle * pb; /* pointer to the common bundle structure
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h
index 672e8b15cbf6..cb025c8e4759 100644
--- a/include/linux/isdnif.h
+++ b/include/linux/isdnif.h
@@ -418,9 +418,7 @@ typedef struct {
char display[85];/* display message data */
isdn_cmd_stat isdn_io; /* ISDN IO-parameter/result */
aux_s aux; /* for modem commands/indications */
-#ifdef CONFIG_ISDN_TTY_FAX
T30_s *fax; /* Pointer to ttys fax struct */
-#endif
ulong userdata; /* User Data */
} parm;
} isdn_ctrl;
diff --git a/init/main.c b/init/main.c
index 93efbf4fb7f6..05ab832ff1f0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -529,7 +529,6 @@ static void do_pre_smp_initcalls(void)
extern int migration_init(void);
extern int spawn_ksoftirqd(void);
- migration_init();
spawn_ksoftirqd();
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-02 13:45:34 +0000