Skip to content

L
linux
Commit 6a7fc460 authored by Kai Germaschewski's avatar Kai Germaschewski
Browse files
Options

ISDN: State machines for the link layer 

Since we unfortunately cannot rely on the hardware drivers to get
their states always correct, have the common layer keep track of the
states and sanitize them before passing them on to applications
as network interfaces / ttyIs.
parent 83a64b26
Show whitespace changes
Inline Side-by-side
Showing with 771 additions and 290 deletions
drivers/isdn/i4l/isdn_audio.c
View file @ 6a7fc460
...@@ -564,7 +564,7 @@ isdn_audio_eval_dtmf(modem_info * info) ...@@ -564,7 +564,7 @@ isdn_audio_eval_dtmf(modem_info * info)
cli(); cli();
di = isdn_slot_driver(info->isdn_slot); di = isdn_slot_driver(info->isdn_slot);
ch = isdn_slot_channel(info->isdn_slot); ch = isdn_slot_channel(info->isdn_slot);
isdn_drv_queue_tail(di, ch, skb, 2); isdn_slot_queue_tail(info->isdn_slot, skb, 2);
restore_flags(flags); restore_flags(flags);
/* Schedule dequeuing */ /* Schedule dequeuing */
if ((dev->modempoll) && (info->rcvsched)) if ((dev->modempoll) && (info->rcvsched))
...@@ -683,7 +683,7 @@ isdn_audio_put_dle_code(modem_info * info, u_char code) ...@@ -683,7 +683,7 @@ isdn_audio_put_dle_code(modem_info * info, u_char code)
cli(); cli();
di = isdn_slot_driver(info->isdn_slot); di = isdn_slot_driver(info->isdn_slot);
ch = isdn_slot_channel(info->isdn_slot); ch = isdn_slot_channel(info->isdn_slot);
isdn_drv_queue_tail(di, ch, skb, 2); isdn_slot_queue_tail(info->isdn_slot, skb, 2);
restore_flags(flags); restore_flags(flags);
/* Schedule dequeuing */ /* Schedule dequeuing */
if ((dev->modempoll) && (info->rcvsched)) if ((dev->modempoll) && (info->rcvsched))
......
drivers/isdn/i4l/isdn_common.c
View file @ 6a7fc460
...@@ -35,6 +35,87 @@ MODULE_LICENSE("GPL"); ...@@ -35,6 +35,87 @@ MODULE_LICENSE("GPL");
isdn_dev *dev; isdn_dev *dev;
static int isdn_command(isdn_ctrl *cmd);
/* ====================================================================== */
static struct isdn_slot slots[ISDN_MAX_CHANNELS];
static struct fsm slot_fsm;
static void slot_debug(struct fsm_inst *fi, char *fmt, ...);
enum {
ST_SLOT_NULL,
ST_SLOT_BOUND,
ST_SLOT_IN,
ST_SLOT_WAIT_DCONN,
ST_SLOT_DCONN,
ST_SLOT_WAIT_BCONN,
ST_SLOT_ACTIVE,
ST_SLOT_WAIT_BHUP,
ST_SLOT_WAIT_DHUP,
};
static char *slot_st_str[] = {
"ST_SLOT_NULL",
"ST_SLOT_BOUND",
"ST_SLOT_IN",
"ST_SLOT_WAIT_DCONN",
"ST_SLOT_DCONN",
"ST_SLOT_WAIT_BCONN",
"ST_SLOT_ACTIVE",
"ST_SLOT_WAIT_BHUP",
"ST_SLOT_WAIT_DHUP",
};
enum {
EV_SLOT_BIND,
EV_SLOT_UNBIND,
EV_SLOT_CMD_CLREAZ,
EV_SLOT_CMD_SETEAZ,
EV_SLOT_CMD_SETL2,
EV_SLOT_CMD_SETL3,
EV_SLOT_CMD_DIAL,
EV_SLOT_CMD_ACCEPTD,
EV_SLOT_CMD_ACCEPTB,
EV_SLOT_CMD_HANGUP,
EV_SLOT_STAT_ICALL,
EV_SLOT_STAT_DCONN,
EV_SLOT_STAT_BCONN,
EV_SLOT_STAT_BHUP,
EV_SLOT_STAT_DHUP,
EV_SLOT_STAT_BSENT,
EV_SLOT_STAT_CINF,
EV_SLOT_STAT_CAUSE,
EV_SLOT_STAT_DISPLAY,
EV_SLOT_DATA_REQ,
EV_SLOT_DATA_IND,
};
static char *slot_ev_str[] = {
"EV_SLOT_BIND",
"EV_SLOT_UNBIND",
"EV_SLOT_CMD_CLREAZ",
"EV_SLOT_CMD_SETEAZ",
"EV_SLOT_CMD_SETL2",
"EV_SLOT_CMD_SETL3",
"EV_SLOT_CMD_DIAL",
"EV_SLOT_CMD_ACCEPTD",
"EV_SLOT_CMD_ACCEPTB",
"EV_SLOT_CMD_HANGUP",
"EV_SLOT_STAT_ICALL",
"EV_SLOT_STAT_DCONN",
"EV_SLOT_STAT_BCONN",
"EV_SLOT_STAT_BHUP",
"EV_SLOT_STAT_DHUP",
"EV_SLOT_STAT_BSENT",
"EV_SLOT_STAT_CINF",
"EV_SLOT_STAT_CAUSE",
"EV_SLOT_STAT_DISPLAY",
"EV_SLOT_DATA_REQ",
"EV_SLOT_DATA_IND",
};
struct isdn_slot { struct isdn_slot {
int di; /* driver index */ int di; /* driver index */
int ch; /* channel index (per driver) */ int ch; /* channel index (per driver) */
...@@ -44,16 +125,357 @@ struct isdn_slot { ...@@ -44,16 +125,357 @@ struct isdn_slot {
unsigned long obytes; /* Statistics outgoing bytes */ unsigned long obytes; /* Statistics outgoing bytes */
struct isdn_v110 iv110; /* For V.110 */ struct isdn_v110 iv110; /* For V.110 */
int m_idx; /* Index for mdm.... */ int m_idx; /* Index for mdm.... */
isdn_net_dev *priv; /* pointer to isdn_net_dev */ void *priv; /* pointer to isdn_net_dev */
int (*stat_cb)(int sl, isdn_ctrl *ctrl);
int (*recv_cb)(int sl, struct sk_buff *skb);
struct fsm_inst fi;
};
static inline int
do_stat_cb(struct isdn_slot *slot, isdn_ctrl *ctrl)
{
int sl = slot - slots;
if (slot->stat_cb)
return slot->stat_cb(sl, ctrl);
return -ENXIO;
}
static int
slot_bind(struct fsm_inst *fi, int pr, void *arg)
{
fsm_change_state(fi, ST_SLOT_BOUND);
return 0;
}
static int
slot_command(struct fsm_inst *fi, int pr, void *arg)
{
isdn_ctrl *ctrl = arg;
return isdn_command(ctrl);
}
static int
slot_dial(struct fsm_inst *fi, int pr, void *arg)
{
isdn_ctrl *ctrl = arg;
int retval;
retval = isdn_command(ctrl);
if (retval >= 0)
fsm_change_state(fi, ST_SLOT_WAIT_DCONN);
return retval;
}
/* FIXME join? */
static int
slot_acceptd(struct fsm_inst *fi, int pr, void *arg)
{
isdn_ctrl *ctrl = arg;
int retval;
retval = isdn_command(ctrl);
if (retval >= 0)
fsm_change_state(fi, ST_SLOT_WAIT_DCONN);
return retval;
}
static int
slot_acceptb(struct fsm_inst *fi, int pr, void *arg)
{
isdn_ctrl *ctrl = arg;
int retval;
retval = isdn_command(ctrl);
if (retval >= 0)
fsm_change_state(fi, ST_SLOT_WAIT_BCONN);
return retval;
}
static int
slot_actv_hangup(struct fsm_inst *fi, int pr, void *arg)
{
isdn_ctrl *ctrl = arg;
int retval;
retval = isdn_command(ctrl);
if (retval >= 0)
fsm_change_state(fi, ST_SLOT_WAIT_BHUP);
return retval;
}
static int
slot_dconn(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
isdn_ctrl *ctrl = arg;
fsm_change_state(fi, ST_SLOT_DCONN);
do_stat_cb(slot, ctrl);
return 0;
}
static int
slot_bconn(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
int sl = slot - slots;
isdn_ctrl *ctrl = arg;
fsm_change_state(fi, ST_SLOT_ACTIVE);
//FIXME drivers[di]->online |= (1 << (c->arg));
isdn_info_update();
do_stat_cb(slot, ctrl);
return 0;
}
static int
slot_bhup(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
int sl = slot - slots;
isdn_ctrl *ctrl = arg;
fsm_change_state(fi, ST_SLOT_WAIT_DHUP);
do_stat_cb(slot, ctrl);
return 0;
}
static int
slot_dhup(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
int sl = slot - slots;
isdn_ctrl *ctrl = arg;
fsm_change_state(fi, ST_SLOT_BOUND);
do_stat_cb(slot, ctrl);
return 0;
}
static int
slot_data_req(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
struct sk_buff *skb = arg;
int retval;
/* Update statistics */
// slots[sl].ibytes += skb->len;
retval = isdn_drv_writebuf_skb(slot->di, slot->ch, 1, skb);
return retval;
}
static int
slot_data_ind(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
int sl = slot - slots;
struct sk_buff *skb = arg;
/* Update statistics */
slot->ibytes += skb->len;
slot->recv_cb(sl, skb);
return 0;
#if 0
/* V.110 handling
* makes sense for async streams only, so it is
* called after possible net-device delivery.
*/
if (slots[i].iv110.v110) {
atomic_inc(&slots[i].iv110.v110use);
skb = isdn_v110_decode(slots[i].iv110.v110, skb);
atomic_dec(&slots[i].iv110.v110use);
if (!skb)
return;
}
/* No network-device found, deliver to tty or raw-channel */
if (isdn_tty_rcv_skb(i, di, channel, skb))
return;
dev_kfree_skb(skb);
#endif
}
static int
slot_bsent(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
int sl = slot - slots;
isdn_ctrl *ctrl = arg;
do_stat_cb(slot, ctrl);
return 0;
}
static int
slot_icall(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
isdn_ctrl *ctrl = arg;
isdn_ctrl cmd;
isdn_net_dev *p;
int sl = slot - slots;
int retval;
fsm_change_state(fi, ST_SLOT_IN);
slot_debug(fi, "ICALL: %s\n", ctrl->parm.num);
if (dev->global_flags & ISDN_GLOBAL_STOPPED)
return 0;
/* Try to find a network-interface which will accept incoming call */
retval = isdn_net_find_icall(ctrl->driver, ctrl->arg, sl,
&ctrl->parm.setup);
/* FIXME */
if (retval == 1) {
list_for_each_entry(p, &isdn_net_devs, global_list) {
if (p->isdn_slot == sl) {
strcpy(cmd.parm.setup.eazmsn, p->mlp->msn);
isdn_slot_set_usage(sl, (isdn_slot_usage(sl) & ISDN_USAGE_EXCLUSIVE) | ISDN_USAGE_NET);
strcpy(isdn_slot_num(sl), ctrl->parm.setup.phone);
isdn_slot_command(sl, ISDN_CMD_ACCEPTD, &cmd);
break;
}
}
}
return 0;
}
static int
slot_in_dhup(struct fsm_inst *fi, int pr, void *arg)
{
fsm_change_state(fi, ST_SLOT_NULL);
return 0;
}
static int
slot_unbind(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_slot *slot = fi->userdata;
int sl = slot - slots;
strcpy(slot->num, "???");
slot->ibytes = 0;
slot->obytes = 0;
// 20.10.99 JIM, try to reinitialize v110 !
slot->iv110.v110emu = 0;
atomic_set(&slot->iv110.v110use, 0);
isdn_v110_close(slot->iv110.v110);
slot->iv110.v110 = NULL;
// 20.10.99 JIM, try to reinitialize v110 !
isdn_slot_set_usage(sl, ISDN_USAGE_NONE);
isdn_slot_queue_purge(sl);
return 0;
}
static struct fsm_node slot_fn_tbl[] = {
{ ST_SLOT_NULL, EV_SLOT_BIND, slot_bind },
{ ST_SLOT_NULL, EV_SLOT_STAT_ICALL, slot_icall },
{ ST_SLOT_BOUND, EV_SLOT_CMD_CLREAZ, slot_command },
{ ST_SLOT_BOUND, EV_SLOT_CMD_SETEAZ, slot_command },
{ ST_SLOT_BOUND, EV_SLOT_CMD_SETL2, slot_command },
{ ST_SLOT_BOUND, EV_SLOT_CMD_SETL3, slot_command },
{ ST_SLOT_BOUND, EV_SLOT_CMD_DIAL, slot_dial },
{ ST_SLOT_BOUND, EV_SLOT_UNBIND, slot_unbind },
{ ST_SLOT_IN, EV_SLOT_CMD_SETL2, slot_command },
{ ST_SLOT_IN, EV_SLOT_CMD_SETL3, slot_command },
{ ST_SLOT_IN, EV_SLOT_CMD_ACCEPTD, slot_acceptd },
{ ST_SLOT_IN, EV_SLOT_STAT_DHUP, slot_in_dhup },
{ ST_SLOT_WAIT_DCONN, EV_SLOT_STAT_DCONN, slot_dconn },
{ ST_SLOT_WAIT_DCONN, EV_SLOT_STAT_DHUP, slot_dhup },
{ ST_SLOT_DCONN, EV_SLOT_CMD_ACCEPTB, slot_acceptb },
{ ST_SLOT_DCONN, EV_SLOT_STAT_BCONN, slot_bconn },
{ ST_SLOT_WAIT_BCONN, EV_SLOT_STAT_BCONN, slot_bconn },
{ ST_SLOT_ACTIVE, EV_SLOT_DATA_REQ, slot_data_req },
{ ST_SLOT_ACTIVE, EV_SLOT_DATA_IND, slot_data_ind },
{ ST_SLOT_ACTIVE, EV_SLOT_CMD_HANGUP, slot_actv_hangup },
{ ST_SLOT_ACTIVE, EV_SLOT_STAT_BSENT, slot_bsent },
{ ST_SLOT_ACTIVE, EV_SLOT_STAT_BHUP, slot_bhup },
{ ST_SLOT_WAIT_BHUP, EV_SLOT_STAT_BHUP, slot_bhup },
{ ST_SLOT_WAIT_DHUP, EV_SLOT_STAT_DHUP, slot_dhup },
};
static struct fsm slot_fsm = {
.st_cnt = ARRAY_SIZE(slot_st_str),
.st_str = slot_st_str,
.ev_cnt = ARRAY_SIZE(slot_ev_str),
.ev_str = slot_ev_str,
.fn_cnt = ARRAY_SIZE(slot_fn_tbl),
.fn_tbl = slot_fn_tbl,
}; };
static struct isdn_slot slot[ISDN_MAX_CHANNELS]; static void slot_debug(struct fsm_inst *fi, char *fmt, ...)
{
va_list args;
struct isdn_slot *slot = fi->userdata;
char buf[128];
char *p = buf;
va_start(args, fmt);
p += sprintf(p, "slot %d(%d:%d): ", slot-slots, slot->di, slot->ch);
p += vsprintf(p, fmt, args);
va_end(args);
printk(KERN_DEBUG "%s\n", buf);
}
/* ====================================================================== */ /* ====================================================================== */
#define DRV_FLAG_RUNNING 1 static spinlock_t stat_lock = SPIN_LOCK_UNLOCKED;
#define DRV_FLAG_REJBUS 2
#define DRV_FLAG_LOADED 4 static struct fsm drv_fsm;
enum {
ST_DRV_NULL,
ST_DRV_LOADED,
ST_DRV_RUNNING,
};
static char *drv_st_str[] = {
"ST_DRV_NULL",
"ST_DRV_LOADED",
"ST_DRV_RUNNING",
};
enum {
EV_DRV_STAT_RUN,
EV_DRV_STAT_STOP,
EV_DRV_STAT_STAVAIL,
EV_DRV_STAT_ADDCH,
EV_DRV_STAT_CHANNEL,
};
static char *drv_ev_str[] = {
"EV_DRV_STAT_RUN",
"EV_DRV_STAT_STOP",
"EV_DRV_STAT_STAVAIL",
"EV_DRV_STAT_ADDCH",
"EV_DRV_STAT_CHANNEL",
};
#define DRV_FLAG_REJBUS 1
/* Description of hardware-level-driver */ /* Description of hardware-level-driver */
struct isdn_driver { struct isdn_driver {
...@@ -78,29 +500,36 @@ struct isdn_driver { ...@@ -78,29 +500,36 @@ struct isdn_driver {
static spinlock_t drivers_lock = SPIN_LOCK_UNLOCKED; static spinlock_t drivers_lock = SPIN_LOCK_UNLOCKED;
static struct isdn_driver *drivers[ISDN_MAX_DRIVERS]; static struct isdn_driver *drivers[ISDN_MAX_DRIVERS];
int
isdn_drv_queue_empty(int di, int ch)
{
return skb_queue_empty(&drivers[di]->rpqueue[ch]);
}
void
isdn_drv_queue_tail(int di, int ch, struct sk_buff *skb, int len)
{
__skb_queue_tail(&drivers[di]->rpqueue[ch], skb);
drivers[di]->rcvcount[ch] += len;
}
int int
isdn_drv_maxbufsize(int di) isdn_drv_maxbufsize(int di)
{ {
BUG_ON(di < 0);
return drivers[di]->maxbufsize; return drivers[di]->maxbufsize;
} }
int int
isdn_drv_writebuf_skb(int di, int ch, int x, struct sk_buff *skb) isdn_drv_writebuf_skb(int di, int ch, int x, struct sk_buff *skb)
{ {
struct sk_buff *skb2;
struct isdn_driver *drv = drivers[di];
int hl = drv->interface->hl_hdrlen;
int retval;
if( skb_headroom(skb) >= hl )
return drivers[di]->interface->writebuf_skb(di, ch, 1, skb); return drivers[di]->interface->writebuf_skb(di, ch, 1, skb);
skb2 = skb_realloc_headroom(skb, hl);
if (!skb2)
return -ENOMEM;
retval = drivers[di]->interface->writebuf_skb(di, ch, 1, skb2);
if (retval < 0)
kfree_skb(skb2);
else
kfree_skb(skb);
return retval;
} }
int int
...@@ -136,7 +565,8 @@ isdn_drv_lookup(char *drvid) ...@@ -136,7 +565,8 @@ isdn_drv_lookup(char *drvid)
return drvidx; return drvidx;
} }
char *isdn_drv_drvid(int di) char *
isdn_drv_drvid(int di)
{ {
if (!drivers[di]) { if (!drivers[di]) {
isdn_BUG(); isdn_BUG();
...@@ -145,11 +575,6 @@ char *isdn_drv_drvid(int di) ...@@ -145,11 +575,6 @@ char *isdn_drv_drvid(int di)
return drivers[di]->interface->id; return drivers[di]->interface->id;
} }
static int isdn_add_channels(struct isdn_driver *, int, int, int);
static void isdn_receive_skb_callback(int di, int ch, struct sk_buff *skb);
static int isdn_status_callback(isdn_ctrl * c);
static void set_global_features(void);
/* /*
* Helper keeping track of the features the drivers support * Helper keeping track of the features the drivers support
*/ */
...@@ -170,6 +595,90 @@ set_global_features(void) ...@@ -170,6 +595,90 @@ set_global_features(void)
spin_unlock_irqrestore(&drivers_lock, flags); spin_unlock_irqrestore(&drivers_lock, flags);
} }
/*
* driver state machine
*/
static int isdn_add_channels(struct isdn_driver *, int, int, int);
static void isdn_receive_skb_callback(int di, int ch, struct sk_buff *skb);
static int isdn_status_callback(isdn_ctrl * c);
static void set_global_features(void);
static int
drv_stat_run(struct fsm_inst *fi, int pr, void *arg)
{
isdn_ctrl *c = arg;
int i, di = c->driver;
fsm_change_state(fi, ST_DRV_RUNNING);
for (i = 0; i < ISDN_MAX_CHANNELS; i++)
if (slots[i].di == di)
isdn_slot_all_eaz(i);
set_global_features();
}
static int
drv_stat_stop(struct fsm_inst *fi, int pr, void *arg)
{
fsm_change_state(fi, ST_DRV_LOADED);
set_global_features();
}
static int
drv_stat_addch(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_driver *drv = fi->userdata;
isdn_ctrl *c = arg;
isdn_add_channels(drv, c->driver, c->arg, 1);
isdn_info_update();
}
static int
drv_stat_stavail(struct fsm_inst *fi, int pr, void *arg)
{
struct isdn_driver *drv = fi->userdata;
unsigned long flags;
isdn_ctrl *c = arg;
spin_lock_irqsave(&stat_lock, flags);
drv->stavail += c->arg;
spin_unlock_irqrestore(&stat_lock, flags);
wake_up_interruptible(&drv->st_waitq);
}
static struct fsm_node drv_fn_tbl[] = {
{ ST_DRV_LOADED, EV_DRV_STAT_RUN, drv_stat_run },
{ ST_DRV_LOADED, EV_DRV_STAT_STAVAIL, drv_stat_stavail },
{ ST_DRV_LOADED, EV_DRV_STAT_ADDCH, drv_stat_addch },
{ ST_DRV_RUNNING, EV_DRV_STAT_STOP, drv_stat_stop },
{ ST_DRV_RUNNING, EV_DRV_STAT_STAVAIL, drv_stat_stavail },
};
static struct fsm drv_fsm = {
.st_cnt = ARRAY_SIZE(drv_st_str),
.st_str = drv_st_str,
.ev_cnt = ARRAY_SIZE(drv_ev_str),
.ev_str = drv_ev_str,
.fn_cnt = ARRAY_SIZE(drv_fn_tbl),
.fn_tbl = drv_fn_tbl,
};
static void drv_debug(struct fsm_inst *fi, char *fmt, ...)
{
va_list args;
struct isdn_driver *drv = fi->userdata;
char buf[128];
char *p = buf;
va_start(args, fmt);
p += sprintf(p, "%s: ", drv->interface->id);
p += vsprintf(p, fmt, args);
va_end(args);
printk(KERN_DEBUG "%s\n", buf);
}
/* /*
* Register a new ISDN interface * Register a new ISDN interface
*/ */
...@@ -187,12 +696,13 @@ register_isdn(isdn_if *iif) ...@@ -187,12 +696,13 @@ register_isdn(isdn_if *iif)
} }
memset(drv, 0, sizeof(*drv)); memset(drv, 0, sizeof(*drv));
drv->fi.fsm = &drv_fsm;
drv->fi.state = ST_DRV_NULL;
drv->fi.debug = 0;
drv->fi.userdata = drv;
drv->fi.printdebug = drv_debug;
drv->maxbufsize = iif->maxbufsize; drv->maxbufsize = iif->maxbufsize;
drv->stavail = 0;
drv->flags = DRV_FLAG_LOADED;
drv->online = 0;
drv->interface = iif; drv->interface = iif;
drv->channels = 0;
spin_lock_irqsave(&drivers_lock, flags); spin_lock_irqsave(&drivers_lock, flags);
for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++) for (drvidx = 0; drvidx < ISDN_MAX_DRIVERS; drvidx++)
...@@ -214,6 +724,8 @@ register_isdn(isdn_if *iif) ...@@ -214,6 +724,8 @@ register_isdn(isdn_if *iif)
drivers[drvidx] = drv; drivers[drvidx] = drv;
spin_unlock_irqrestore(&drivers_lock, flags); spin_unlock_irqrestore(&drivers_lock, flags);
fsm_change_state(&drv->fi, ST_DRV_LOADED);
iif->channels = drvidx; iif->channels = drvidx;
iif->rcvcallb_skb = isdn_receive_skb_callback; iif->rcvcallb_skb = isdn_receive_skb_callback;
iif->statcallb = isdn_status_callback; iif->statcallb = isdn_status_callback;
...@@ -238,12 +750,9 @@ static isdn_divert_if *divert_if; /* = NULL */ ...@@ -238,12 +750,9 @@ static isdn_divert_if *divert_if; /* = NULL */
#define divert_if ((isdn_divert_if *) NULL) #define divert_if ((isdn_divert_if *) NULL)
#endif #endif
spinlock_t stat_lock = SPIN_LOCK_UNLOCKED;
static void isdn_register_devfs(int); static void isdn_register_devfs(int);
static void isdn_unregister_devfs(int); static void isdn_unregister_devfs(int);
static int isdn_wildmat(char *s, char *p); static int isdn_wildmat(char *s, char *p);
static int isdn_command(isdn_ctrl *cmd);
void void
isdn_lock_drivers(void) isdn_lock_drivers(void)
...@@ -416,7 +925,7 @@ isdn_dc2minor(int di, int ch) ...@@ -416,7 +925,7 @@ isdn_dc2minor(int di, int ch)
{ {
int i; int i;
for (i = 0; i < ISDN_MAX_CHANNELS; i++) for (i = 0; i < ISDN_MAX_CHANNELS; i++)
if (slot[i].ch == ch && slot[i].di == di) if (slots[i].ch == ch && slots[i].di == di)
return i; return i;
return -1; return -1;
} }
...@@ -490,31 +999,11 @@ isdn_receive_skb_callback(int di, int channel, struct sk_buff *skb) ...@@ -490,31 +999,11 @@ isdn_receive_skb_callback(int di, int channel, struct sk_buff *skb)
int i; int i;
if ((i = isdn_dc2minor(di, channel)) == -1) { if ((i = isdn_dc2minor(di, channel)) == -1) {
isdn_BUG();
dev_kfree_skb(skb); dev_kfree_skb(skb);
return; return;
} }
/* Update statistics */ if (fsm_event(&slots[i].fi, EV_SLOT_DATA_IND, skb))
slot[i].ibytes += skb->len;
/* First, try to deliver data to network-device */
if (isdn_net_rcv_skb(i, skb))
return;
/* V.110 handling
* makes sense for async streams only, so it is
* called after possible net-device delivery.
*/
if (slot[i].iv110.v110) {
atomic_inc(&slot[i].iv110.v110use);
skb = isdn_v110_decode(slot[i].iv110.v110, skb);
atomic_dec(&slot[i].iv110.v110use);
if (!skb)
return;
}
/* No network-device found, deliver to tty or raw-channel */
if (isdn_tty_rcv_skb(i, di, channel, skb))
return;
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
...@@ -549,11 +1038,11 @@ isdn_command(isdn_ctrl *cmd) ...@@ -549,11 +1038,11 @@ isdn_command(isdn_ctrl *cmd)
* Layer-2 to transparent * Layer-2 to transparent
*/ */
if (!(features & l2_feature)) { if (!(features & l2_feature)) {
slot[idx].iv110.v110emu = l2prot; slots[idx].iv110.v110emu = l2prot;
cmd->arg = (cmd->arg & 255) | cmd->arg = (cmd->arg & 255) |
(ISDN_PROTO_L2_TRANS << 8); (ISDN_PROTO_L2_TRANS << 8);
} else } else
slot[idx].iv110.v110emu = 0; slots[idx].iv110.v110emu = 0;
} }
} }
#ifdef ISDN_DEBUG_COMMAND #ifdef ISDN_DEBUG_COMMAND
...@@ -614,49 +1103,48 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -614,49 +1103,48 @@ isdn_status_callback(isdn_ctrl * c)
int di; int di;
unsigned long flags; unsigned long flags;
int i; int i;
int r;
int retval = 0;
isdn_ctrl cmd;
struct list_head *l;
di = c->driver; di = c->driver;
i = isdn_dc2minor(di, c->arg); i = isdn_dc2minor(di, c->arg);
switch (c->command) { switch (c->command) {
case ISDN_STAT_BSENT:
if (i < 0)
return -1;
if (isdn_net_stat_callback(i, c))
return 0;
if (isdn_v110_stat_callback(&slot[i].iv110, c))
return 0;
if (isdn_tty_stat_callback(i, c))
return 0;
break;
case ISDN_STAT_STAVAIL: case ISDN_STAT_STAVAIL:
spin_lock_irqsave(&stat_lock, flags); return fsm_event(&drivers[di]->fi, EV_DRV_STAT_STAVAIL, c);
drivers[di]->stavail += c->arg;
spin_unlock_irqrestore(&stat_lock, flags);
wake_up_interruptible(&drivers[di]->st_waitq);
break;
case ISDN_STAT_RUN: case ISDN_STAT_RUN:
drivers[di]->flags |= DRV_FLAG_RUNNING; return fsm_event(&drivers[di]->fi, EV_DRV_STAT_RUN, c);
for (i = 0; i < ISDN_MAX_CHANNELS; i++)
if (slot[i].di == di)
isdn_slot_all_eaz(i);
set_global_features();
break;
case ISDN_STAT_STOP: case ISDN_STAT_STOP:
drivers[di]->flags &= ~DRV_FLAG_RUNNING; return fsm_event(&drivers[di]->fi, EV_DRV_STAT_STOP, c);
break; case ISDN_STAT_ADDCH:
return fsm_event(&drivers[di]->fi, EV_DRV_STAT_ADDCH, c);
case ISDN_STAT_ICALL: case ISDN_STAT_ICALL:
if (i < 0) return fsm_event(&slots[i].fi, EV_SLOT_STAT_ICALL, c);
return -1; case ISDN_STAT_DCONN:
dbg_statcallb("ICALL: %d (%d,%ld) %s\n", i, di, c->arg, c->parm.num); return fsm_event(&slots[i].fi, EV_SLOT_STAT_DCONN, c);
if (dev->global_flags & ISDN_GLOBAL_STOPPED) case ISDN_STAT_BCONN:
return 0; return fsm_event(&slots[i].fi, EV_SLOT_STAT_BCONN, c);
case ISDN_STAT_BHUP:
/* Try to find a network-interface which will accept incoming call */ return fsm_event(&slots[i].fi, EV_SLOT_STAT_BHUP, c);
r = isdn_net_find_icall(di, c->arg, i, &c->parm.setup); case ISDN_STAT_DHUP:
return fsm_event(&slots[i].fi, EV_SLOT_STAT_DHUP, c);
case ISDN_STAT_BSENT:
return fsm_event(&slots[i].fi, EV_SLOT_STAT_BSENT, c);
case ISDN_STAT_CINF:
return fsm_event(&slots[i].fi, EV_SLOT_STAT_CINF, c);
case ISDN_STAT_CAUSE:
return fsm_event(&slots[i].fi, EV_SLOT_STAT_CAUSE, c);
case ISDN_STAT_DISPLAY:
return fsm_event(&slots[i].fi, EV_SLOT_STAT_DISPLAY, c);
#if 0
case ISDN_STAT_ICALL:
isdn_v110_stat_callback(&slots[i].iv110, c);
/* Find any ttyI, waiting for D-channel setup */
if (isdn_tty_stat_callback(i, c)) {
cmd.driver = di;
cmd.arg = c->arg;
cmd.command = ISDN_CMD_ACCEPTB;
isdn_command(&cmd);
break;
}
break;
switch (r) { switch (r) {
case 0: case 0:
/* No network-device replies. /* No network-device replies.
...@@ -679,19 +1167,6 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -679,19 +1167,6 @@ isdn_status_callback(isdn_ctrl * c)
} }
break; break;
case 1: /* incoming call accepted by net interface */ case 1: /* incoming call accepted by net interface */
list_for_each(l, &isdn_net_devs) {
isdn_net_dev *p = list_entry(l, isdn_net_dev, global_list);
if (p->isdn_slot == i) {
strcpy(cmd.parm.setup.eazmsn, p->mlp->msn);
isdn_slot_set_usage(i, (isdn_slot_usage(i) & ISDN_USAGE_EXCLUSIVE) | ISDN_USAGE_NET);
strcpy(isdn_slot_num(i), c->parm.setup.phone);
isdn_slot_command(i, ISDN_CMD_ACCEPTD, &cmd);
retval = 1;
break;
}
}
break;
case 2: /* For calling back, first reject incoming call ... */ case 2: /* For calling back, first reject incoming call ... */
case 3: /* Interface found, but down, reject call actively */ case 3: /* Interface found, but down, reject call actively */
...@@ -737,23 +1212,6 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -737,23 +1212,6 @@ isdn_status_callback(isdn_ctrl * c)
if (divert_if) if (divert_if)
divert_if->stat_callback(c); divert_if->stat_callback(c);
break; break;
case ISDN_STAT_DCONN:
if (i < 0)
return -1;
dbg_statcallb("DCONN: %d\n", i);
/* Find any net-device, waiting for D-channel setup */
if (isdn_net_stat_callback(i, c))
break;
isdn_v110_stat_callback(&slot[i].iv110, c);
/* Find any ttyI, waiting for D-channel setup */
if (isdn_tty_stat_callback(i, c)) {
cmd.driver = di;
cmd.arg = c->arg;
cmd.command = ISDN_CMD_ACCEPTB;
isdn_command(&cmd);
break;
}
break;
case ISDN_STAT_DHUP: case ISDN_STAT_DHUP:
if (i < 0) if (i < 0)
return -1; return -1;
...@@ -763,7 +1221,7 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -763,7 +1221,7 @@ isdn_status_callback(isdn_ctrl * c)
/* Signal hangup to network-devices */ /* Signal hangup to network-devices */
if (isdn_net_stat_callback(i, c)) if (isdn_net_stat_callback(i, c))
break; break;
isdn_v110_stat_callback(&slot[i].iv110, c); isdn_v110_stat_callback(&slots[i].iv110, c);
if (isdn_tty_stat_callback(i, c)) if (isdn_tty_stat_callback(i, c))
break; break;
if (divert_if) if (divert_if)
...@@ -778,7 +1236,7 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -778,7 +1236,7 @@ isdn_status_callback(isdn_ctrl * c)
isdn_info_update(); isdn_info_update();
if (isdn_net_stat_callback(i, c)) if (isdn_net_stat_callback(i, c))
break; break;
isdn_v110_stat_callback(&slot[i].iv110, c); isdn_v110_stat_callback(&slots[i].iv110, c);
if (isdn_tty_stat_callback(i, c)) if (isdn_tty_stat_callback(i, c))
break; break;
break; break;
...@@ -791,10 +1249,12 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -791,10 +1249,12 @@ isdn_status_callback(isdn_ctrl * c)
/* Signal hangup to network-devices */ /* Signal hangup to network-devices */
if (isdn_net_stat_callback(i, c)) if (isdn_net_stat_callback(i, c))
break; break;
isdn_v110_stat_callback(&slot[i].iv110, c); isdn_v110_stat_callback(&slots[i].iv110, c);
if (isdn_tty_stat_callback(i, c)) if (isdn_tty_stat_callback(i, c))
break; break;
break; break;
#endif
#if 0 // FIXME
case ISDN_STAT_NODCH: case ISDN_STAT_NODCH:
if (i < 0) if (i < 0)
return -1; return -1;
...@@ -804,17 +1264,12 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -804,17 +1264,12 @@ isdn_status_callback(isdn_ctrl * c)
if (isdn_tty_stat_callback(i, c)) if (isdn_tty_stat_callback(i, c))
break; break;
break; break;
case ISDN_STAT_ADDCH:
if (isdn_add_channels(drivers[di], di, c->arg, 1))
return -1;
isdn_info_update();
break;
case ISDN_STAT_DISCH: case ISDN_STAT_DISCH:
save_flags(flags); save_flags(flags);
cli(); cli();
for (i = 0; i < ISDN_MAX_CHANNELS; i++) for (i = 0; i < ISDN_MAX_CHANNELS; i++)
if ((slot[i].di == di) && if ((slots[i].di == di) &&
(slot[i].ch == c->arg)) { (slots[i].ch == c->arg)) {
if (c->parm.num[0]) if (c->parm.num[0])
isdn_slot_set_usage(i, isdn_slot_usage(i) & ~ISDN_USAGE_DISABLED); isdn_slot_set_usage(i, isdn_slot_usage(i) & ~ISDN_USAGE_DISABLED);
else if (USG_NONE(isdn_slot_usage(i))) else if (USG_NONE(isdn_slot_usage(i)))
...@@ -825,6 +1280,7 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -825,6 +1280,7 @@ isdn_status_callback(isdn_ctrl * c)
} }
restore_flags(flags); restore_flags(flags);
break; break;
#endif
case ISDN_STAT_UNLOAD: case ISDN_STAT_UNLOAD:
while (drivers[di]->locks > 0) { while (drivers[di]->locks > 0) {
isdn_ctrl cmd; isdn_ctrl cmd;
...@@ -836,12 +1292,12 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -836,12 +1292,12 @@ isdn_status_callback(isdn_ctrl * c)
} }
save_flags(flags); save_flags(flags);
cli(); cli();
isdn_tty_stat_callback(i, c); // isdn_tty_stat_callback(i, c); FIXME?
for (i = 0; i < ISDN_MAX_CHANNELS; i++) for (i = 0; i < ISDN_MAX_CHANNELS; i++)
if (slot[i].di == di) { if (slots[i].di == di) {
slot[i].di = -1; slots[i].di = -1;
slot[i].ch = -1; slots[i].ch = -1;
slot[i].usage &= ~ISDN_USAGE_DISABLED; slots[i].usage &= ~ISDN_USAGE_DISABLED;
isdn_unregister_devfs(i); isdn_unregister_devfs(i);
} }
dev->channels -= drivers[di]->channels; dev->channels -= drivers[di]->channels;
...@@ -862,12 +1318,12 @@ isdn_status_callback(isdn_ctrl * c) ...@@ -862,12 +1318,12 @@ isdn_status_callback(isdn_ctrl * c)
return(isdn_capi_rec_hl_msg(&c->parm.cmsg)); return(isdn_capi_rec_hl_msg(&c->parm.cmsg));
#ifdef CONFIG_ISDN_TTY_FAX #ifdef CONFIG_ISDN_TTY_FAX
case ISDN_STAT_FAXIND: case ISDN_STAT_FAXIND:
isdn_tty_stat_callback(i, c); // isdn_tty_stat_callback(i, c); FIXME
break; break;
#endif #endif
#ifdef CONFIG_ISDN_AUDIO #ifdef CONFIG_ISDN_AUDIO
case ISDN_STAT_AUDIO: case ISDN_STAT_AUDIO:
isdn_tty_stat_callback(i, c); // isdn_tty_stat_callback(i, c); FIXME
break; break;
#endif #endif
case ISDN_STAT_PROT: case ISDN_STAT_PROT:
...@@ -1000,13 +1456,13 @@ isdn_slot_readbchan(int sl, u_char * buf, u_char * fp, int len) ...@@ -1000,13 +1456,13 @@ isdn_slot_readbchan(int sl, u_char * buf, u_char * fp, int len)
static __inline int static __inline int
isdn_minor2drv(int minor) isdn_minor2drv(int minor)
{ {
return slot[minor].di; return slots[minor].di;
} }
static __inline int static __inline int
isdn_minor2chan(int minor) isdn_minor2chan(int minor)
{ {
return slot[minor].ch; return slots[minor].ch;
} }
static char * static char *
...@@ -1019,25 +1475,25 @@ isdn_statstr(void) ...@@ -1019,25 +1475,25 @@ isdn_statstr(void)
sprintf(istatbuf, "idmap:\t"); sprintf(istatbuf, "idmap:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
sprintf(p, "%s ", (slot[i].di < 0) ? "-" : isdn_drv_drvid(slot[i].di)); sprintf(p, "%s ", (slots[i].di < 0) ? "-" : isdn_drv_drvid(slots[i].di));
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\nchmap:\t"); sprintf(p, "\nchmap:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
sprintf(p, "%d ", slot[i].ch); sprintf(p, "%d ", slots[i].ch);
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\ndrmap:\t"); sprintf(p, "\ndrmap:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
sprintf(p, "%d ", slot[i].di); sprintf(p, "%d ", slots[i].di);
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\nusage:\t"); sprintf(p, "\nusage:\t");
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
sprintf(p, "%d ", slot[i].usage); sprintf(p, "%d ", slots[i].usage);
p = istatbuf + strlen(istatbuf); p = istatbuf + strlen(istatbuf);
} }
sprintf(p, "\nflags:\t"); sprintf(p, "\nflags:\t");
...@@ -1198,8 +1654,8 @@ isdn_status_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) ...@@ -1198,8 +1654,8 @@ isdn_status_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
sizeof(ulong) * ISDN_MAX_CHANNELS * 2))) sizeof(ulong) * ISDN_MAX_CHANNELS * 2)))
return ret; return ret;
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
put_user(slot[i].ibytes, p++); put_user(slots[i].ibytes, p++);
put_user(slot[i].obytes, p++); put_user(slots[i].obytes, p++);
} }
return 0; return 0;
} else } else
...@@ -1695,23 +2151,26 @@ isdn_get_free_slot(int usage, int l2_proto, int l3_proto, ...@@ -1695,23 +2151,26 @@ isdn_get_free_slot(int usage, int l2_proto, int l3_proto,
* transparent feature even if these don't support V.110 * transparent feature even if these don't support V.110
* because we can emulate this in linklevel. * because we can emulate this in linklevel.
*/ */
for (i = 0; i < ISDN_MAX_CHANNELS; i++) for (i = 0; i < ISDN_MAX_CHANNELS; i++)
if (USG_NONE(slot[i].usage) && if (USG_NONE(slots[i].usage) &&
(slot[i].di != -1)) { (slots[i].di != -1)) {
int d = slot[i].di; int d = slots[i].di;
if (!strcmp(isdn_map_eaz2msn(msn, d), "-")) if (!strcmp(isdn_map_eaz2msn(msn, d), "-"))
continue; continue;
if (slot[i].usage & ISDN_USAGE_DISABLED) if (slots[i].usage & ISDN_USAGE_DISABLED)
continue; /* usage not allowed */ continue; /* usage not allowed */
if (!drivers[d]->flags & DRV_FLAG_RUNNING) if (drivers[d]->fi.state != ST_DRV_RUNNING)
continue; continue;
if (((drivers[d]->interface->features & features) == features) || if (((drivers[d]->interface->features & features) == features) ||
(((drivers[d]->interface->features & vfeatures) == vfeatures) && (((drivers[d]->interface->features & vfeatures) == vfeatures) &&
(drivers[d]->interface->features & ISDN_FEATURE_L2_TRANS))) { (drivers[d]->interface->features & ISDN_FEATURE_L2_TRANS))) {
if (pre_dev < 0 || pre_chan < 0 || if (pre_dev < 0 || pre_chan < 0 ||
(pre_dev == d && pre_chan == slot[i].ch)) { (pre_dev == d && pre_chan == slots[i].ch)) {
isdn_slot_set_usage(i, usage); isdn_slot_set_usage(i, usage);
restore_flags(flags); HERE;
fsm_event(&slots[i].fi, EV_SLOT_BIND, NULL);
return i; return i;
} }
} }
...@@ -1735,22 +2194,7 @@ isdn_free_channel(int di, int ch, int usage) ...@@ -1735,22 +2194,7 @@ isdn_free_channel(int di, int ch, int usage)
void void
isdn_slot_free(int sl) isdn_slot_free(int sl)
{ {
unsigned long flags; fsm_event(&slots[sl].fi, EV_SLOT_UNBIND, NULL);
save_flags(flags);
cli();
strcpy(isdn_slot_num(sl), "???");
slot[sl].ibytes = 0;
slot[sl].obytes = 0;
// 20.10.99 JIM, try to reinitialize v110 !
slot[sl].iv110.v110emu = 0;
atomic_set(&slot[sl].iv110.v110use, 0);
isdn_v110_close(slot[sl].iv110.v110);
slot[sl].iv110.v110 = NULL;
// 20.10.99 JIM, try to reinitialize v110 !
isdn_slot_set_usage(sl, ISDN_USAGE_NONE);
skb_queue_purge(&drivers[isdn_slot_driver(sl)]->rpqueue[isdn_slot_channel(sl)]);
restore_flags(flags);
} }
/* /*
...@@ -1762,15 +2206,13 @@ isdn_slot_write(int sl, struct sk_buff *skb) ...@@ -1762,15 +2206,13 @@ isdn_slot_write(int sl, struct sk_buff *skb)
int ret; int ret;
struct sk_buff *nskb = NULL; struct sk_buff *nskb = NULL;
int v110_ret = skb->len; int v110_ret = skb->len;
int di = isdn_slot_driver(sl);
int ch = isdn_slot_channel(sl);
BUG_ON(sl < 0); BUG_ON(sl < 0);
if (slot[sl].iv110.v110) { if (slots[sl].iv110.v110) {
atomic_inc(&slot[sl].iv110.v110use); atomic_inc(&slots[sl].iv110.v110use);
nskb = isdn_v110_encode(slot[sl].iv110.v110, skb); nskb = isdn_v110_encode(slots[sl].iv110.v110, skb);
atomic_dec(&slot[sl].iv110.v110use); atomic_dec(&slots[sl].iv110.v110use);
if (!nskb) if (!nskb)
return 0; return 0;
v110_ret = *((int *)nskb->data); v110_ret = *((int *)nskb->data);
...@@ -1780,7 +2222,7 @@ isdn_slot_write(int sl, struct sk_buff *skb) ...@@ -1780,7 +2222,7 @@ isdn_slot_write(int sl, struct sk_buff *skb)
return v110_ret; return v110_ret;
} }
/* V.110 must always be acknowledged */ /* V.110 must always be acknowledged */
ret = drivers[di]->interface->writebuf_skb(di, ch, 1, nskb); ret = fsm_event(&slots[sl].fi, EV_SLOT_DATA_REQ, nskb);
} else { } else {
int hl = isdn_slot_hdrlen(sl); int hl = isdn_slot_hdrlen(sl);
...@@ -1798,22 +2240,22 @@ isdn_slot_write(int sl, struct sk_buff *skb) ...@@ -1798,22 +2240,22 @@ isdn_slot_write(int sl, struct sk_buff *skb)
skb_tmp = skb_realloc_headroom(skb, hl); skb_tmp = skb_realloc_headroom(skb, hl);
printk(KERN_DEBUG "isdn_writebuf_skb_stub: reallocating headroom%s\n", skb_tmp ? "" : " failed"); printk(KERN_DEBUG "isdn_writebuf_skb_stub: reallocating headroom%s\n", skb_tmp ? "" : " failed");
if (!skb_tmp) return -ENOMEM; /* 0 better? */ if (!skb_tmp) return -ENOMEM; /* 0 better? */
ret = drivers[di]->interface->writebuf_skb(di, ch, 1, skb_tmp); ret = fsm_event(&slots[sl].fi, EV_SLOT_DATA_REQ, skb_tmp);
if( ret > 0 ){ if( ret > 0 ){
dev_kfree_skb(skb); dev_kfree_skb(skb);
} else { } else {
dev_kfree_skb(skb_tmp); dev_kfree_skb(skb_tmp);
} }
} else { } else {
ret = drivers[di]->interface->writebuf_skb(di, ch, 1, skb); ret = fsm_event(&slots[sl].fi, EV_SLOT_DATA_REQ, skb);
} }
} }
if (ret > 0) { if (ret > 0) {
slot[sl].obytes += ret; slots[sl].obytes += ret;
if (slot[sl].iv110.v110) { if (slots[sl].iv110.v110) {
atomic_inc(&slot[sl].iv110.v110use); atomic_inc(&slots[sl].iv110.v110use);
slot[sl].iv110.v110->skbuser++; slots[sl].iv110.v110->skbuser++;
atomic_dec(&slot[sl].iv110.v110use); atomic_dec(&slots[sl].iv110.v110use);
/* For V.110 return unencoded data length */ /* For V.110 return unencoded data length */
ret = v110_ret; ret = v110_ret;
/* if the complete frame was send we free the skb; /* if the complete frame was send we free the skb;
...@@ -1822,7 +2264,7 @@ isdn_slot_write(int sl, struct sk_buff *skb) ...@@ -1822,7 +2264,7 @@ isdn_slot_write(int sl, struct sk_buff *skb)
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
} else } else
if (slot[sl].iv110.v110) if (slots[sl].iv110.v110)
dev_kfree_skb(nskb); dev_kfree_skb(nskb);
return ret; return ret;
} }
...@@ -1834,8 +2276,7 @@ isdn_add_channels(struct isdn_driver *d, int drvidx, int n, int adding) ...@@ -1834,8 +2276,7 @@ isdn_add_channels(struct isdn_driver *d, int drvidx, int n, int adding)
ulong flags; ulong flags;
init_waitqueue_head(&d->st_waitq); init_waitqueue_head(&d->st_waitq);
if (d->flags & DRV_FLAG_RUNNING)
return -1;
if (n < 1) return 0; if (n < 1) return 0;
m = (adding) ? d->channels + n : n; m = (adding) ? d->channels + n : n;
...@@ -1845,7 +2286,6 @@ isdn_add_channels(struct isdn_driver *d, int drvidx, int n, int adding) ...@@ -1845,7 +2286,6 @@ isdn_add_channels(struct isdn_driver *d, int drvidx, int n, int adding)
ISDN_MAX_CHANNELS); ISDN_MAX_CHANNELS);
return -1; return -1;
} }
if ((adding) && (d->rcverr)) if ((adding) && (d->rcverr))
kfree(d->rcverr); kfree(d->rcverr);
if (!(d->rcverr = kmalloc(sizeof(int) * m, GFP_KERNEL))) { if (!(d->rcverr = kmalloc(sizeof(int) * m, GFP_KERNEL))) {
...@@ -1883,14 +2323,16 @@ isdn_add_channels(struct isdn_driver *d, int drvidx, int n, int adding) ...@@ -1883,14 +2323,16 @@ isdn_add_channels(struct isdn_driver *d, int drvidx, int n, int adding)
dev->channels += n; dev->channels += n;
save_flags(flags); save_flags(flags);
cli(); cli();
for (j = d->channels; j < m; j++) for (j = d->channels; j < m; j++) {
for (k = 0; k < ISDN_MAX_CHANNELS; k++) for (k = 0; k < ISDN_MAX_CHANNELS; k++) {
if (slot[k].ch < 0) { if (slots[k].ch < 0) {
slot[k].ch = j; slots[k].ch = j;
slot[k].di = drvidx; slots[k].di = drvidx;
isdn_register_devfs(k); isdn_register_devfs(k);
break; break;
} }
}
}
restore_flags(flags); restore_flags(flags);
d->channels = m; d->channels = m;
return 0; return 0;
...@@ -1963,7 +2405,7 @@ isdn_slot_driver(int sl) ...@@ -1963,7 +2405,7 @@ isdn_slot_driver(int sl)
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
return slot[sl].di; return slots[sl].di;
} }
int int
...@@ -1971,7 +2413,7 @@ isdn_slot_channel(int sl) ...@@ -1971,7 +2413,7 @@ isdn_slot_channel(int sl)
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
return slot[sl].ch; return slots[sl].ch;
} }
int int
...@@ -1993,6 +2435,7 @@ isdn_slot_map_eaz2msn(int sl, char *msn) ...@@ -1993,6 +2435,7 @@ isdn_slot_map_eaz2msn(int sl, char *msn)
int int
isdn_slot_command(int sl, int cmd, isdn_ctrl *ctrl) isdn_slot_command(int sl, int cmd, isdn_ctrl *ctrl)
{ {
printk("%s: sl = %d\n", __FUNCTION__, sl);
ctrl->command = cmd; ctrl->command = cmd;
ctrl->driver = isdn_slot_driver(sl); ctrl->driver = isdn_slot_driver(sl);
...@@ -2012,8 +2455,27 @@ isdn_slot_command(int sl, int cmd, isdn_ctrl *ctrl) ...@@ -2012,8 +2455,27 @@ isdn_slot_command(int sl, int cmd, isdn_ctrl *ctrl)
ctrl->arg = isdn_slot_channel(sl); ctrl->arg = isdn_slot_channel(sl);
break; break;
} }
switch (cmd) {
return isdn_command(ctrl); case ISDN_CMD_CLREAZ:
return fsm_event(&slots[sl].fi, EV_SLOT_CMD_CLREAZ, ctrl);
case ISDN_CMD_SETEAZ:
return fsm_event(&slots[sl].fi, EV_SLOT_CMD_SETEAZ, ctrl);
case ISDN_CMD_SETL2:
return fsm_event(&slots[sl].fi, EV_SLOT_CMD_SETL2, ctrl);
case ISDN_CMD_SETL3:
return fsm_event(&slots[sl].fi, EV_SLOT_CMD_SETL3, ctrl);
case ISDN_CMD_DIAL:
return fsm_event(&slots[sl].fi, EV_SLOT_CMD_DIAL, ctrl);
case ISDN_CMD_ACCEPTD:
return fsm_event(&slots[sl].fi, EV_SLOT_CMD_ACCEPTD, ctrl);
case ISDN_CMD_ACCEPTB:
return fsm_event(&slots[sl].fi, EV_SLOT_CMD_ACCEPTB, ctrl);
case ISDN_CMD_HANGUP:
return fsm_event(&slots[sl].fi, EV_SLOT_CMD_HANGUP, ctrl);
}
HERE;
// return isdn_command(ctrl);
return -1;
} }
int int
...@@ -2077,7 +2539,7 @@ isdn_slot_usage(int sl) ...@@ -2077,7 +2539,7 @@ isdn_slot_usage(int sl)
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
return slot[sl].usage; return slots[sl].usage;
} }
void void
...@@ -2085,7 +2547,7 @@ isdn_slot_set_usage(int sl, int usage) ...@@ -2085,7 +2547,7 @@ isdn_slot_set_usage(int sl, int usage)
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
slot[sl].usage = usage; slots[sl].usage = usage;
isdn_info_update(); isdn_info_update();
} }
...@@ -2094,7 +2556,7 @@ isdn_slot_m_idx(int sl) ...@@ -2094,7 +2556,7 @@ isdn_slot_m_idx(int sl)
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
return slot[sl].m_idx; return slots[sl].m_idx;
} }
void void
...@@ -2102,7 +2564,7 @@ isdn_slot_set_m_idx(int sl, int midx) ...@@ -2102,7 +2564,7 @@ isdn_slot_set_m_idx(int sl, int midx)
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
slot[sl].m_idx = midx; slots[sl].m_idx = midx;
} }
char * char *
...@@ -2110,15 +2572,19 @@ isdn_slot_num(int sl) ...@@ -2110,15 +2572,19 @@ isdn_slot_num(int sl)
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
return slot[sl].num; return slots[sl].num;
} }
void void
isdn_slot_set_priv(int sl, void *priv) isdn_slot_set_priv(int sl, void *priv,
int (*stat_cb)(int sl, isdn_ctrl *ctrl),
int (*recv_cb)(int sl, struct sk_buff *skb))
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
slot[sl].priv = priv; slots[sl].priv = priv;
slots[sl].stat_cb = stat_cb;
slots[sl].recv_cb = recv_cb;
} }
void * void *
...@@ -2126,7 +2592,32 @@ isdn_slot_priv(int sl) ...@@ -2126,7 +2592,32 @@ isdn_slot_priv(int sl)
{ {
BUG_ON(sl < 0); BUG_ON(sl < 0);
return slot[sl].priv; return slots[sl].priv;
}
int
isdn_slot_queue_empty(int sl)
{
BUG_ON(sl < 0);
return skb_queue_empty(&drivers[slots[sl].di]->rpqueue[slots[sl].ch]);
}
void
isdn_slot_queue_tail(int sl, struct sk_buff *skb, int len)
{
BUG_ON(sl < 0);
__skb_queue_tail(&drivers[slots[sl].di]->rpqueue[slots[sl].ch], skb);
drivers[slots[sl].di]->rcvcount[slots[sl].ch] += len;
}
void
isdn_slot_queue_purge(int sl)
{
BUG_ON(sl < 0);
skb_queue_purge(&drivers[slots[sl].di]->rpqueue[slots[sl].ch]);
} }
int int
...@@ -2238,10 +2729,18 @@ static int __init isdn_init(void) ...@@ -2238,10 +2729,18 @@ static int __init isdn_init(void)
int i; int i;
int retval; int retval;
retval = fsm_new(&slot_fsm);
if (retval)
goto err;
retval = fsm_new(&drv_fsm);
if (retval)
goto err_slot_fsm;
dev = vmalloc(sizeof(*dev)); dev = vmalloc(sizeof(*dev));
if (!dev) { if (!dev) {
retval = -ENOMEM; retval = -ENOMEM;
goto err; goto err_drv_fsm;
} }
memset(dev, 0, sizeof(*dev)); memset(dev, 0, sizeof(*dev));
init_timer(&dev->timer); init_timer(&dev->timer);
...@@ -2249,12 +2748,17 @@ static int __init isdn_init(void) ...@@ -2249,12 +2748,17 @@ static int __init isdn_init(void)
init_MUTEX(&dev->sem); init_MUTEX(&dev->sem);
init_waitqueue_head(&dev->info_waitq); init_waitqueue_head(&dev->info_waitq);
for (i = 0; i < ISDN_MAX_CHANNELS; i++) { for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
slot[i].di = -1; slots[i].di = -1;
slot[i].ch = -1; slots[i].ch = -1;
slot[i].m_idx = -1; slots[i].m_idx = -1;
strcpy(isdn_slot_num(i), "???"); strcpy(isdn_slot_num(i), "???");
init_waitqueue_head(&dev->mdm.info[i].open_wait); init_waitqueue_head(&dev->mdm.info[i].open_wait);
init_waitqueue_head(&dev->mdm.info[i].close_wait); init_waitqueue_head(&dev->mdm.info[i].close_wait);
slots[i].fi.fsm = &slot_fsm;
slots[i].fi.state = ST_SLOT_NULL;
slots[i].fi.debug = 1;
slots[i].fi.userdata = slots + i;
slots[i].fi.printdebug = slot_debug;
} }
retval = register_chrdev(ISDN_MAJOR, "isdn", &isdn_fops); retval = register_chrdev(ISDN_MAJOR, "isdn", &isdn_fops);
if (retval) { if (retval) {
...@@ -2287,6 +2791,10 @@ static int __init isdn_init(void) ...@@ -2287,6 +2791,10 @@ static int __init isdn_init(void)
unregister_chrdev(ISDN_MAJOR, "isdn"); unregister_chrdev(ISDN_MAJOR, "isdn");
err_vfree: err_vfree:
vfree(dev); vfree(dev);
err_drv_fsm:
fsm_free(&drv_fsm);
err_slot_fsm:
fsm_free(&slot_fsm);
err: err:
return retval; return retval;
} }
...@@ -2314,6 +2822,8 @@ static void __exit isdn_exit(void) ...@@ -2314,6 +2822,8 @@ static void __exit isdn_exit(void)
restore_flags(flags); restore_flags(flags);
/* call vfree with interrupts enabled, else it will hang */ /* call vfree with interrupts enabled, else it will hang */
vfree(dev); vfree(dev);
fsm_free(&drv_fsm);
fsm_free(&slot_fsm);
} }
module_init(isdn_init); module_init(isdn_init);
......
drivers/isdn/i4l/isdn_common.h
View file @ 6a7fc460
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#undef ISDN_DEBUG_MODEM_DUMP #undef ISDN_DEBUG_MODEM_DUMP
#undef ISDN_DEBUG_MODEM_VOICE #undef ISDN_DEBUG_MODEM_VOICE
#undef ISDN_DEBUG_AT #undef ISDN_DEBUG_AT
#define ISDN_DEBUG_NET_DUMP #undef ISDN_DEBUG_NET_DUMP
#define ISDN_DEBUG_NET_DIAL #define ISDN_DEBUG_NET_DIAL
#define ISDN_DEBUG_NET_ICALL #define ISDN_DEBUG_NET_ICALL
#define ISDN_DEBUG_STATCALLB #define ISDN_DEBUG_STATCALLB
...@@ -66,7 +66,7 @@ extern int isdn_msncmp( const char *, const char *); ...@@ -66,7 +66,7 @@ extern int isdn_msncmp( const char *, const char *);
#if defined(ISDN_DEBUG_NET_DUMP) || defined(ISDN_DEBUG_MODEM_DUMP) #if defined(ISDN_DEBUG_NET_DUMP) || defined(ISDN_DEBUG_MODEM_DUMP)
extern void isdn_dumppkt(char *, u_char *, int, int); extern void isdn_dumppkt(char *, u_char *, int, int);
#else #else
static inline void isdn_dumppkt(char *s, u_char *d, int l, int m) { } static inline void isdn_dumppkt(char *s, char *ss, u_char *d, int l, int m) { }
#endif #endif
struct dial_info { struct dial_info {
...@@ -95,12 +95,13 @@ extern void isdn_slot_set_usage(int slot, int usage); ...@@ -95,12 +95,13 @@ extern void isdn_slot_set_usage(int slot, int usage);
extern char *isdn_slot_num(int slot); extern char *isdn_slot_num(int slot);
extern int isdn_slot_m_idx(int slot); extern int isdn_slot_m_idx(int slot);
extern void isdn_slot_set_m_idx(int slot, int midx); extern void isdn_slot_set_m_idx(int slot, int midx);
extern void isdn_slot_set_priv(int sl, void *); extern void isdn_slot_set_priv(int sl, void *priv, int (*stat_cb)(int sl, isdn_ctrl *ctrl), int (*recv_cb)(int sl, struct sk_buff *skb));
extern void *isdn_slot_priv(int sl); extern void *isdn_slot_priv(int sl);
extern int isdn_hard_header_len(void); extern int isdn_hard_header_len(void);
int isdn_drv_queue_empty(int di, int ch); int isdn_slot_queue_empty(int sl);
void isdn_drv_queue_tail(int di, int ch, struct sk_buff *skb, int len); void isdn_slot_queue_tail(int sl, struct sk_buff *skb, int len);
void isdn_slot_queue_purge(int sl);
int isdn_drv_maxbufsize(int di); int isdn_drv_maxbufsize(int di);
int isdn_drv_writebuf_skb(int di, int ch, int x, struct sk_buff *skb); int isdn_drv_writebuf_skb(int di, int ch, int x, struct sk_buff *skb);
int isdn_drv_hdrlen(int di); int isdn_drv_hdrlen(int di);
......
drivers/isdn/i4l/isdn_net_lib.c
View file @ 6a7fc460
...@@ -264,7 +264,7 @@ static int ...@@ -264,7 +264,7 @@ static int
isdn_net_bind(isdn_net_dev *idev, isdn_net_ioctl_cfg *cfg) isdn_net_bind(isdn_net_dev *idev, isdn_net_ioctl_cfg *cfg)
{ {
isdn_net_local *mlp = idev->mlp; isdn_net_local *mlp = idev->mlp;
int i, retval; int retval;
int drvidx = -1; int drvidx = -1;
int chidx = -1; int chidx = -1;
char drvid[25]; char drvid[25];
...@@ -287,14 +287,7 @@ isdn_net_bind(isdn_net_dev *idev, isdn_net_ioctl_cfg *cfg) ...@@ -287,14 +287,7 @@ isdn_net_bind(isdn_net_dev *idev, isdn_net_ioctl_cfg *cfg)
/* The channel-number is appended to the driver-Id with a comma */ /* The channel-number is appended to the driver-Id with a comma */
*c = 0; *c = 0;
chidx = simple_strtol(c + 1, NULL, 10); chidx = simple_strtol(c + 1, NULL, 10);
drvidx = isdn_drv_lookup(drvid);
for (i = 0; i < ISDN_MAX_DRIVERS; i++) {
/* Lookup driver-Id in array */
if (!strcmp(dev->drvid[i], drvid)) {
drvidx = i;
break;
}
}
if (drvidx == -1 || chidx == -1) { if (drvidx == -1 || chidx == -1) {
/* Either driver-Id or channel-number invalid */ /* Either driver-Id or channel-number invalid */
retval = -ENODEV; retval = -ENODEV;
...@@ -380,7 +373,6 @@ isdn_net_addif(char *name, isdn_net_local *mlp) ...@@ -380,7 +373,6 @@ isdn_net_addif(char *name, isdn_net_local *mlp)
idev->pre_channel = -1; idev->pre_channel = -1;
idev->exclusive = -1; idev->exclusive = -1;
idev->ipppd = NULL;
idev->pppbind = -1; idev->pppbind = -1;
init_timer(&idev->dial_timer); init_timer(&idev->dial_timer);
...@@ -547,8 +539,7 @@ isdn_net_setcfg(isdn_net_ioctl_cfg *cfg) ...@@ -547,8 +539,7 @@ isdn_net_setcfg(isdn_net_ioctl_cfg *cfg)
{ {
isdn_net_dev *idev = isdn_net_findif(cfg->name); isdn_net_dev *idev = isdn_net_findif(cfg->name);
isdn_net_local *mlp; isdn_net_local *mlp;
ulong features; int retval;
int i, retval;
if (!idev) if (!idev)
return -ENODEV; return -ENODEV;
...@@ -561,19 +552,6 @@ isdn_net_setcfg(isdn_net_ioctl_cfg *cfg) ...@@ -561,19 +552,6 @@ isdn_net_setcfg(isdn_net_ioctl_cfg *cfg)
retval = -EBUSY; retval = -EBUSY;
goto out; goto out;
} }
/* See if any registered driver supports the features we want */
features = ((1 << cfg->l2_proto) << ISDN_FEATURE_L2_SHIFT) |
((1 << cfg->l3_proto) << ISDN_FEATURE_L3_SHIFT);
for (i = 0; i < ISDN_MAX_DRIVERS; i++)
if (dev->drv[i] &&
(dev->drv[i]->interface->features & features) == features)
break;
if (i == ISDN_MAX_DRIVERS) {
printk(KERN_WARNING "isdn_net: No driver with selected features\n");
retval = -ENODEV;
goto out;
}
retval = isdn_net_set_encap(mlp, cfg->p_encap); retval = isdn_net_set_encap(mlp, cfg->p_encap);
if (retval) if (retval)
...@@ -667,7 +645,7 @@ isdn_net_getcfg(isdn_net_ioctl_cfg *cfg) ...@@ -667,7 +645,7 @@ isdn_net_getcfg(isdn_net_ioctl_cfg *cfg)
strcpy(cfg->eaz, mlp->msn); strcpy(cfg->eaz, mlp->msn);
cfg->exclusive = idev->exclusive >= 0; cfg->exclusive = idev->exclusive >= 0;
if (idev->pre_device >= 0) { if (idev->pre_device >= 0) {
sprintf(cfg->drvid, "%s,%d", dev->drvid[idev->pre_device], sprintf(cfg->drvid, "%s,%d", isdn_drv_drvid(idev->pre_device),
idev->pre_channel); idev->pre_channel);
} else { } else {
cfg->drvid[0] = '\0'; cfg->drvid[0] = '\0';
...@@ -1224,7 +1202,7 @@ isdn_net_unbind_channel(isdn_net_dev *idev) ...@@ -1224,7 +1202,7 @@ isdn_net_unbind_channel(isdn_net_dev *idev)
if (mlp->ops->unbind) if (mlp->ops->unbind)
mlp->ops->unbind(idev); mlp->ops->unbind(idev);
isdn_slot_set_idev(idev->isdn_slot, NULL); isdn_slot_set_priv(idev->isdn_slot, NULL, NULL, NULL);
skb_queue_purge(&idev->super_tx_queue); skb_queue_purge(&idev->super_tx_queue);
...@@ -1239,6 +1217,9 @@ isdn_net_unbind_channel(isdn_net_dev *idev) ...@@ -1239,6 +1217,9 @@ isdn_net_unbind_channel(isdn_net_dev *idev)
} }
} }
static int isdn_net_stat_callback(int, isdn_ctrl *);
static int isdn_net_rcv_skb(int, struct sk_buff *);
/* /*
* Assign an ISDN-channel to a net-interface * Assign an ISDN-channel to a net-interface
*/ */
...@@ -1249,7 +1230,8 @@ isdn_net_bind_channel(isdn_net_dev *idev, int slot) ...@@ -1249,7 +1230,8 @@ isdn_net_bind_channel(isdn_net_dev *idev, int slot)
int retval = 0; int retval = 0;
idev->isdn_slot = slot; idev->isdn_slot = slot;
isdn_slot_set_idev(idev->isdn_slot, idev); isdn_slot_set_priv(idev->isdn_slot, idev, isdn_net_stat_callback,
isdn_net_rcv_skb);
if (mlp->ops->bind) if (mlp->ops->bind)
retval = mlp->ops->bind(idev); retval = mlp->ops->bind(idev);
...@@ -1889,10 +1871,10 @@ isdn_net_hangup(isdn_net_dev *idev) ...@@ -1889,10 +1871,10 @@ isdn_net_hangup(isdn_net_dev *idev)
* isdn_status_callback, which itself is called from the low-level driver. * isdn_status_callback, which itself is called from the low-level driver.
* Return: 1 = event handled, 0 = not handled * Return: 1 = event handled, 0 = not handled
*/ */
int static int
isdn_net_stat_callback(int idx, isdn_ctrl *c) isdn_net_stat_callback(int idx, isdn_ctrl *c)
{ {
isdn_net_dev *idev = isdn_slot_idev(idx); isdn_net_dev *idev = isdn_slot_priv(idx);
if (!idev) { if (!idev) {
return 0; return 0;
...@@ -2285,10 +2267,10 @@ isdn_net_write_super(isdn_net_dev *idev, struct sk_buff *skb) ...@@ -2285,10 +2267,10 @@ isdn_net_write_super(isdn_net_dev *idev, struct sk_buff *skb)
* interface. If found, deliver packet to receiver-function and return 1, * interface. If found, deliver packet to receiver-function and return 1,
* else return 0. * else return 0.
*/ */
int static int
isdn_net_rcv_skb(int idx, struct sk_buff *skb) isdn_net_rcv_skb(int idx, struct sk_buff *skb)
{ {
isdn_net_dev *idev = isdn_slot_idev(idx); isdn_net_dev *idev = isdn_slot_priv(idx);
isdn_net_local *mlp; isdn_net_local *mlp;
if (!idev) { if (!idev) {
...@@ -2359,7 +2341,5 @@ isdn_net_lib_init(void) ...@@ -2359,7 +2341,5 @@ isdn_net_lib_init(void)
void void
isdn_net_lib_exit(void) isdn_net_lib_exit(void)
{ {
fsm_free(&isdn_net_fsm); fsm_free(&isdn_net_fsm);
} }
drivers/isdn/i4l/isdn_net_lib.h
View file @ 6a7fc460
...@@ -50,9 +50,7 @@ void isdn_net_lib_init(void); ...@@ -50,9 +50,7 @@ void isdn_net_lib_init(void);
void isdn_net_lib_exit(void); void isdn_net_lib_exit(void);
void isdn_net_hangup_all(void); void isdn_net_hangup_all(void);
int isdn_net_ioctl(struct inode *, struct file *, uint, ulong); int isdn_net_ioctl(struct inode *, struct file *, uint, ulong);
int isdn_net_stat_callback(int, isdn_ctrl *);
int isdn_net_find_icall(int, int, int, setup_parm *); int isdn_net_find_icall(int, int, int, setup_parm *);
int isdn_net_rcv_skb(int, struct sk_buff *);
/* provided for interface types to use */ /* provided for interface types to use */
void isdn_net_writebuf_skb(isdn_net_dev *, struct sk_buff *skb); void isdn_net_writebuf_skb(isdn_net_dev *, struct sk_buff *skb);
......
drivers/isdn/i4l/isdn_ppp.c
View file @ 6a7fc460
...@@ -43,7 +43,7 @@ isdn_ppp_set_compressor(isdn_net_dev *idev, struct isdn_ppp_comp_data *); ...@@ -43,7 +43,7 @@ isdn_ppp_set_compressor(isdn_net_dev *idev, struct isdn_ppp_comp_data *);
* idev->ipppd is safe without further locking. * idev->ipppd is safe without further locking.
*/ */
#define IPPPD_DEBUG #undef IPPPD_DEBUG
#ifdef IPPPD_DEBUG #ifdef IPPPD_DEBUG
#define ipppd_debug(i, fmt, arg...) \ #define ipppd_debug(i, fmt, arg...) \
......
drivers/isdn/i4l/isdn_ppp_mp.c
View file @ 6a7fc460
...@@ -165,15 +165,6 @@ ippp_mp_receive(isdn_net_dev *idev, struct sk_buff *skb, u16 proto) ...@@ -165,15 +165,6 @@ ippp_mp_receive(isdn_net_dev *idev, struct sk_buff *skb, u16 proto)
#define MP_GT(a,b) ((b-a)&MP_LONGSEQ_MAXBIT) #define MP_GT(a,b) ((b-a)&MP_LONGSEQ_MAXBIT)
#define MP_GE(a,b) !((a-b)&MP_LONGSEQ_MAXBIT) #define MP_GE(a,b) !((a-b)&MP_LONGSEQ_MAXBIT)
static void
print_recv_pkt(int slot, struct sk_buff *skb)
{
printk(KERN_DEBUG "mp_recv: %d/%d -> %02x %02x %02x %02x %02x %02x\n",
slot, skb->len,
skb->data[0], skb->data[1], skb->data[2],
skb->data[3], skb->data[4], skb->data[5]);
}
#define MP_SEQUENCE(skb) (skb)->priority #define MP_SEQUENCE(skb) (skb)->priority
#define MP_FLAGS(skb) (skb)->cb[0] #define MP_FLAGS(skb) (skb)->cb[0]
...@@ -237,7 +228,6 @@ mp_complete_seq(isdn_net_local *lp, struct sk_buff *b, struct sk_buff *e) ...@@ -237,7 +228,6 @@ mp_complete_seq(isdn_net_local *lp, struct sk_buff *b, struct sk_buff *e)
if (b->next == e) { if (b->next == e) {
/* sequence with only one frag */ /* sequence with only one frag */
HERE;
skb_unlink(b); skb_unlink(b);
return b; return b;
} }
...@@ -320,8 +310,6 @@ mp_receive(isdn_net_dev *idev, struct sk_buff *skb) ...@@ -320,8 +310,6 @@ mp_receive(isdn_net_dev *idev, struct sk_buff *skb)
u32 seq; u32 seq;
u16 proto; u16 proto;
print_recv_pkt(-1, skb);
if (skb->len < (inl_ppp->mp_cfg & SC_IN_SHORT_SEQ ? 2 : 4)) if (skb->len < (inl_ppp->mp_cfg & SC_IN_SHORT_SEQ ? 2 : 4))
goto drop; goto drop;
......
drivers/isdn/i4l/isdn_tty.c
View file @ 6a7fc460
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
* of the GNU General Public License, incorporated herein by reference. * of the GNU General Public License, incorporated herein by reference.
*/ */
#undef ISDN_TTY_STAT_DEBUG #define ISDN_TTY_STAT_DEBUG
#define ISDN_DEBUG_MODEM_HUP
#include <linux/config.h> #include <linux/config.h>
#include <linux/isdn.h> #include <linux/isdn.h>
...@@ -30,6 +31,7 @@ static void isdn_tty_modem_reset_regs(modem_info *, int); ...@@ -30,6 +31,7 @@ static void isdn_tty_modem_reset_regs(modem_info *, int);
static void isdn_tty_cmd_ATA(modem_info *); static void isdn_tty_cmd_ATA(modem_info *);
static void isdn_tty_flush_buffer(struct tty_struct *); static void isdn_tty_flush_buffer(struct tty_struct *);
static void isdn_tty_modem_result(int, modem_info *); static void isdn_tty_modem_result(int, modem_info *);
static int isdn_tty_stat_callback(int i, isdn_ctrl *c);
#ifdef CONFIG_ISDN_AUDIO #ifdef CONFIG_ISDN_AUDIO
static int isdn_tty_countDLE(unsigned char *, int); static int isdn_tty_countDLE(unsigned char *, int);
#endif #endif
...@@ -167,21 +169,16 @@ isdn_tty_readmodem(void) ...@@ -167,21 +169,16 @@ isdn_tty_readmodem(void)
isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 0); isdn_timer_ctrl(ISDN_TIMER_MODEMREAD, 0);
} }
int static int
isdn_tty_rcv_skb(int i, int di, int channel, struct sk_buff *skb) isdn_tty_rcv_skb(int i, struct sk_buff *skb)
{ {
ulong flags; ulong flags;
int midx;
#ifdef CONFIG_ISDN_AUDIO #ifdef CONFIG_ISDN_AUDIO
int ifmt; int ifmt;
#endif #endif
modem_info *info; modem_info *info;
if ((midx = isdn_slot_m_idx(i)) < 0) { info = isdn_slot_priv(i);
/* if midx is invalid, packet is not for tty */
return 0;
}
info = &dev->mdm.info[midx];
#ifdef CONFIG_ISDN_AUDIO #ifdef CONFIG_ISDN_AUDIO
ifmt = 1; ifmt = 1;
...@@ -264,7 +261,7 @@ isdn_tty_rcv_skb(int i, int di, int channel, struct sk_buff *skb) ...@@ -264,7 +261,7 @@ isdn_tty_rcv_skb(int i, int di, int channel, struct sk_buff *skb)
/* Try to deliver directly via tty-flip-buf if queue is empty */ /* Try to deliver directly via tty-flip-buf if queue is empty */
save_flags(flags); save_flags(flags);
cli(); cli();
if (isdn_drv_queue_empty(di, channel)) if (isdn_slot_queue_empty(i))
if (isdn_tty_try_read(info, skb)) { if (isdn_tty_try_read(info, skb)) {
restore_flags(flags); restore_flags(flags);
return 1; return 1;
...@@ -272,7 +269,7 @@ isdn_tty_rcv_skb(int i, int di, int channel, struct sk_buff *skb) ...@@ -272,7 +269,7 @@ isdn_tty_rcv_skb(int i, int di, int channel, struct sk_buff *skb)
/* Direct deliver failed or queue wasn't empty. /* Direct deliver failed or queue wasn't empty.
* Queue up for later dequeueing via timer-irq. * Queue up for later dequeueing via timer-irq.
*/ */
isdn_drv_queue_tail(di, channel, skb, skb->len isdn_slot_queue_tail(i, skb, skb->len
#ifdef CONFIG_ISDN_AUDIO #ifdef CONFIG_ISDN_AUDIO
+ ISDN_AUDIO_SKB_DLECOUNT(skb) + ISDN_AUDIO_SKB_DLECOUNT(skb)
#endif #endif
...@@ -656,8 +653,10 @@ isdn_tty_dial(char *n, modem_info * info, atemu * m) ...@@ -656,8 +653,10 @@ isdn_tty_dial(char *n, modem_info * info, atemu * m)
.msn = m->msn, .msn = m->msn,
.phone = n, .phone = n,
}; };
info->isdn_slot = i; info->isdn_slot = i;
isdn_slot_set_m_idx(i, info->line); isdn_slot_set_m_idx(i, info->line);
isdn_slot_set_priv(i, info, isdn_tty_stat_callback, isdn_tty_rcv_skb);
info->last_dir = 1; info->last_dir = 1;
info->last_l2 = l2; info->last_l2 = l2;
strcpy(info->last_num, n); strcpy(info->last_num, n);
...@@ -739,7 +738,7 @@ isdn_tty_modem_hup(modem_info * info, int local) ...@@ -739,7 +738,7 @@ isdn_tty_modem_hup(modem_info * info, int local)
isdn_slot_all_eaz(slot); isdn_slot_all_eaz(slot);
info->emu.mdmreg[REG_RINGCNT] = 0; info->emu.mdmreg[REG_RINGCNT] = 0;
isdn_slot_free(slot); isdn_slot_free(slot);
isdn_slot_set_m_idx(slot, -1); isdn_slot_set_priv(slot, NULL, NULL, NULL);
info->isdn_slot = -1; info->isdn_slot = -1;
} }
...@@ -833,6 +832,7 @@ isdn_tty_resume(char *id, modem_info * info, atemu * m) ...@@ -833,6 +832,7 @@ isdn_tty_resume(char *id, modem_info * info, atemu * m)
} else { } else {
info->isdn_slot = i; info->isdn_slot = i;
isdn_slot_set_m_idx(i, info->line); isdn_slot_set_m_idx(i, info->line);
isdn_slot_set_priv(i, info, isdn_tty_stat_callback, isdn_tty_rcv_skb);
isdn_slot_set_usage(i, isdn_slot_usage(i) | ISDN_USAGE_OUTGOING); isdn_slot_set_usage(i, isdn_slot_usage(i) | ISDN_USAGE_OUTGOING);
info->last_dir = 1; info->last_dir = 1;
// strcpy(info->last_num, n); // strcpy(info->last_num, n);
...@@ -909,6 +909,7 @@ isdn_tty_send_msg(modem_info * info, atemu * m, char *msg) ...@@ -909,6 +909,7 @@ isdn_tty_send_msg(modem_info * info, atemu * m, char *msg)
} else { } else {
info->isdn_slot = i; info->isdn_slot = i;
isdn_slot_set_m_idx(i, info->line); isdn_slot_set_m_idx(i, info->line);
isdn_slot_set_priv(i, info, isdn_tty_stat_callback, isdn_tty_rcv_skb);
isdn_slot_set_usage(i, isdn_slot_usage(i) | ISDN_USAGE_OUTGOING); isdn_slot_set_usage(i, isdn_slot_usage(i) | ISDN_USAGE_OUTGOING);
info->last_dir = 1; info->last_dir = 1;
restore_flags(flags); restore_flags(flags);
...@@ -1106,7 +1107,10 @@ isdn_tty_write(struct tty_struct *tty, int from_user, const u_char * buf, int co ...@@ -1106,7 +1107,10 @@ isdn_tty_write(struct tty_struct *tty, int from_user, const u_char * buf, int co
c = count; c = count;
if (c > info->xmit_size - info->xmit_count) if (c > info->xmit_size - info->xmit_count)
c = info->xmit_size - info->xmit_count; c = info->xmit_size - info->xmit_count;
if (info->isdn_slot >= 0)
di = isdn_slot_driver(info->isdn_slot); di = isdn_slot_driver(info->isdn_slot);
else
di = -1;
if (di >= 0 && c > isdn_drv_maxbufsize(di)) if (di >= 0 && c > isdn_drv_maxbufsize(di))
c = isdn_drv_maxbufsize(di); c = isdn_drv_maxbufsize(di);
if (c <= 0) if (c <= 0)
...@@ -2190,6 +2194,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup) ...@@ -2190,6 +2194,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
if (!matchret) { /* EAZ is matching */ if (!matchret) { /* EAZ is matching */
info->isdn_slot = idx; info->isdn_slot = idx;
isdn_slot_set_m_idx(idx, info->line); isdn_slot_set_m_idx(idx, info->line);
isdn_slot_set_priv(idx, info, isdn_tty_stat_callback, isdn_tty_rcv_skb);
strcpy(isdn_slot_num(idx), nr); strcpy(isdn_slot_num(idx), nr);
strcpy(info->emu.cpn, eaz); strcpy(info->emu.cpn, eaz);
info->emu.mdmreg[REG_SI1I] = si2bit[si1]; info->emu.mdmreg[REG_SI1I] = si2bit[si1];
...@@ -2216,17 +2221,14 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup) ...@@ -2216,17 +2221,14 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
#define TTY_IS_ACTIVE(info) \ #define TTY_IS_ACTIVE(info) \
(info->flags & (ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CALLOUT_ACTIVE)) (info->flags & (ISDN_ASYNC_NORMAL_ACTIVE | ISDN_ASYNC_CALLOUT_ACTIVE))
int static int
isdn_tty_stat_callback(int i, isdn_ctrl *c) isdn_tty_stat_callback(int i, isdn_ctrl *c)
{ {
int mi;
modem_info *info; modem_info *info;
char *e; char *e;
if (i < 0) info = isdn_slot_priv(i);
return 0; if (1) {
if ((mi = isdn_slot_m_idx(i)) >= 0) {
info = &dev->mdm.info[mi];
switch (c->command) { switch (c->command) {
case ISDN_STAT_CINF: case ISDN_STAT_CINF:
printk(KERN_DEBUG "CHARGEINFO on ttyI%d: %ld %s\n", info->line, c->arg, c->parm.num); printk(KERN_DEBUG "CHARGEINFO on ttyI%d: %ld %s\n", info->line, c->arg, c->parm.num);
...@@ -2437,9 +2439,13 @@ isdn_tty_at_cout(char *msg, modem_info * info) ...@@ -2437,9 +2439,13 @@ isdn_tty_at_cout(char *msg, modem_info * info)
/* use queue instead of direct flip, if online and */ /* use queue instead of direct flip, if online and */
/* data is in queue or flip buffer is full */ /* data is in queue or flip buffer is full */
if (info->isdn_slot >= 0) {
di = isdn_slot_driver(info->isdn_slot); ch = isdn_slot_channel(info->isdn_slot); di = isdn_slot_driver(info->isdn_slot); ch = isdn_slot_channel(info->isdn_slot);
} else {
di = -1; ch = -1;
}
if ((info->online) && (((tty->flip.count + strlen(msg)) >= TTY_FLIPBUF_SIZE) || if ((info->online) && (((tty->flip.count + strlen(msg)) >= TTY_FLIPBUF_SIZE) ||
(!isdn_drv_queue_empty(di, ch)))) { (!isdn_slot_queue_empty(info->isdn_slot)))) {
skb = alloc_skb(strlen(msg) skb = alloc_skb(strlen(msg)
#ifdef CONFIG_ISDN_AUDIO #ifdef CONFIG_ISDN_AUDIO
+ sizeof(isdn_audio_skb) + sizeof(isdn_audio_skb)
...@@ -2482,7 +2488,7 @@ isdn_tty_at_cout(char *msg, modem_info * info) ...@@ -2482,7 +2488,7 @@ isdn_tty_at_cout(char *msg, modem_info * info)
} }
} }
if (skb) { if (skb) {
isdn_drv_queue_tail(di, ch, skb, skb->len); isdn_slot_queue_tail(info->isdn_slot, skb, skb->len);
restore_flags(flags); restore_flags(flags);
/* Schedule dequeuing */ /* Schedule dequeuing */
if ((dev->modempoll) && (info->rcvsched)) if ((dev->modempoll) && (info->rcvsched))
......
drivers/isdn/i4l/isdn_tty.h
View file @ 6a7fc460
...@@ -106,8 +106,6 @@ extern int isdn_tty_init(void); ...@@ -106,8 +106,6 @@ extern int isdn_tty_init(void);
extern void isdn_tty_readmodem(void); extern void isdn_tty_readmodem(void);
extern int isdn_tty_find_icall(int, int, setup_parm *); extern int isdn_tty_find_icall(int, int, setup_parm *);
extern void isdn_tty_cleanup_xmit(modem_info *); extern void isdn_tty_cleanup_xmit(modem_info *);
extern int isdn_tty_stat_callback(int, isdn_ctrl *);
extern int isdn_tty_rcv_skb(int, int, int, struct sk_buff *);
extern int isdn_tty_capi_facility(capi_msg *cm); extern int isdn_tty_capi_facility(capi_msg *cm);
extern void isdn_tty_at_cout(char *, modem_info *); extern void isdn_tty_at_cout(char *, modem_info *);
extern void isdn_tty_modem_hup(modem_info *, int); extern void isdn_tty_modem_hup(modem_info *, int);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7