diff options
-rw-r--r-- | drivers/isdn/pcbit/callbacks.c | 17 | ||||
-rw-r--r-- | drivers/isdn/pcbit/callbacks.h | 3 | ||||
-rw-r--r-- | drivers/isdn/pcbit/capi.c | 10 | ||||
-rw-r--r-- | drivers/isdn/pcbit/capi.h | 1 | ||||
-rw-r--r-- | drivers/isdn/pcbit/drv.c | 16 |
5 files changed, 8 insertions, 39 deletions
diff --git a/drivers/isdn/pcbit/callbacks.c b/drivers/isdn/pcbit/callbacks.c index 692ec72d1ee8..f151f36c8255 100644 --- a/drivers/isdn/pcbit/callbacks.c +++ b/drivers/isdn/pcbit/callbacks.c | |||
@@ -125,23 +125,6 @@ void cb_out_2(struct pcbit_dev * dev, struct pcbit_chan* chan, | |||
125 | 125 | ||
126 | 126 | ||
127 | /* | 127 | /* |
128 | * Disconnect received (actually RELEASE COMPLETE) | ||
129 | * This means we were not able to establish connection with remote | ||
130 | * Inform the big boss above | ||
131 | */ | ||
132 | void cb_out_3(struct pcbit_dev * dev, struct pcbit_chan* chan, | ||
133 | struct callb_data *data) | ||
134 | { | ||
135 | isdn_ctrl ictl; | ||
136 | |||
137 | ictl.command = ISDN_STAT_DHUP; | ||
138 | ictl.driver=dev->id; | ||
139 | ictl.arg=chan->id; | ||
140 | dev->dev_if->statcallb(&ictl); | ||
141 | } | ||
142 | |||
143 | |||
144 | /* | ||
145 | * Incoming call received | 128 | * Incoming call received |
146 | * inform user | 129 | * inform user |
147 | */ | 130 | */ |
diff --git a/drivers/isdn/pcbit/callbacks.h b/drivers/isdn/pcbit/callbacks.h index f510dc56b57e..17aa0f54bfc3 100644 --- a/drivers/isdn/pcbit/callbacks.h +++ b/drivers/isdn/pcbit/callbacks.h | |||
@@ -19,9 +19,6 @@ extern void cb_out_1(struct pcbit_dev * dev, struct pcbit_chan* chan, | |||
19 | extern void cb_out_2(struct pcbit_dev * dev, struct pcbit_chan* chan, | 19 | extern void cb_out_2(struct pcbit_dev * dev, struct pcbit_chan* chan, |
20 | struct callb_data *data); | 20 | struct callb_data *data); |
21 | 21 | ||
22 | extern void cb_out_3(struct pcbit_dev * dev, struct pcbit_chan* chan, | ||
23 | struct callb_data *data); | ||
24 | |||
25 | extern void cb_in_1(struct pcbit_dev * dev, struct pcbit_chan* chan, | 22 | extern void cb_in_1(struct pcbit_dev * dev, struct pcbit_chan* chan, |
26 | struct callb_data *data); | 23 | struct callb_data *data); |
27 | extern void cb_in_2(struct pcbit_dev * dev, struct pcbit_chan* chan, | 24 | extern void cb_in_2(struct pcbit_dev * dev, struct pcbit_chan* chan, |
diff --git a/drivers/isdn/pcbit/capi.c b/drivers/isdn/pcbit/capi.c index 29eb03a8c29d..bef321d0e51d 100644 --- a/drivers/isdn/pcbit/capi.c +++ b/drivers/isdn/pcbit/capi.c | |||
@@ -627,16 +627,6 @@ int capi_decode_disc_ind(struct pcbit_chan *chan, struct sk_buff *skb) | |||
627 | return 0; | 627 | return 0; |
628 | } | 628 | } |
629 | 629 | ||
630 | int capi_decode_disc_conf(struct pcbit_chan *chan, struct sk_buff *skb) | ||
631 | { | ||
632 | ushort errcode; | ||
633 | |||
634 | errcode = *((ushort*) skb->data); | ||
635 | skb_pull(skb, 2); | ||
636 | |||
637 | return errcode; | ||
638 | } | ||
639 | |||
640 | #ifdef DEBUG | 630 | #ifdef DEBUG |
641 | int capi_decode_debug_188(u_char *hdr, ushort hdrlen) | 631 | int capi_decode_debug_188(u_char *hdr, ushort hdrlen) |
642 | { | 632 | { |
diff --git a/drivers/isdn/pcbit/capi.h b/drivers/isdn/pcbit/capi.h index 18e6aa360a8f..df8e73c04d7f 100644 --- a/drivers/isdn/pcbit/capi.h +++ b/drivers/isdn/pcbit/capi.h | |||
@@ -54,7 +54,6 @@ extern int capi_tdata_resp(struct pcbit_chan *chan, struct sk_buff ** skb); | |||
54 | 54 | ||
55 | /* Connection Termination */ | 55 | /* Connection Termination */ |
56 | extern int capi_disc_req(ushort callref, struct sk_buff **skb, u_char cause); | 56 | extern int capi_disc_req(ushort callref, struct sk_buff **skb, u_char cause); |
57 | extern int capi_decode_disc_conf(struct pcbit_chan *chan, struct sk_buff *skb); | ||
58 | 57 | ||
59 | extern int capi_decode_disc_ind(struct pcbit_chan *chan, struct sk_buff *skb); | 58 | extern int capi_decode_disc_ind(struct pcbit_chan *chan, struct sk_buff *skb); |
60 | extern int capi_disc_resp(struct pcbit_chan *chan, struct sk_buff **skb); | 59 | extern int capi_disc_resp(struct pcbit_chan *chan, struct sk_buff **skb); |
diff --git a/drivers/isdn/pcbit/drv.c b/drivers/isdn/pcbit/drv.c index e98f9c48c184..5de861f40816 100644 --- a/drivers/isdn/pcbit/drv.c +++ b/drivers/isdn/pcbit/drv.c | |||
@@ -56,10 +56,10 @@ static char* pcbit_devname[MAX_PCBIT_CARDS] = { | |||
56 | * prototypes | 56 | * prototypes |
57 | */ | 57 | */ |
58 | 58 | ||
59 | int pcbit_command(isdn_ctrl* ctl); | 59 | static int pcbit_command(isdn_ctrl* ctl); |
60 | int pcbit_stat(u_char __user * buf, int len, int, int); | 60 | static int pcbit_stat(u_char __user * buf, int len, int, int); |
61 | int pcbit_xmit(int driver, int chan, int ack, struct sk_buff *skb); | 61 | static int pcbit_xmit(int driver, int chan, int ack, struct sk_buff *skb); |
62 | int pcbit_writecmd(const u_char __user *, int, int, int); | 62 | static int pcbit_writecmd(const u_char __user *, int, int, int); |
63 | 63 | ||
64 | static int set_protocol_running(struct pcbit_dev * dev); | 64 | static int set_protocol_running(struct pcbit_dev * dev); |
65 | 65 | ||
@@ -238,7 +238,7 @@ void pcbit_terminate(int board) | |||
238 | } | 238 | } |
239 | #endif | 239 | #endif |
240 | 240 | ||
241 | int pcbit_command(isdn_ctrl* ctl) | 241 | static int pcbit_command(isdn_ctrl* ctl) |
242 | { | 242 | { |
243 | struct pcbit_dev *dev; | 243 | struct pcbit_dev *dev; |
244 | struct pcbit_chan *chan; | 244 | struct pcbit_chan *chan; |
@@ -330,7 +330,7 @@ static void pcbit_block_timer(unsigned long data) | |||
330 | } | 330 | } |
331 | #endif | 331 | #endif |
332 | 332 | ||
333 | int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb) | 333 | static int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb) |
334 | { | 334 | { |
335 | ushort hdrlen; | 335 | ushort hdrlen; |
336 | int refnum, len; | 336 | int refnum, len; |
@@ -389,7 +389,7 @@ int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb) | |||
389 | return len; | 389 | return len; |
390 | } | 390 | } |
391 | 391 | ||
392 | int pcbit_writecmd(const u_char __user *buf, int len, int driver, int channel) | 392 | static int pcbit_writecmd(const u_char __user *buf, int len, int driver, int channel) |
393 | { | 393 | { |
394 | struct pcbit_dev * dev; | 394 | struct pcbit_dev * dev; |
395 | int i, j; | 395 | int i, j; |
@@ -713,7 +713,7 @@ static char statbuf[STATBUF_LEN]; | |||
713 | static int stat_st = 0; | 713 | static int stat_st = 0; |
714 | static int stat_end = 0; | 714 | static int stat_end = 0; |
715 | 715 | ||
716 | int pcbit_stat(u_char __user *buf, int len, int driver, int channel) | 716 | static int pcbit_stat(u_char __user *buf, int len, int driver, int channel) |
717 | { | 717 | { |
718 | int stat_count; | 718 | int stat_count; |
719 | stat_count = stat_end - stat_st; | 719 | stat_count = stat_end - stat_st; |