git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
gazel.c
diff --git
a/drivers/isdn/hisax/gazel.c
b/drivers/isdn/hisax/gazel.c
index
24a05a4
..
3efa719
100644
(file)
--- a/
drivers/isdn/hisax/gazel.c
+++ b/
drivers/isdn/hisax/gazel.c
@@
-11,7
+11,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
@@
-21,7
+20,7
@@
#include <linux/pci.h>
extern const char *CardType[];
#include <linux/pci.h>
extern const char *CardType[];
-const char *gazel_revision = "$Revision: 2.19.2.4 $";
+
static
const char *gazel_revision = "$Revision: 2.19.2.4 $";
#define R647 1
#define R685 2
#define R647 1
#define R685 2
@@
-244,7
+243,7
@@
WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)
#include "hscx_irq.c"
static irqreturn_t
#include "hscx_irq.c"
static irqreturn_t
-gazel_interrupt(int intno, void *dev_id
, struct pt_regs *regs
)
+gazel_interrupt(int intno, void *dev_id)
{
#define MAXCOUNT 5
struct IsdnCardState *cs = dev_id;
{
#define MAXCOUNT 5
struct IsdnCardState *cs = dev_id;
@@
-275,7
+274,7
@@
gazel_interrupt(int intno, void *dev_id, struct pt_regs *regs)
static irqreturn_t
static irqreturn_t
-gazel_interrupt_ipac(int intno, void *dev_id
, struct pt_regs *regs
)
+gazel_interrupt_ipac(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char ista, val;
{
struct IsdnCardState *cs = dev_id;
u_char ista, val;
@@
-317,7
+316,8
@@
gazel_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs)
spin_unlock_irqrestore(&cs->lock, flags);
return IRQ_HANDLED;
}
spin_unlock_irqrestore(&cs->lock, flags);
return IRQ_HANDLED;
}
-void
+
+static void
release_io_gazel(struct IsdnCardState *cs)
{
unsigned int i;
release_io_gazel(struct IsdnCardState *cs)
{
unsigned int i;
@@
-484,7
+484,7
@@
reserve_regions(struct IsdnCard *card, struct IsdnCardState *cs)
return 1;
}
return 1;
}
-static int __init
+static int __
dev
init
setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
{
printk(KERN_INFO "Gazel: ISA PnP card automatic recognition\n");
setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
{
printk(KERN_INFO "Gazel: ISA PnP card automatic recognition\n");
@@
-532,9
+532,9
@@
setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs)
return (0);
}
return (0);
}
-static struct pci_dev *dev_tel __initdata = NULL;
+static struct pci_dev *dev_tel __
dev
initdata = NULL;
-static int __init
+static int __
dev
init
setup_gazelpci(struct IsdnCardState *cs)
{
u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0;
setup_gazelpci(struct IsdnCardState *cs)
{
u_int pci_ioaddr0 = 0, pci_ioaddr1 = 0;
@@
-545,8
+545,9
@@
setup_gazelpci(struct IsdnCardState *cs)
found = 0;
seekcard = PCI_DEVICE_ID_PLX_R685;
found = 0;
seekcard = PCI_DEVICE_ID_PLX_R685;
- for (nbseek = 0; nbseek < 3; nbseek++) {
- if ((dev_tel = pci_find_device(PCI_VENDOR_ID_PLX, seekcard, dev_tel))) {
+ for (nbseek = 0; nbseek < 4; nbseek++) {
+ if ((dev_tel = pci_find_device(PCI_VENDOR_ID_PLX,
+ seekcard, dev_tel))) {
if (pci_enable_device(dev_tel))
return 1;
pci_irq = dev_tel->irq;
if (pci_enable_device(dev_tel))
return 1;
pci_irq = dev_tel->irq;
@@
-564,6
+565,9
@@
setup_gazelpci(struct IsdnCardState *cs)
case PCI_DEVICE_ID_PLX_R753:
seekcard = PCI_DEVICE_ID_PLX_DJINN_ITOO;
break;
case PCI_DEVICE_ID_PLX_R753:
seekcard = PCI_DEVICE_ID_PLX_DJINN_ITOO;
break;
+ case PCI_DEVICE_ID_PLX_DJINN_ITOO:
+ seekcard = PCI_DEVICE_ID_PLX_OLITEC;
+ break;
}
}
}
}
}
}
@@
-588,7
+592,7
@@
setup_gazelpci(struct IsdnCardState *cs)
cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0];
cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1];
cs->irq = pci_irq;
cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0];
cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1];
cs->irq = pci_irq;
- cs->irq_flags |=
SA_SHIRQ
;
+ cs->irq_flags |=
IRQF_SHARED
;
switch (seekcard) {
case PCI_DEVICE_ID_PLX_R685:
switch (seekcard) {
case PCI_DEVICE_ID_PLX_R685:
@@
-604,6
+608,7
@@
setup_gazelpci(struct IsdnCardState *cs)
break;
case PCI_DEVICE_ID_PLX_R753:
case PCI_DEVICE_ID_PLX_DJINN_ITOO:
break;
case PCI_DEVICE_ID_PLX_R753:
case PCI_DEVICE_ID_PLX_DJINN_ITOO:
+ case PCI_DEVICE_ID_PLX_OLITEC:
printk(KERN_INFO "Gazel: Card PCI R753 found\n");
cs->subtyp = R753;
test_and_set_bit(HW_IPAC, &cs->HW_Flags);
printk(KERN_INFO "Gazel: Card PCI R753 found\n");
cs->subtyp = R753;
test_and_set_bit(HW_IPAC, &cs->HW_Flags);
@@
-616,7
+621,7
@@
setup_gazelpci(struct IsdnCardState *cs)
return (0);
}
return (0);
}
-int __init
+int __
dev
init
setup_gazel(struct IsdnCard *card)
{
struct IsdnCardState *cs = card->cs;
setup_gazel(struct IsdnCard *card)
{
struct IsdnCardState *cs = card->cs;