Commit 7c6fc5d0 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.isdn

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents a99dcd86 a01be2d5
...@@ -161,6 +161,10 @@ CONFIG_HISAX_NI1 ...@@ -161,6 +161,10 @@ CONFIG_HISAX_NI1
Enable this if you like to use ISDN in US on a NI1 basic rate Enable this if you like to use ISDN in US on a NI1 basic rate
interface. interface.
CONFIG_HISAX_MAX_CARDS
This option allows you to specify the maximum number of cards which
the HiSax driver will be able to handle.
CONFIG_HISAX_16_0 CONFIG_HISAX_16_0
This enables HiSax support for the Teles ISDN-cards S0-16.0, S0-8 This enables HiSax support for the Teles ISDN-cards S0-16.0, S0-8
and many compatibles. and many compatibles.
......
...@@ -84,6 +84,7 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then ...@@ -84,6 +84,7 @@ if [ "$CONFIG_ISDN_DRV_HISAX" != "n" ]; then
dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)' CONFIG_HISAX_ST5481 $CONFIG_HISAX $CONFIG_USB $CONFIG_EXPERIMENTAL dep_tristate 'ST5481 USB ISDN modem (EXPERIMENTAL)' CONFIG_HISAX_ST5481 $CONFIG_HISAX $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate 'AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP $CONFIG_HISAX $CONFIG_EXPERIMENTAL dep_tristate 'AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_PCIPNP $CONFIG_HISAX $CONFIG_EXPERIMENTAL
dep_tristate 'AVM Fritz!Card classic support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_CLASSIC $CONFIG_HISAX $CONFIG_EXPERIMENTAL dep_tristate 'AVM Fritz!Card classic support (EXPERIMENTAL)' CONFIG_HISAX_FRITZ_CLASSIC $CONFIG_HISAX $CONFIG_EXPERIMENTAL
dep_tristate 'HFC PCI support (EXPERIMENTAL)' CONFIG_HISAX_HFCPCI $CONFIG_HISAX $CONFIG_EXPERIMENTAL
fi fi
endmenu endmenu
......
...@@ -64,6 +64,7 @@ obj-$(CONFIG_HISAX_ELSA_CS) += elsa_cs.o ...@@ -64,6 +64,7 @@ obj-$(CONFIG_HISAX_ELSA_CS) += elsa_cs.o
obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o
obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o
obj-$(CONFIG_HISAX_FRITZ_CLASSIC) += hisax_isac.o hisax_hscx.o hisax_fcclassic.o obj-$(CONFIG_HISAX_FRITZ_CLASSIC) += hisax_isac.o hisax_hscx.o hisax_fcclassic.o
obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_hfcpci.o
CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?) CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?)
CFLAGS_cert.o := -DCERTIFICATION=$(CERT) CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
......
This diff is collapsed.
#include "hisax_if.h"
#include "hisax_isac.h"
#include <linux/pci.h>
struct hfcpci_bcs {
struct hisax_b_if b_if;
struct hfcpci_adapter *adapter;
int mode;
int channel;
int last_fcnt;
struct sk_buff *tx_skb;
};
struct hfcpci_adapter {
struct hisax_d_if d_if;
spinlock_t hw_lock;
unsigned int irq;
void *mmio;
u8 *fifo;
dma_addr_t fifo_dma;
struct FsmInst l1m;
struct FsmTimer timer;
struct sk_buff *tx_skb;
int last_fcnt;
u8 int_m1, int_m2;
u8 fifo_en;
u8 trm;
u8 sctrl, sctrl_r, sctrl_e;
u8 nt_mode;
u8 ctmt;
u8 mst_m;
u8 conn;
u8 bswapped;
struct hfcpci_bcs bcs[2];
};
...@@ -416,7 +416,7 @@ st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev, ...@@ -416,7 +416,7 @@ st5481_setup_isocpipes(struct urb* urb[2], struct usb_device *dev,
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
retval = -ENOMEM; retval = -ENOMEM;
urb[j] = usb_alloc_urb(num_packet, GFP_KERNEL); urb[j] = usb_alloc_urb(num_packets, GFP_KERNEL);
if (!urb[j]) if (!urb[j])
goto err; goto err;
......
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