Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
2466d3f5
Commit
2466d3f5
authored
21 years ago
by
Kai Germaschewski
Browse files
Options
Browse Files
Download
Plain Diff
Merge vaio:kernel/v2.5/linux-2.5.make
into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.isdn
parents
9ae9036e
3bb3efb5
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
54 additions
and
44 deletions
+54
-44
drivers/isdn/hardware/avm/b1pci.c
drivers/isdn/hardware/avm/b1pci.c
+4
-0
drivers/isdn/hisax/config.c
drivers/isdn/hisax/config.c
+4
-4
drivers/isdn/hisax/hisax.h
drivers/isdn/hisax/hisax.h
+1
-1
drivers/isdn/hisax/hisax_fcclassic.c
drivers/isdn/hisax/hisax_fcclassic.c
+1
-1
drivers/isdn/hisax/hisax_fcpcipnp.c
drivers/isdn/hisax/hisax_fcpcipnp.c
+30
-26
drivers/isdn/hisax/hisax_isac.c
drivers/isdn/hisax/hisax_isac.c
+2
-2
drivers/isdn/hisax/hisax_isac.h
drivers/isdn/hisax/hisax_isac.h
+1
-1
drivers/isdn/hisax/isdnl1.c
drivers/isdn/hisax/isdnl1.c
+1
-1
drivers/isdn/hisax/isdnl1.h
drivers/isdn/hisax/isdnl1.h
+1
-1
drivers/isdn/i4l/Kconfig
drivers/isdn/i4l/Kconfig
+1
-1
drivers/isdn/i4l/isdn_net_lib.c
drivers/isdn/i4l/isdn_net_lib.c
+1
-0
drivers/isdn/i4l/isdn_ppp.c
drivers/isdn/i4l/isdn_ppp.c
+1
-1
drivers/isdn/i4l/isdn_ppp_mp.c
drivers/isdn/i4l/isdn_ppp_mp.c
+3
-2
drivers/isdn/i4l/isdn_ppp_mp.h
drivers/isdn/i4l/isdn_ppp_mp.h
+3
-3
No files found.
drivers/isdn/hardware/avm/b1pci.c
View file @
2466d3f5
...
...
@@ -343,12 +343,16 @@ static int __devinit b1pci_pci_probe(struct pci_dev *pdev,
static
void
__devexit
b1pci_pci_remove
(
struct
pci_dev
*
pdev
)
{
#ifdef CONFIG_ISDN_DRV_AVMB1_B1PCIV4
avmcard
*
card
=
pci_get_drvdata
(
pdev
);
if
(
card
->
dma
)
b1pciv4_remove
(
pdev
);
else
b1pci_remove
(
pdev
);
#else
b1pci_remove
(
pdev
);
#endif
}
static
struct
pci_driver
b1pci_pci_driver
=
{
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/hisax/config.c
View file @
2466d3f5
...
...
@@ -703,16 +703,16 @@ int jiftime(char *s, long mark)
return
8
;
}
static
u8
tmpbuf
[
HISAX_STATUS_BUFSIZE
];
static
char
tmpbuf
[
HISAX_STATUS_BUFSIZE
];
void
VHiSax_putstatus
(
struct
IsdnCardState
*
cs
,
char
*
head
,
char
*
fmt
,
void
VHiSax_putstatus
(
struct
IsdnCardState
*
cs
,
char
*
head
,
c
onst
c
har
*
fmt
,
va_list
args
)
{
/* if head == NULL the fmt contains the full info */
unsigned
long
flags
;
int
count
,
i
;
u8
*
p
;
char
*
p
;
isdn_ctrl
ic
;
int
len
;
...
...
@@ -727,7 +727,7 @@ void VHiSax_putstatus(struct IsdnCardState *cs, char *head, char *fmt,
len
=
p
-
tmpbuf
;
p
=
tmpbuf
;
}
else
{
p
=
fmt
;
p
=
(
char
*
)
fmt
;
len
=
strlen
(
fmt
);
}
if
(
!
cs
)
{
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/hisax/hisax.h
View file @
2466d3f5
...
...
@@ -1402,7 +1402,7 @@ int jiftime(char *s, long mark);
int
HiSax_command
(
isdn_ctrl
*
ic
);
int
HiSax_writebuf_skb
(
int
id
,
int
chan
,
int
ack
,
struct
sk_buff
*
skb
);
void
HiSax_putstatus
(
struct
IsdnCardState
*
cs
,
char
*
head
,
char
*
fmt
,
...);
void
VHiSax_putstatus
(
struct
IsdnCardState
*
cs
,
char
*
head
,
char
*
fmt
,
va_list
args
);
void
VHiSax_putstatus
(
struct
IsdnCardState
*
cs
,
char
*
head
,
c
onst
c
har
*
fmt
,
va_list
args
);
void
HiSax_reportcard
(
int
cardnr
,
int
sel
);
int
QuickHex
(
char
*
txt
,
u8
*
p
,
int
cnt
);
void
LogFrame
(
struct
IsdnCardState
*
cs
,
u8
*
p
,
int
size
);
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/hisax/hisax_fcclassic.c
View file @
2466d3f5
...
...
@@ -231,7 +231,7 @@ fcclassic_setup(struct fritz_adapter *adapter)
adapter
->
isac
.
write_isac
=
&
fcclassic_write_isac
;
adapter
->
isac
.
read_isac_fifo
=
&
fcclassic_read_isac_fifo
;
adapter
->
isac
.
write_isac_fifo
=
&
fcclassic_write_isac_fifo
;
isac_setup
(
&
adapter
->
isac
);
hisax_
isac_setup
(
&
adapter
->
isac
);
for
(
i
=
0
;
i
<
2
;
i
++
)
{
hscx_init
(
&
adapter
->
hscx
[
i
]);
adapter
->
hscx
[
i
].
priv
=
adapter
;
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/hisax/hisax_fcpcipnp.c
View file @
2466d3f5
...
...
@@ -46,24 +46,22 @@ MODULE_PARM(debug, "i");
MODULE_AUTHOR
(
"Kai Germaschewski <kai.germaschewski@gmx.de>/Karsten Keil <kkeil@suse.de>"
);
MODULE_DESCRIPTION
(
"AVM Fritz!PCI/PnP ISDN driver"
);
// FIXME temporary hack until I sort out the new PnP stuff
#define __ISAPNP__
static
struct
pci_device_id
fcpci_ids
[]
__devinitdata
=
{
{
PCI_VENDOR_ID_AVM
,
PCI_DEVICE_ID_AVM_A1
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
(
unsigned
long
)
"Fritz!Card PCI"
},
{
PCI_VENDOR_ID_AVM
,
PCI_DEVICE_ID_AVM_A1_V2
,
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
(
unsigned
long
)
"Fritz!Card PCI v2"
},
{
}
{
.
vendor
=
PCI_VENDOR_ID_AVM
,
.
device
=
PCI_DEVICE_ID_AVM_A1
,
.
subvendor
=
PCI_ANY_ID
,
.
subdevice
=
PCI_ANY_ID
,
.
driver_data
=
(
unsigned
long
)
"Fritz!Card PCI"
,
},
{
.
vendor
=
PCI_VENDOR_ID_AVM
,
.
device
=
PCI_DEVICE_ID_AVM_A1_V2
,
.
subvendor
=
PCI_ANY_ID
,
.
subdevice
=
PCI_ANY_ID
,
.
driver_data
=
(
unsigned
long
)
"Fritz!Card PCI v2"
},
{}
};
MODULE_DEVICE_TABLE
(
pci
,
fcpci_ids
);
static
struct
pnp_card_device_id
fcpnp_ids
[]
__devinitdata
=
{
{
.
id
=
"AVM0900"
,
.
driver_data
=
(
unsigned
long
)
"Fritz!Card PnP"
,
.
devs
=
{
{
"AVM0900"
}
}
}
};
MODULE_DEVICE_TABLE
(
pnp_card
,
fcpnp_ids
);
MODULE_DEVICE_TABLE
(
pci
,
fcpci_ids
);
static
int
protocol
=
2
;
/* EURO-ISDN Default */
MODULE_PARM
(
protocol
,
"i"
);
...
...
@@ -782,7 +780,7 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)
case
AVM_FRITZ_PCI
:
case
AVM_FRITZ_PNP
:
fcpci_init
(
adapter
);
isac_setup
(
&
adapter
->
isac
);
hisax_
isac_setup
(
&
adapter
->
isac
);
break
;
}
val
=
adapter
->
read_hdlc_status
(
adapter
,
0
);
...
...
@@ -908,10 +906,10 @@ static struct pci_driver fcpci_driver = {
.
id_table
=
fcpci_ids
,
};
#ifdef
__ISAPNP__
#ifdef
CONFIG_PNP_CARD
static
int
__devinit
fcpnp_probe
(
struct
pnp_card
*
card
,
const
struct
pnp_card_
device_
id
*
card_id
)
const
struct
pnp_card_id
*
card_id
)
{
struct
fritz_adapter
*
adapter
;
struct
pnp_dev
*
pnp_dev
;
...
...
@@ -957,6 +955,14 @@ static void __devexit fcpnp_remove(struct pnp_card *pcard)
delete_adapter
(
adapter
);
}
static
struct
pnp_card_id
fcpnp_ids
[]
__devinitdata
=
{
{
.
id
=
"AVM0900"
,
.
driver_data
=
(
unsigned
long
)
"Fritz!Card PnP"
,
.
devs
=
{
{
"AVM0900"
}
},
},
{}
};
static
struct
pnpc_driver
fcpnp_driver
=
{
.
name
=
"fcpnp"
,
.
probe
=
fcpnp_probe
,
...
...
@@ -968,7 +974,7 @@ static struct pnpc_driver fcpnp_driver = {
static
int
__init
hisax_fcpcipnp_init
(
void
)
{
int
retval
,
pci_nr_found
;
int
retval
=
0
,
pci_nr_found
;
printk
(
KERN_INFO
"hisax_fcpcipnp: Fritz!Card PCI/PCIv2/PnP ISDN driver v0.0.1
\n
"
);
...
...
@@ -977,10 +983,8 @@ static int __init hisax_fcpcipnp_init(void)
goto
out
;
pci_nr_found
=
retval
;
#ifdef
__ISAPNP__
#ifdef
CONFIG_PNP_CARD
retval
=
pnpc_register_driver
(
&
fcpnp_driver
);
#else
retval
=
0
;
#endif
if
(
retval
<
0
)
goto
out_unregister_pci
;
...
...
@@ -988,14 +992,14 @@ static int __init hisax_fcpcipnp_init(void)
#if !defined(CONFIG_HOTPLUG) || defined(MODULE)
if
(
pci_nr_found
+
retval
==
0
)
{
retval
=
-
ENODEV
;
goto
out_unregister_
isa
pnp
;
goto
out_unregister_pnp
;
}
#endif
return
0
;
#if !defined(CONFIG_HOTPLUG) || defined(MODULE)
out_unregister_
isa
pnp:
#ifdef
__ISAPNP__
out_unregister_pnp:
#ifdef
CONFIG_PNP_CARD
pnpc_unregister_driver
(
&
fcpnp_driver
);
#endif
#endif
...
...
@@ -1007,7 +1011,7 @@ static int __init hisax_fcpcipnp_init(void)
static
void
__exit
hisax_fcpcipnp_exit
(
void
)
{
#ifdef
__ISAPNP__
#ifdef
CONFIG_PNP_CARD
pnpc_unregister_driver
(
&
fcpnp_driver
);
#endif
pci_unregister_driver
(
&
fcpci_driver
);
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/hisax/hisax_isac.c
View file @
2466d3f5
...
...
@@ -770,7 +770,7 @@ void isac_init(struct isac *isac)
FsmInitTimer
(
&
isac
->
l1m
,
&
isac
->
timer
);
}
void
isac_setup
(
struct
isac
*
isac
)
void
hisax_
isac_setup
(
struct
isac
*
isac
)
{
int
val
,
eval
;
...
...
@@ -890,7 +890,7 @@ EXPORT_SYMBOL(isac_d_l2l1);
EXPORT_SYMBOL
(
isacsx_setup
);
EXPORT_SYMBOL
(
isacsx_irq
);
EXPORT_SYMBOL
(
isac_setup
);
EXPORT_SYMBOL
(
hisax_
isac_setup
);
EXPORT_SYMBOL
(
isac_irq
);
module_init
(
hisax_isac_init
);
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/hisax/hisax_isac.h
View file @
2466d3f5
...
...
@@ -36,7 +36,7 @@ struct isac {
void
isac_init
(
struct
isac
*
isac
);
void
isac_d_l2l1
(
struct
hisax_if
*
hisax_d_if
,
int
pr
,
void
*
arg
);
void
isac_setup
(
struct
isac
*
isac
);
void
hisax_
isac_setup
(
struct
isac
*
isac
);
void
isac_irq
(
struct
isac
*
isac
);
void
isacsx_setup
(
struct
isac
*
isac
);
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/hisax/isdnl1.c
View file @
2466d3f5
...
...
@@ -126,7 +126,7 @@ static char *strL1Event[] =
};
void
debugl1
(
struct
IsdnCardState
*
cs
,
char
*
fmt
,
...)
debugl1
(
struct
IsdnCardState
*
cs
,
c
onst
c
har
*
fmt
,
...)
{
va_list
args
;
char
tmp
[
8
];
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/hisax/isdnl1.h
View file @
2466d3f5
...
...
@@ -28,7 +28,7 @@
#define B_LL_CONNECT 9
#define B_LL_OK 10
extern
void
debugl1
(
struct
IsdnCardState
*
cs
,
char
*
fmt
,
...);
extern
void
debugl1
(
struct
IsdnCardState
*
cs
,
c
onst
c
har
*
fmt
,
...);
extern
void
DChannel_proc_xmt
(
struct
IsdnCardState
*
cs
);
extern
void
DChannel_proc_rcv
(
struct
IsdnCardState
*
cs
);
extern
void
l1_msg
(
struct
IsdnCardState
*
cs
,
int
pr
,
void
*
arg
);
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/i4l/Kconfig
View file @
2466d3f5
...
...
@@ -85,7 +85,7 @@ config ISDN_TTY_FAX
config
ISDN_X25
bool
"X.25 PLP on top of ISDN"
depends
on
X25
depends
on
X25
&&
BROKEN
help
This
feature
provides
the
X
.25
protocol
over
ISDN
connections
.
See
<
file
:
Documentation
/
isdn
/
README
.
x25
>
for
more
information
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/i4l/isdn_net_lib.c
View file @
2466d3f5
...
...
@@ -58,6 +58,7 @@
#include "isdn_net.h"
#include "isdn_ppp.h"
#include "isdn_ciscohdlck.h"
#include "isdn_concap.h"
#define ISDN_NET_TX_TIMEOUT (20*HZ)
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/i4l/isdn_ppp.c
View file @
2466d3f5
...
...
@@ -1037,7 +1037,7 @@ isdn_ppp_start_xmit(struct sk_buff *skb, struct net_device *ndev)
isdn_ppp_frame_log
(
"xmit1"
,
skb
->
data
,
skb
->
len
,
32
,
ipppd
->
unit
,
-
1
);
ippp_push_proto
(
ind_ppp
,
skb
,
proto
);
ippp_mp_xmit
(
idev
,
skb
,
proto
);
ippp_mp_xmit
(
idev
,
skb
);
return
0
;
drop:
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/i4l/isdn_ppp_mp.c
View file @
2466d3f5
...
...
@@ -91,12 +91,13 @@ ippp_mp_disconnected(isdn_net_dev *idev)
}
void
ippp_mp_xmit
(
isdn_net_dev
*
idev
,
struct
sk_buff
*
skb
,
u16
proto
)
ippp_mp_xmit
(
isdn_net_dev
*
idev
,
struct
sk_buff
*
skb
)
{
struct
ind_ppp
*
ind_ppp
=
idev
->
ind_priv
;
struct
inl_ppp
*
inl_ppp
=
idev
->
mlp
->
inl_priv
;
unsigned
char
*
p
;
long
txseq
;
u32
txseq
;
u16
proto
;
if
(
!
(
inl_ppp
->
mp_cfg
&
SC_MP_PROT
))
{
return
ippp_xmit
(
idev
,
skb
);
...
...
This diff is collapsed.
Click to expand it.
drivers/isdn/i4l/isdn_ppp_mp.h
View file @
2466d3f5
...
...
@@ -19,7 +19,7 @@
int
ippp_mp_bind
(
isdn_net_dev
*
idev
);
void
ippp_mp_disconnected
(
isdn_net_dev
*
idev
);
int
ippp_mp_bundle
(
isdn_net_dev
*
idev
,
int
val
);
void
ippp_mp_xmit
(
isdn_net_dev
*
idev
,
struct
sk_buff
*
skb
,
u16
proto
);
void
ippp_mp_xmit
(
isdn_net_dev
*
idev
,
struct
sk_buff
*
skb
);
void
ippp_mp_receive
(
isdn_net_dev
*
idev
,
struct
sk_buff
*
skb
,
u16
proto
);
#else
...
...
@@ -42,9 +42,9 @@ ippp_mp_bundle(isdn_net_dev *idev, int val)
}
static
inline
void
ippp_mp_xmit
(
isdn_net_dev
*
idev
,
struct
sk_buff
*
skb
,
u16
proto
)
ippp_mp_xmit
(
isdn_net_dev
*
idev
,
struct
sk_buff
*
skb
)
{
ippp_xmit
(
idev
,
skb
,
proto
);
ippp_xmit
(
idev
,
skb
);
}
static
inline
void
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment