There are really only two patches: add atmsar stuff into
speedtouch.c; and update the Makefile. The other changes
are: delete atmsar.c and atmsar.h, rename speedtouch.c to
speedtch.c. If you prefer to do the deleting and renaming
by hand, I could send you patches that only modify
speedtouch.c and the Makefile.
b/drivers/usb/misc/Makefile | 2
b/drivers/usb/misc/speedtch.c | 1514 ++++++++++++++++++++++++++++++++++++++++++
drivers/usb/misc/atmsar.c | 380 ----------
drivers/usb/misc/atmsar.h | 87 --
drivers/usb/misc/speedtouch.c | 1216 ---------------------------------
5 files changed, 1514 insertions(+), 1685 deletions(-)
diff -Nru a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
--- a/drivers/usb/misc/Makefile Tue Mar 18 12:15:55 2003
+++ b/drivers/usb/misc/Makefile Tue Mar 18 12:15:55 2003
@@ -12,5 +12,3 @@
obj-$(CONFIG_USB_TEST) += usbtest.o
obj-$(CONFIG_USB_TIGL) += tiglusb.o
obj-$(CONFIG_USB_USS720) += uss720.o
-
-speedtch-objs := speedtouch.o atmsar.o
diff -Nru a/drivers/usb/misc/atmsar.c b/drivers/usb/misc/atmsar.c
--- a/drivers/usb/misc/atmsar.c Tue Mar 18 12:15:55 2003
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,380 +0,0 @@
-/******************************************************************************
- * atmsar.c -- General SAR library for ATM devices.
- *
- * Copyright (C) 2000, Johan Verrept
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- ******************************************************************************/
-
-/*
- * Written by Johan Verrept ([EMAIL PROTECTED])
- *
- * 0.2.4A: - Version for inclusion in 2.5 series kernel
- * - Modifications by Richard Purdie ([EMAIL PROTECTED])
- * - replaced "sarlib" with "atmsar"
- * - adaptations for inclusion in kernel tree
- *
- * 0.2.4: - Fixed wrong buffer overrun check in atmsar_decode_rawcell()
- * reported by Stephen Robinson <[EMAIL PROTECTED]>
- * - Fixed bug when input skb did not contain a multple of 52/53
- * bytes (would happen when the speedtouch device resynced)
- * also reported by Stephen Robinson <[EMAIL PROTECTED]>
- *
- * 0.2.3: - Fixed wrong allocation size. caused memory corruption in some
- * cases. Reported by Vladimir Dergachev <[EMAIL PROTECTED]>
- * - Added some comments
- *
- * 0.2.2: - Fixed CRCASM
- * patch from Linus Flannagan <[EMAIL PROTECTED]>
- * - Fixed problem when user did NOT use the
- * ATMSAR_USE_53BYTE_CELL flag.
- * reported by Piers Scannell <[EMAIL PROTECTED]>
- * - No more in-buffer rewriting for cloned buffers.
- * - Removed the PII specific CFLAGS in the Makefile.
- *
- * 0.2.1: - removed dependency on alloc_tx. tis presented problems when
- * using this with the br2684 code.
- *
- * 0.2: - added AAL0 reassembly
- * - added alloc_tx support
- * - replaced alloc_skb in decode functions to dev_alloc_skb to
- * allow calling from interrupt
- * - fixed embarassing AAL5 bug. I was setting the pti bit in the
- * wrong byte...
- * - fixed another emabrassing bug.. picked up the wrong crc type
- * and forgot to invert the crc result...
- * - fixed AAL5 length calculations.
- * - removed automatic skb freeing from encode functions.
- * This caused problems because i did kfree_skb it, while it
- * needed to be popped. I cannot determine though whether it
- * needs to be popped or not. Figu'e it out ye'self ;-)
- * - added mru field. This is the buffersize. atmsar_decode_aal0
- * will use when it allocates a receive buffer. A stop gap for
- * real buffer management.
- *
- * 0.1: - library created.
- * - only contains AAL5, AAL0 can be easily added. (actually, only
- * AAL0 reassembly is missing)
- *
- */
-
-#include <linux/crc32.h>
-#include "atmsar.h"
-
-/***********************
- **
- ** things to remember
- **
- ***********************/
-
-/*
- 1. the atmsar_vcc_data list pointer MUST be initialized to NULL
- 2. atmsar_encode_rawcell will drop incomplete cells.
- 3. ownership of the skb goes to the library !
-*/
-
-#define ATM_HDR_VPVC_MASK (ATM_HDR_VPI_MASK | ATM_HDR_VCI_MASK)
-
-/***********************
- **
- ** LOCAL STRUCTURES
- **
- ***********************/
-
-/***********************
- **
- ** LOCAL MACROS
- **
- ***********************/
-/*
-#define DEBUG 1
-*/
-#ifdef DEBUG
-#define PDEBUG(arg...) printk(KERN_DEBUG "atmsar: " arg)
-#else
-#define PDEBUG(arg...)
-#endif
-
-#define ADD_HEADER(dest, header) \
- *dest++ = (unsigned char) (header >> 24); \
- *dest++ = (unsigned char) (header >> 16); \
- *dest++ = (unsigned char) (header >> 8); \
- *dest++ = (unsigned char) (header & 0xff);
-
-
-struct atmsar_vcc_data *atmsar_open (struct atmsar_vcc_data **list, struct atm_vcc
*vcc, uint type,
- ushort vpi, ushort vci, unchar pti, unchar gfc,
uint flags)
-{
- struct atmsar_vcc_data *new;
-
- if (!vcc)
- return NULL;
-
- new = kmalloc (sizeof (struct atmsar_vcc_data), GFP_KERNEL);
-
- if (!new)
- return NULL;
-
- memset (new, 0, sizeof (struct atmsar_vcc_data));
- new->vcc = vcc;
- new->stats = vcc->stats;
- new->type = type;
- new->next = NULL;
- new->gfc = gfc;
- new->vp = vpi;
- new->vc = vci;
- new->pti = pti;
-
- switch (type) {
- case ATMSAR_TYPE_AAL0:
- new->mtu = ATMSAR_DEF_MTU_AAL0;
- break;
- case ATMSAR_TYPE_AAL1:
- new->mtu = ATMSAR_DEF_MTU_AAL1;
- break;
- case ATMSAR_TYPE_AAL2:
- new->mtu = ATMSAR_DEF_MTU_AAL2;
- break;
- case ATMSAR_TYPE_AAL34:
- /* not supported */
- new->mtu = ATMSAR_DEF_MTU_AAL34;
- break;
- case ATMSAR_TYPE_AAL5:
- new->mtu = ATMSAR_DEF_MTU_AAL5;
- break;
- }
-
- new->atmHeader = ((unsigned long) gfc << ATM_HDR_GFC_SHIFT)
- | ((unsigned long) vpi << ATM_HDR_VPI_SHIFT)
- | ((unsigned long) vci << ATM_HDR_VCI_SHIFT)
- | ((unsigned long) pti << ATM_HDR_PTI_SHIFT);
- new->flags = flags;
- new->next = NULL;
- new->reasBuffer = NULL;
-
- new->next = *list;
- *list = new;
-
- PDEBUG ("Allocated new SARLib vcc 0x%p with vp %d vc %d\n", new, vpi, vci);
-
- return new;
-}
-
-void atmsar_close (struct atmsar_vcc_data **list, struct atmsar_vcc_data *vcc)
-{
- struct atmsar_vcc_data *work;
-
- if (*list == vcc) {
- *list = (*list)->next;
- } else {
- for (work = *list; work && work->next && (work->next != vcc); work =
work->next);
-
- /* return if not found */
- if (work->next != vcc)
- return;
-
- work->next = work->next->next;
- }
-
- if (vcc->reasBuffer) {
- dev_kfree_skb (vcc->reasBuffer);
- }
-
- PDEBUG ("Allocated SARLib vcc 0x%p with vp %d vc %d\n", vcc, vcc->vp, vcc->vc);
-
- kfree (vcc);
-}
-
-
-/***********************
- **
- ** DECODE FUNCTIONS
- **
- ***********************/
-
-struct sk_buff *atmsar_decode_rawcell (struct atmsar_vcc_data *list, struct sk_buff
*skb,
- struct atmsar_vcc_data **ctx)
-{
- while (skb->len) {
- unsigned char *cell = skb->data;
- unsigned char *cell_payload;
- struct atmsar_vcc_data *vcc = list;
- unsigned long atmHeader =
- ((unsigned long) (cell[0]) << 24) | ((unsigned long) (cell[1]) <<
16) |
- ((unsigned long) (cell[2]) << 8) | (cell[3] & 0xff);
-
- PDEBUG ("atmsar_decode_rawcell (0x%p, 0x%p, 0x%p) called\n", list,
skb, ctx);
- PDEBUG ("atmsar_decode_rawcell skb->data %p, skb->tail %p\n",
skb->data, skb->tail);
-
- if (!list || !skb || !ctx)
- return NULL;
- if (!skb->data || !skb->tail)
- return NULL;
-
- /* here should the header CRC check be... */
-
- /* look up correct vcc */
- for (;
- vcc
- && ((vcc->atmHeader & ATM_HDR_VPVC_MASK) != (atmHeader &
ATM_HDR_VPVC_MASK));
- vcc = vcc->next);
-
- PDEBUG ("atmsar_decode_rawcell found vcc %p for packet on vp %d, vc
%d\n", vcc,
- (int) ((atmHeader & ATM_HDR_VPI_MASK) >> ATM_HDR_VPI_SHIFT),
- (int) ((atmHeader & ATM_HDR_VCI_MASK) >> ATM_HDR_VCI_SHIFT));
-
- if (vcc && (skb->len >= (vcc->flags & ATMSAR_USE_53BYTE_CELL ? 53 :
52))) {
- cell_payload = cell + (vcc->flags & ATMSAR_USE_53BYTE_CELL ? 5
: 4);
-
- switch (vcc->type) {
- case ATMSAR_TYPE_AAL0:
- /* case ATMSAR_TYPE_AAL1: when we have a decode AAL1
function... */
- {
- struct sk_buff *tmp = dev_alloc_skb (vcc->mtu);
-
- if (tmp) {
- memcpy (tmp->tail, cell_payload, 48);
- skb_put (tmp, 48);
-
- if (vcc->stats)
- atomic_inc (&vcc->stats->rx);
-
- skb_pull (skb,
- (vcc->
- flags &
ATMSAR_USE_53BYTE_CELL ? 53 :
- 52));
- PDEBUG
- ("atmsar_decode_rawcell returns
ATMSAR_TYPE_AAL0 pdu 0x%p with length %d\n",
- tmp, tmp->len);
- return tmp;
- };
- }
- break;
- case ATMSAR_TYPE_AAL1:
- case ATMSAR_TYPE_AAL2:
- case ATMSAR_TYPE_AAL34:
- /* not supported */
- break;
- case ATMSAR_TYPE_AAL5:
- if (!vcc->reasBuffer)
- vcc->reasBuffer = dev_alloc_skb (vcc->mtu);
-
- /* if alloc fails, we just drop the cell. it is
possible that we can still
- * receive cells on other vcc's
- */
- if (vcc->reasBuffer) {
- /* if (buffer overrun) discard received cells
until now */
- if ((vcc->reasBuffer->len) > (vcc->mtu - 48))
- skb_trim (vcc->reasBuffer, 0);
-
- /* copy data */
- memcpy (vcc->reasBuffer->tail, cell_payload,
48);
- skb_put (vcc->reasBuffer, 48);
-
- /* check for end of buffer */
- if (cell[3] & 0x2) {
- struct sk_buff *tmp;
-
- /* the aal5 buffer ends here, cut the
buffer. */
- /* buffer will always have at least
one whole cell, so */
- /* don't need to check return from
skb_pull */
- skb_pull (skb,
- (vcc->
- flags &
ATMSAR_USE_53BYTE_CELL ? 53 :
- 52));
- *ctx = vcc;
- tmp = vcc->reasBuffer;
- vcc->reasBuffer = NULL;
-
- PDEBUG
- ("atmsar_decode_rawcell returns
ATMSAR_TYPE_AAL5 pdu 0x%p with length %d\n",
- tmp, tmp->len);
- return tmp;
- }
- }
- break;
- };
- /* flush the cell */
- /* buffer will always contain at least one whole cell, so
don't */
- /* need to check return value from skb_pull */
- skb_pull (skb, (vcc->flags & ATMSAR_USE_53BYTE_CELL ? 53 :
52));
- } else {
- /* If data is corrupt and skb doesn't hold a whole cell, flush
the lot */
- if (skb_pull (skb, (list->flags & ATMSAR_USE_53BYTE_CELL ? 53
: 52)) ==
- NULL)
- return NULL;
- }
- }
-
- return NULL;
-};
-
-struct sk_buff *atmsar_decode_aal5 (struct atmsar_vcc_data *ctx, struct sk_buff *skb)
-{
- uint crc = 0xffffffff;
- uint length, pdu_crc, pdu_length;
-
- PDEBUG ("atmsar_decode_aal5 (0x%p, 0x%p) called\n", ctx, skb);
-
- if (skb->len && (skb->len % 48))
- return NULL;
-
- length = (skb->tail[-6] << 8) + skb->tail[-5];
- pdu_crc =
- (skb->tail[-4] << 24) + (skb->tail[-3] << 16) + (skb->tail[-2] << 8) +
skb->tail[-1];
- pdu_length = ((length + 47 + 8) / 48) * 48;
-
- PDEBUG ("atmsar_decode_aal5: skb->len = %d, length = %d, pdu_crc = 0x%x,
pdu_length = %d\n",
- skb->len, length, pdu_crc, pdu_length);
-
- /* is skb long enough ? */
- if (skb->len < pdu_length) {
- if (ctx->stats)
- atomic_inc (&ctx->stats->rx_err);
- return NULL;
- }
-
- /* is skb too long ? */
- if (skb->len > pdu_length) {
- PDEBUG ("atmsar_decode_aal5: Warning: readjusting illeagl size %d ->
%d\n",
- skb->len, pdu_length);
- /* buffer is too long. we can try to recover
- * if we discard the first part of the skb.
- * the crc will decide whether this was ok
- */
- skb_pull (skb, skb->len - pdu_length);
- }
-
- crc = ~crc32_be (crc, skb->data, pdu_length - 4);
-
- /* check crc */
- if (pdu_crc != crc) {
- PDEBUG ("atmsar_decode_aal5: crc check failed!\n");
- if (ctx->stats)
- atomic_inc (&ctx->stats->rx_err);
- return NULL;
- }
-
- /* pdu is ok */
- skb_trim (skb, length);
-
- /* update stats */
- if (ctx->stats)
- atomic_inc (&ctx->stats->rx);
-
- PDEBUG ("atmsar_decode_aal5 returns pdu 0x%p with length %d\n", skb, skb->len);
- return skb;
-};
diff -Nru a/drivers/usb/misc/atmsar.h b/drivers/usb/misc/atmsar.h
--- a/drivers/usb/misc/atmsar.h Tue Mar 18 12:15:55 2003
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,87 +0,0 @@
-#ifndef _ATMSAR_H_
-#define _ATMSAR_H_
-
-/******************************************************************************
- * atmsar.h -- General SAR library for ATM devices.
- *
- * Copyright (C) 2000, Johan Verrept
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- ******************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/proc_fs.h>
-#include <linux/slab.h>
-#include <linux/atmdev.h>
-#include <linux/skbuff.h>
-#include <linux/types.h>
-#include <linux/atm.h>
-
-#define ATMSAR_USE_53BYTE_CELL 0x1L
-#define ATMSAR_SET_PTI 0x2L
-
-#define ATM_CELL_HEADER (ATM_CELL_SIZE - ATM_CELL_PAYLOAD)
-
-/* types */
-#define ATMSAR_TYPE_AAL0 ATM_AAL0
-#define ATMSAR_TYPE_AAL1 ATM_AAL1
-#define ATMSAR_TYPE_AAL2 ATM_AAL2
-#define ATMSAR_TYPE_AAL34 ATM_AAL34
-#define ATMSAR_TYPE_AAL5 ATM_AAL5
-
-
-/* default MTU's */
-#define ATMSAR_DEF_MTU_AAL0 48
-#define ATMSAR_DEF_MTU_AAL1 47
-#define ATMSAR_DEF_MTU_AAL2 0 /* not supported */
-#define ATMSAR_DEF_MTU_AAL34 0 /* not supported */
-#define ATMSAR_DEF_MTU_AAL5 65535 /* max mtu .. */
-
-struct atmsar_vcc_data {
- struct atmsar_vcc_data *next;
-
- /* general atmsar flags, per connection */
- int flags;
- int type;
-
- /* connection specific non-atmsar data */
- struct atm_vcc *vcc;
- struct k_atm_aal_stats *stats;
- unsigned short mtu; /* max is actually 65k for AAL5... */
-
- /* cell data */
- unsigned int vp;
- unsigned int vc;
- unsigned char gfc;
- unsigned char pti;
- unsigned int headerFlags;
- unsigned long atmHeader;
-
- /* raw cell reassembly */
- struct sk_buff *reasBuffer;
-};
-
-
-extern struct atmsar_vcc_data *atmsar_open (struct atmsar_vcc_data **list, struct
atm_vcc *vcc,
- uint type, ushort vpi, ushort vci, unchar
pti,
- unchar gfc, uint flags);
-extern void atmsar_close (struct atmsar_vcc_data **list, struct atmsar_vcc_data *vcc);
-
-struct sk_buff *atmsar_decode_rawcell (struct atmsar_vcc_data *list, struct sk_buff
*skb,
- struct atmsar_vcc_data **ctx);
-struct sk_buff *atmsar_decode_aal5 (struct atmsar_vcc_data *ctx, struct sk_buff *skb);
-
-#endif /* _ATMSAR_H_ */
diff -Nru a/drivers/usb/misc/speedtch.c b/drivers/usb/misc/speedtch.c
--- /dev/null Wed Dec 31 16:00:00 1969
+++ b/drivers/usb/misc/speedtch.c Tue Mar 18 12:15:55 2003
@@ -0,0 +1,1514 @@
+/******************************************************************************
+ * speedtouch.c -- Alcatel SpeedTouch USB xDSL modem driver.
+ *
+ * Copyright (C) 2001, Alcatel
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ ******************************************************************************/
+
+/*
+ * Written by Johan Verrept ([EMAIL PROTECTED])
+ *
+ * 1.5A: - Version for inclusion in 2.5 series kernel
+ * - Modifications by Richard Purdie ([EMAIL PROTECTED])
+ * - made compatible with kernel 2.5.6 onwards by changing
+ * udsl_usb_send_data_context->urb to a pointer and adding code
+ * to alloc and free it
+ * - remove_wait_queue() added to udsl_atm_processqueue_thread()
+ *
+ * 1.5: - fixed memory leak when atmsar_decode_aal5 returned NULL.
+ * (reported by [EMAIL PROTECTED])
+ *
+ * 1.4: - changed the spin_lock() under interrupt to spin_lock_irqsave()
+ * - unlink all active send urbs of a vcc that is being closed.
+ *
+ * 1.3.1: - added the version number
+ *
+ * 1.3: - Added multiple send urb support
+ * - fixed memory leak and vcc->tx_inuse starvation bug
+ * when not enough memory left in vcc.
+ *
+ * 1.2: - Fixed race condition in udsl_usb_send_data()
+ * 1.1: - Turned off packet debugging
+ *
+ */
+
+#include <asm/semaphore.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/errno.h>
+#include <linux/proc_fs.h>
+#include <linux/slab.h>
+#include <linux/list.h>
+#include <asm/uaccess.h>
+#include <linux/smp_lock.h>
+#include <linux/interrupt.h>
+#include <linux/atm.h>
+#include <linux/atmdev.h>
+#include <linux/crc32.h>
+
+/*
+#define DEBUG 1
+#define DEBUG_PACKET 1
+*/
+
+#include <linux/usb.h>
+
+
+#ifdef DEBUG_PACKET
+static int udsl_print_packet (const unsigned char *data, int len);
+#define PACKETDEBUG(arg...) udsl_print_packet (arg)
+#else
+#define PACKETDEBUG(arg...)
+#endif
+
+#define DRIVER_AUTHOR "Johan Verrept, [EMAIL PROTECTED]"
+#define DRIVER_DESC "Driver for the Alcatel SpeedTouch USB ADSL modem"
+#define DRIVER_VERSION "1.5A"
+
+#define SPEEDTOUCH_VENDORID 0x06b9
+#define SPEEDTOUCH_PRODUCTID 0x4061
+
+#define UDSL_NUMBER_RCV_URBS 1
+#define UDSL_NUMBER_SND_URBS 1
+#define UDSL_NUMBER_SND_BUFS (2*UDSL_NUMBER_SND_URBS)
+#define UDSL_RCV_BUFFER_SIZE (1*64) /* ATM cells */
+#define UDSL_SND_BUFFER_SIZE (1*64) /* ATM cells */
+/* max should be (1500 IP mtu + 2 ppp bytes + 32 * 5 cellheader overhead) for
+ * PPPoA and (1500 + 14 + 32*5 cellheader overhead) for PPPoE */
+#define UDSL_MAX_AAL5_MRU 2048
+
+#define UDSL_IOCTL_START 1
+#define UDSL_IOCTL_STOP 2
+
+/* endpoint declarations */
+
+#define UDSL_ENDPOINT_DATA_OUT 0x07
+#define UDSL_ENDPOINT_DATA_IN 0x87
+
+#define ATM_CELL_HEADER (ATM_CELL_SIZE - ATM_CELL_PAYLOAD)
+
+#define hex2int(c) ( (c >= '0')&&(c <= '9') ? (c - '0') : ((c & 0xf)+9) )
+
+/* usb_device_id struct */
+
+static struct usb_device_id udsl_usb_ids [] = {
+ { USB_DEVICE (SPEEDTOUCH_VENDORID, SPEEDTOUCH_PRODUCTID) },
+ { } /* Terminating entry */
+};
+
+MODULE_DEVICE_TABLE (usb, udsl_usb_ids);
+
+/* context declarations */
+
+struct udsl_receiver {
+ struct list_head list;
+ struct sk_buff *skb;
+ struct urb *urb;
+ struct udsl_instance_data *instance;
+};
+
+struct udsl_send_buffer {
+ struct list_head list;
+ unsigned char *base;
+ unsigned char *free_start;
+ unsigned int free_cells;
+};
+
+struct udsl_sender {
+ struct list_head list;
+ struct udsl_send_buffer *buffer;
+ struct urb *urb;
+ struct udsl_instance_data *instance;
+};
+
+struct udsl_control {
+ struct atm_skb_data atm_data;
+ unsigned int num_cells;
+ unsigned int num_entire;
+ unsigned char cell_header [ATM_CELL_HEADER];
+ unsigned int pdu_padding;
+ unsigned char aal5_trailer [ATM_AAL5_TRAILER];
+};
+
+#define UDSL_SKB(x) ((struct udsl_control *)(x)->cb)
+
+struct atmsar_vcc_data {
+ struct atmsar_vcc_data *next;
+
+ /* general atmsar flags, per connection */
+ int flags;
+ int type;
+
+ /* connection specific non-atmsar data */
+ struct atm_vcc *vcc;
+ struct k_atm_aal_stats *stats;
+ unsigned short mtu; /* max is actually 65k for AAL5... */
+
+ /* cell data */
+ unsigned int vp;
+ unsigned int vc;
+ unsigned char gfc;
+ unsigned char pti;
+ unsigned int headerFlags;
+ unsigned long atmHeader;
+
+ /* raw cell reassembly */
+ struct sk_buff *reasBuffer;
+};
+
+/*
+ * UDSL main driver data
+ */
+
+struct udsl_instance_data {
+ struct semaphore serialize;
+
+ /* usb device part */
+ struct usb_device *usb_dev;
+ char description [64];
+ int firmware_loaded;
+
+ /* atm device part */
+ struct atm_dev *atm_dev;
+ struct atmsar_vcc_data *atmsar_vcc_list;
+
+ /* receiving */
+ struct udsl_receiver all_receivers [UDSL_NUMBER_RCV_URBS];
+
+ spinlock_t spare_receivers_lock;
+ struct list_head spare_receivers;
+
+ spinlock_t completed_receivers_lock;
+ struct list_head completed_receivers;
+
+ struct tasklet_struct receive_tasklet;
+
+ /* sending */
+ struct udsl_sender all_senders [UDSL_NUMBER_SND_URBS];
+ struct udsl_send_buffer all_buffers [UDSL_NUMBER_SND_BUFS];
+
+ struct sk_buff_head sndqueue;
+
+ spinlock_t send_lock;
+ struct list_head spare_senders;
+ struct list_head spare_buffers;
+
+ struct tasklet_struct send_tasklet;
+ struct sk_buff *current_skb; /* being emptied */
+ struct udsl_send_buffer *current_buffer; /* being filled */
+ struct list_head filled_buffers;
+};
+
+static const char udsl_driver_name [] = "speedtch";
+
+/*
+ * atm driver prototypes and structures
+ */
+
+static void udsl_atm_dev_close (struct atm_dev *dev);
+static int udsl_atm_open (struct atm_vcc *vcc, short vpi, int vci);
+static void udsl_atm_close (struct atm_vcc *vcc);
+static int udsl_atm_ioctl (struct atm_dev *dev, unsigned int cmd, void *arg);
+static int udsl_atm_send (struct atm_vcc *vcc, struct sk_buff *skb);
+static int udsl_atm_proc_read (struct atm_dev *atm_dev, loff_t *pos, char *page);
+
+static struct atmdev_ops udsl_atm_devops = {
+ .dev_close = udsl_atm_dev_close,
+ .open = udsl_atm_open,
+ .close = udsl_atm_close,
+ .ioctl = udsl_atm_ioctl,
+ .send = udsl_atm_send,
+ .proc_read = udsl_atm_proc_read,
+};
+
+/*
+ * usb driver prototypes and structures
+ */
+static int udsl_usb_probe (struct usb_interface *intf,
+ const struct usb_device_id *id);
+static void udsl_usb_disconnect (struct usb_interface *intf);
+static int udsl_usb_ioctl (struct usb_interface *intf, unsigned int code, void
*user_data);
+
+static struct usb_driver udsl_usb_driver = {
+ .name = udsl_driver_name,
+ .probe = udsl_usb_probe,
+ .disconnect = udsl_usb_disconnect,
+ .ioctl = udsl_usb_ioctl,
+ .id_table = udsl_usb_ids,
+};
+
+
+/*************
+** decode **
+*************/
+
+#define ATM_HDR_VPVC_MASK (ATM_HDR_VPI_MASK | ATM_HDR_VCI_MASK)
+#define ATMSAR_USE_53BYTE_CELL 0x1L
+
+struct sk_buff *atmsar_decode_rawcell (struct atmsar_vcc_data *list, struct sk_buff
*skb,
+ struct atmsar_vcc_data **ctx)
+{
+ while (skb->len) {
+ unsigned char *cell = skb->data;
+ unsigned char *cell_payload;
+ struct atmsar_vcc_data *vcc = list;
+ unsigned long atmHeader =
+ ((unsigned long) (cell[0]) << 24) | ((unsigned long) (cell[1]) <<
16) |
+ ((unsigned long) (cell[2]) << 8) | (cell[3] & 0xff);
+
+ dbg ("atmsar_decode_rawcell (0x%p, 0x%p, 0x%p) called", list, skb,
ctx);
+ dbg ("atmsar_decode_rawcell skb->data %p, skb->tail %p", skb->data,
skb->tail);
+
+ if (!list || !skb || !ctx)
+ return NULL;
+ if (!skb->data || !skb->tail)
+ return NULL;
+
+ /* here should the header CRC check be... */
+
+ /* look up correct vcc */
+ for (;
+ vcc
+ && ((vcc->atmHeader & ATM_HDR_VPVC_MASK) != (atmHeader &
ATM_HDR_VPVC_MASK));
+ vcc = vcc->next);
+
+ dbg ("atmsar_decode_rawcell found vcc %p for packet on vp %d, vc %d",
vcc,
+ (int) ((atmHeader & ATM_HDR_VPI_MASK) >> ATM_HDR_VPI_SHIFT),
+ (int) ((atmHeader & ATM_HDR_VCI_MASK) >> ATM_HDR_VCI_SHIFT));
+
+ if (vcc && (skb->len >= (vcc->flags & ATMSAR_USE_53BYTE_CELL ? 53 :
52))) {
+ cell_payload = cell + (vcc->flags & ATMSAR_USE_53BYTE_CELL ? 5
: 4);
+
+ switch (vcc->type) {
+ case ATM_AAL0:
+ /* case ATM_AAL1: when we have a decode AAL1
function... */
+ {
+ struct sk_buff *tmp = dev_alloc_skb (vcc->mtu);
+
+ if (tmp) {
+ memcpy (tmp->tail, cell_payload, 48);
+ skb_put (tmp, 48);
+
+ if (vcc->stats)
+ atomic_inc (&vcc->stats->rx);
+
+ skb_pull (skb,
+ (vcc->
+ flags &
ATMSAR_USE_53BYTE_CELL ? 53 :
+ 52));
+ dbg
+ ("atmsar_decode_rawcell returns
ATM_AAL0 pdu 0x%p with length %d",
+ tmp, tmp->len);
+ return tmp;
+ };
+ }
+ break;
+ case ATM_AAL1:
+ case ATM_AAL2:
+ case ATM_AAL34:
+ /* not supported */
+ break;
+ case ATM_AAL5:
+ if (!vcc->reasBuffer)
+ vcc->reasBuffer = dev_alloc_skb (vcc->mtu);
+
+ /* if alloc fails, we just drop the cell. it is
possible that we can still
+ * receive cells on other vcc's
+ */
+ if (vcc->reasBuffer) {
+ /* if (buffer overrun) discard received cells
until now */
+ if ((vcc->reasBuffer->len) > (vcc->mtu - 48))
+ skb_trim (vcc->reasBuffer, 0);
+
+ /* copy data */
+ memcpy (vcc->reasBuffer->tail, cell_payload,
48);
+ skb_put (vcc->reasBuffer, 48);
+
+ /* check for end of buffer */
+ if (cell[3] & 0x2) {
+ struct sk_buff *tmp;
+
+ /* the aal5 buffer ends here, cut the
buffer. */
+ /* buffer will always have at least
one whole cell, so */
+ /* don't need to check return from
skb_pull */
+ skb_pull (skb,
+ (vcc->
+ flags &
ATMSAR_USE_53BYTE_CELL ? 53 :
+ 52));
+ *ctx = vcc;
+ tmp = vcc->reasBuffer;
+ vcc->reasBuffer = NULL;
+
+ dbg
+ ("atmsar_decode_rawcell returns
ATM_AAL5 pdu 0x%p with length %d",
+ tmp, tmp->len);
+ return tmp;
+ }
+ }
+ break;
+ };
+ /* flush the cell */
+ /* buffer will always contain at least one whole cell, so
don't */
+ /* need to check return value from skb_pull */
+ skb_pull (skb, (vcc->flags & ATMSAR_USE_53BYTE_CELL ? 53 :
52));
+ } else {
+ /* If data is corrupt and skb doesn't hold a whole cell, flush
the lot */
+ if (skb_pull (skb, (list->flags & ATMSAR_USE_53BYTE_CELL ? 53
: 52)) ==
+ NULL)
+ return NULL;
+ }
+ }
+
+ return NULL;
+};
+
+struct sk_buff *atmsar_decode_aal5 (struct atmsar_vcc_data *ctx, struct sk_buff *skb)
+{
+ uint crc = 0xffffffff;
+ uint length, pdu_crc, pdu_length;
+
+ dbg ("atmsar_decode_aal5 (0x%p, 0x%p) called", ctx, skb);
+
+ if (skb->len && (skb->len % 48))
+ return NULL;
+
+ length = (skb->tail[-6] << 8) + skb->tail[-5];
+ pdu_crc =
+ (skb->tail[-4] << 24) + (skb->tail[-3] << 16) + (skb->tail[-2] << 8) +
skb->tail[-1];
+ pdu_length = ((length + 47 + 8) / 48) * 48;
+
+ dbg ("atmsar_decode_aal5: skb->len = %d, length = %d, pdu_crc = 0x%x,
pdu_length = %d",
+ skb->len, length, pdu_crc, pdu_length);
+
+ /* is skb long enough ? */
+ if (skb->len < pdu_length) {
+ if (ctx->stats)
+ atomic_inc (&ctx->stats->rx_err);
+ return NULL;
+ }
+
+ /* is skb too long ? */
+ if (skb->len > pdu_length) {
+ dbg ("atmsar_decode_aal5: Warning: readjusting illeagl size %d -> %d",
+ skb->len, pdu_length);
+ /* buffer is too long. we can try to recover
+ * if we discard the first part of the skb.
+ * the crc will decide whether this was ok
+ */
+ skb_pull (skb, skb->len - pdu_length);
+ }
+
+ crc = ~crc32_be (crc, skb->data, pdu_length - 4);
+
+ /* check crc */
+ if (pdu_crc != crc) {
+ dbg ("atmsar_decode_aal5: crc check failed!");
+ if (ctx->stats)
+ atomic_inc (&ctx->stats->rx_err);
+ return NULL;
+ }
+
+ /* pdu is ok */
+ skb_trim (skb, length);
+
+ /* update stats */
+ if (ctx->stats)
+ atomic_inc (&ctx->stats->rx);
+
+ dbg ("atmsar_decode_aal5 returns pdu 0x%p with length %d", skb, skb->len);
+ return skb;
+};
+
+
+/*************
+** encode **
+*************/
+
+static void udsl_groom_skb (struct atm_vcc *vcc, struct sk_buff *skb) {
+ struct udsl_control *ctrl = UDSL_SKB (skb);
+ unsigned int i, zero_padding;
+ unsigned char zero = 0;
+ u32 crc;
+
+ ctrl->atm_data.vcc = vcc;
+ ctrl->cell_header [0] = vcc->vpi >> 4;
+ ctrl->cell_header [1] = (vcc->vpi << 4) | (vcc->vci >> 12);
+ ctrl->cell_header [2] = vcc->vci >> 4;
+ ctrl->cell_header [3] = vcc->vci << 4;
+ ctrl->cell_header [4] = 0xec;
+
+ ctrl->num_cells = (skb->len + ATM_AAL5_TRAILER + ATM_CELL_PAYLOAD - 1) /
ATM_CELL_PAYLOAD;
+ ctrl->num_entire = skb->len / ATM_CELL_PAYLOAD;
+
+ zero_padding = ctrl->num_cells * ATM_CELL_PAYLOAD - skb->len -
ATM_AAL5_TRAILER;
+
+ if (ctrl->num_entire + 1 < ctrl->num_cells)
+ ctrl->pdu_padding = zero_padding - (ATM_CELL_PAYLOAD -
ATM_AAL5_TRAILER);
+ else
+ ctrl->pdu_padding = zero_padding;
+
+ ctrl->aal5_trailer [0] = 0; /* UU = 0 */
+ ctrl->aal5_trailer [1] = 0; /* CPI = 0 */
+ ctrl->aal5_trailer [2] = skb->len >> 8;
+ ctrl->aal5_trailer [3] = skb->len;
+
+ crc = crc32_be (~0, skb->data, skb->len);
+ for (i = 0; i < zero_padding; i++)
+ crc = crc32_be (crc, &zero, 1);
+ crc = crc32_be (crc, ctrl->aal5_trailer, 4);
+ crc = ~crc;
+
+ ctrl->aal5_trailer [4] = crc >> 24;
+ ctrl->aal5_trailer [5] = crc >> 16;
+ ctrl->aal5_trailer [6] = crc >> 8;
+ ctrl->aal5_trailer [7] = crc;
+}
+
+unsigned int udsl_write_cells (unsigned int howmany, struct sk_buff *skb, unsigned
char **target_p) {
+ struct udsl_control *ctrl = UDSL_SKB (skb);
+ unsigned char *target = *target_p;
+ unsigned int nc, ne, i;
+
+ dbg ("udsl_write_cells: howmany=%u, skb->len=%d, num_cells=%u, num_entire=%u,
pdu_padding=%u", howmany, skb->len, ctrl->num_cells, ctrl->num_entire,
ctrl->pdu_padding);
+
+ nc = ctrl->num_cells;
+ ne = min (howmany, ctrl->num_entire);
+
+ for (i = 0; i < ne; i++) {
+ memcpy (target, ctrl->cell_header, ATM_CELL_HEADER);
+ target += ATM_CELL_HEADER;
+ memcpy (target, skb->data, ATM_CELL_PAYLOAD);
+ target += ATM_CELL_PAYLOAD;
+ __skb_pull (skb, ATM_CELL_PAYLOAD);
+ }
+
+ ctrl->num_entire -= ne;
+
+ if (!(ctrl->num_cells -= ne) || !(howmany -= ne))
+ goto out;
+
+ memcpy (target, ctrl->cell_header, ATM_CELL_HEADER);
+ target += ATM_CELL_HEADER;
+ memcpy (target, skb->data, skb->len);
+ target += skb->len;
+ __skb_pull (skb, skb->len);
+ memset (target, 0, ctrl->pdu_padding);
+ target += ctrl->pdu_padding;
+
+ if (--ctrl->num_cells) {
+ if (!--howmany) {
+ ctrl->pdu_padding = ATM_CELL_PAYLOAD - ATM_AAL5_TRAILER;
+ goto out;
+ }
+
+ memcpy (target, ctrl->cell_header, ATM_CELL_HEADER);
+ target += ATM_CELL_HEADER;
+ memset (target, 0, ATM_CELL_PAYLOAD - ATM_AAL5_TRAILER);
+ target += ATM_CELL_PAYLOAD - ATM_AAL5_TRAILER;
+
+ if (--ctrl->num_cells)
+ BUG();
+ }
+
+ memcpy (target, ctrl->aal5_trailer, ATM_AAL5_TRAILER);
+ target += ATM_AAL5_TRAILER;
+ /* set pti bit in last cell */
+ *(target + 3 - ATM_CELL_SIZE) |= 0x2;
+
+out:
+ *target_p = target;
+ return nc - ctrl->num_cells;
+}
+
+
+/**************
+** receive **
+**************/
+
+static void udsl_complete_receive (struct urb *urb, struct pt_regs *regs)
+{
+ struct udsl_instance_data *instance;
+ struct udsl_receiver *rcv;
+ unsigned long flags;
+
+ if (!urb || !(rcv = urb->context) || !(instance = rcv->instance)) {
+ dbg ("udsl_complete_receive: bad urb!");
+ return;
+ }
+
+ dbg ("udsl_complete_receive entered (urb 0x%p, status %d)", urb, urb->status);
+
+ /* may not be in_interrupt() */
+ spin_lock_irqsave (&instance->completed_receivers_lock, flags);
+ list_add_tail (&rcv->list, &instance->completed_receivers);
+ tasklet_schedule (&instance->receive_tasklet);
+ spin_unlock_irqrestore (&instance->completed_receivers_lock, flags);
+}
+
+static void udsl_process_receive (unsigned long data)
+{
+ struct udsl_instance_data *instance = (struct udsl_instance_data *) data;
+ struct udsl_receiver *rcv;
+ unsigned long flags;
+ unsigned char *data_start;
+ struct sk_buff *skb;
+ struct urb *urb;
+ struct atmsar_vcc_data *atmsar_vcc = NULL;
+ struct sk_buff *new = NULL, *tmp = NULL;
+ int err;
+
+ dbg ("udsl_process_receive entered");
+
+ spin_lock_irqsave (&instance->completed_receivers_lock, flags);
+ while (!list_empty (&instance->completed_receivers)) {
+ rcv = list_entry (instance->completed_receivers.next, struct
udsl_receiver, list);
+ list_del (&rcv->list);
+ spin_unlock_irqrestore (&instance->completed_receivers_lock, flags);
+
+ urb = rcv->urb;
+ dbg ("udsl_process_receive: got packet %p with length %d and status
%d", urb, urb->actual_length, urb->status);
+
+ switch (urb->status) {
+ case 0:
+ dbg ("udsl_process_receive: processing urb with rcv %p, urb
%p, skb %p", rcv, urb, rcv->skb);
+
+ /* update the skb structure */
+ skb = rcv->skb;
+ skb_trim (skb, 0);
+ skb_put (skb, urb->actual_length);
+ data_start = skb->data;
+
+ dbg ("skb->len = %d", skb->len);
+ PACKETDEBUG (skb->data, skb->len);
+
+ while ((new =
+ atmsar_decode_rawcell (instance->atmsar_vcc_list, skb,
+ &atmsar_vcc)) != NULL) {
+ dbg ("(after cell processing)skb->len = %d", new->len);
+
+ switch (atmsar_vcc->type) {
+ case ATM_AAL5:
+ tmp = new;
+ new = atmsar_decode_aal5 (atmsar_vcc, new);
+
+ /* we can't send NULL skbs upstream, the ATM
layer would try to close the vcc... */
+ if (new) {
+ dbg ("(after aal5 decap) skb->len =
%d", new->len);
+ if (new->len && atm_charge
(atmsar_vcc->vcc, new->truesize)) {
+ PACKETDEBUG (new->data,
new->len);
+ atmsar_vcc->vcc->push
(atmsar_vcc->vcc, new);
+ } else {
+ dbg
+ ("dropping incoming packet
: rx_inuse = %d, vcc->sk->rcvbuf = %d, skb->true_size = %d",
+ atomic_read
(&atmsar_vcc->vcc->rx_inuse),
+
atmsar_vcc->vcc->sk->rcvbuf, new->truesize);
+ dev_kfree_skb (new);
+ }
+ } else {
+ dbg ("atmsar_decode_aal5 returned
NULL!");
+ dev_kfree_skb (tmp);
+ }
+ break;
+ default:
+ /* not supported. we delete the skb. */
+ printk (KERN_INFO
+ "SpeedTouch USB: illegal vcc type.
Dropping packet.\n");
+ dev_kfree_skb (new);
+ break;
+ }
+ }
+
+ /* restore skb */
+ skb_push (skb, skb->data - data_start);
+
+ usb_fill_bulk_urb (urb,
+ instance->usb_dev,
+ usb_rcvbulkpipe (instance->usb_dev,
UDSL_ENDPOINT_DATA_IN),
+ (unsigned char *) rcv->skb->data,
+ UDSL_RCV_BUFFER_SIZE * ATM_CELL_SIZE,
+ udsl_complete_receive,
+ rcv);
+ if (!(err = usb_submit_urb (urb, GFP_ATOMIC)))
+ break;
+ dbg ("udsl_process_receive: submission failed (%d)", err);
+ /* fall through */
+ default: /* error or urb unlinked */
+ dbg ("udsl_process_receive: adding to spare_receivers");
+ spin_lock_irqsave (&instance->spare_receivers_lock, flags);
+ list_add (&rcv->list, &instance->spare_receivers);
+ spin_unlock_irqrestore (&instance->spare_receivers_lock,
flags);
+ break;
+ } /* switch */
+
+ spin_lock_irqsave (&instance->completed_receivers_lock, flags);
+ } /* while */
+ spin_unlock_irqrestore (&instance->completed_receivers_lock, flags);
+ dbg ("udsl_process_receive successful");
+}
+
+static void udsl_fire_receivers (struct udsl_instance_data *instance)
+{
+ struct list_head receivers, *pos, *n;
+ unsigned long flags;
+
+ INIT_LIST_HEAD (&receivers);
+
+ down (&instance->serialize);
+
+ spin_lock_irqsave (&instance->spare_receivers_lock, flags);
+ list_splice_init (&instance->spare_receivers, &receivers);
+ spin_unlock_irqrestore (&instance->spare_receivers_lock, flags);
+
+ list_for_each_safe (pos, n, &receivers) {
+ struct udsl_receiver *rcv = list_entry (pos, struct udsl_receiver,
list);
+
+ dbg ("udsl_fire_receivers: firing urb %p", rcv->urb);
+
+ usb_fill_bulk_urb (rcv->urb,
+ instance->usb_dev,
+ usb_rcvbulkpipe (instance->usb_dev,
UDSL_ENDPOINT_DATA_IN),
+ (unsigned char *) rcv->skb->data,
+ UDSL_RCV_BUFFER_SIZE * ATM_CELL_SIZE,
+ udsl_complete_receive,
+ rcv);
+
+ if (usb_submit_urb (rcv->urb, GFP_KERNEL) < 0) {
+ dbg ("udsl_fire_receivers: submit failed!");
+ spin_lock_irqsave (&instance->spare_receivers_lock, flags);
+ list_move (pos, &instance->spare_receivers);
+ spin_unlock_irqrestore (&instance->spare_receivers_lock,
flags);
+ }
+ }
+
+ up (&instance->serialize);
+}
+
+
+/***********
+** send **
+***********/
+
+static void udsl_complete_send (struct urb *urb, struct pt_regs *regs)
+{
+ struct udsl_instance_data *instance;
+ struct udsl_sender *snd;
+ unsigned long flags;
+
+ if (!urb || !(snd = urb->context) || !(instance = snd->instance)) {
+ dbg ("udsl_complete_send: bad urb!");
+ return;
+ }
+
+ dbg ("udsl_complete_send entered (urb 0x%p, status %d)", urb, urb->status);
+
+ /* may not be in_interrupt() */
+ spin_lock_irqsave (&instance->send_lock, flags);
+ list_add (&snd->list, &instance->spare_senders);
+ list_add (&snd->buffer->list, &instance->spare_buffers);
+ tasklet_schedule (&instance->send_tasklet);
+ spin_unlock_irqrestore (&instance->send_lock, flags);
+}
+
+static void udsl_process_send (unsigned long data)
+{
+ struct udsl_send_buffer *buf;
+ int err;
+ unsigned long flags;
+ struct udsl_instance_data *instance = (struct udsl_instance_data *) data;
+ unsigned int num_written;
+ struct sk_buff *skb;
+ struct udsl_sender *snd;
+
+ dbg ("udsl_process_send entered");
+
+made_progress:
+ spin_lock_irqsave (&instance->send_lock, flags);
+ while (!list_empty (&instance->spare_senders)) {
+ if (!list_empty (&instance->filled_buffers)) {
+ buf = list_entry (instance->filled_buffers.next, struct
udsl_send_buffer, list);
+ list_del (&buf->list);
+ dbg ("sending filled buffer (0x%p)", buf);
+ } else if ((buf = instance->current_buffer)) {
+ instance->current_buffer = NULL;
+ dbg ("sending current buffer (0x%p)", buf);
+ } else /* all buffers empty */
+ break;
+
+ snd = list_entry (instance->spare_senders.next, struct udsl_sender,
list);
+ list_del (&snd->list);
+ spin_unlock_irqrestore (&instance->send_lock, flags);
+
+ snd->buffer = buf;
+ usb_fill_bulk_urb (snd->urb,
+ instance->usb_dev,
+ usb_sndbulkpipe (instance->usb_dev,
UDSL_ENDPOINT_DATA_OUT),
+ buf->base,
+ (UDSL_SND_BUFFER_SIZE - buf->free_cells) *
ATM_CELL_SIZE,
+ udsl_complete_send,
+ snd);
+
+ dbg ("submitting urb 0x%p, contains %d cells", snd->urb,
UDSL_SND_BUFFER_SIZE - buf->free_cells);
+
+ if ((err = usb_submit_urb(snd->urb, GFP_ATOMIC)) < 0) {
+ dbg ("submission failed (%d)!", err);
+ spin_lock_irqsave (&instance->send_lock, flags);
+ list_add (&snd->list, &instance->spare_senders);
+ spin_unlock_irqrestore (&instance->send_lock, flags);
+ list_add (&buf->list, &instance->filled_buffers);
+ return;
+ }
+
+ spin_lock_irqsave (&instance->send_lock, flags);
+ } /* while */
+ spin_unlock_irqrestore (&instance->send_lock, flags);
+
+ if (!instance->current_skb && !(instance->current_skb = skb_dequeue
(&instance->sndqueue))) {
+ dbg ("done - no more skbs");
+ return;
+ }
+
+ skb = instance->current_skb;
+
+ if (!(buf = instance->current_buffer)) {
+ spin_lock_irqsave (&instance->send_lock, flags);
+ if (list_empty (&instance->spare_buffers)) {
+ instance->current_buffer = NULL;
+ spin_unlock_irqrestore (&instance->send_lock, flags);
+ dbg ("done - no more buffers");
+ return;
+ }
+ buf = list_entry (instance->spare_buffers.next, struct
udsl_send_buffer, list);
+ list_del (&buf->list);
+ spin_unlock_irqrestore (&instance->send_lock, flags);
+
+ buf->free_start = buf->base;
+ buf->free_cells = UDSL_SND_BUFFER_SIZE;
+
+ instance->current_buffer = buf;
+ }
+
+ num_written = udsl_write_cells (buf->free_cells, skb, &buf->free_start);
+
+ dbg ("wrote %u cells from skb 0x%p to buffer 0x%p", num_written, skb, buf);
+
+ if (!(buf->free_cells -= num_written)) {
+ list_add_tail (&buf->list, &instance->filled_buffers);
+ instance->current_buffer = NULL;
+ dbg ("queued filled buffer");
+ }
+
+ dbg ("buffer contains %d cells, %d left", UDSL_SND_BUFFER_SIZE -
buf->free_cells, buf->free_cells);
+
+ if (!UDSL_SKB (skb)->num_cells) {
+ struct atm_vcc *vcc = UDSL_SKB (skb)->atm_data.vcc;
+
+ dbg ("discarding empty skb");
+ if (vcc->pop)
+ vcc->pop (vcc, skb);
+ else
+ kfree_skb (skb);
+ instance->current_skb = NULL;
+
+ if (vcc->stats)
+ atomic_inc (&vcc->stats->tx);
+ }
+
+ goto made_progress;
+}
+
+static void udsl_cancel_send (struct udsl_instance_data *instance, struct atm_vcc
*vcc)
+{
+ unsigned long flags;
+ struct sk_buff *skb, *n;
+
+ dbg ("udsl_cancel_send entered");
+ spin_lock_irqsave (&instance->sndqueue.lock, flags);
+ for (skb = instance->sndqueue.next, n = skb->next; skb != (struct sk_buff
*)&instance->sndqueue; skb = n, n = skb->next)
+ if (UDSL_SKB (skb)->atm_data.vcc == vcc) {
+ dbg ("popping skb 0x%p", skb);
+ __skb_unlink (skb, &instance->sndqueue);
+ if (vcc->pop)
+ vcc->pop (vcc, skb);
+ else
+ kfree_skb (skb);
+ }
+ spin_unlock_irqrestore (&instance->sndqueue.lock, flags);
+
+ tasklet_disable (&instance->send_tasklet);
+ if ((skb = instance->current_skb) && (UDSL_SKB (skb)->atm_data.vcc == vcc)) {
+ dbg ("popping current skb (0x%p)", skb);
+ instance->current_skb = NULL;
+ if (vcc->pop)
+ vcc->pop (vcc, skb);
+ else
+ kfree_skb (skb);
+ }
+ tasklet_enable (&instance->send_tasklet);
+ dbg ("udsl_cancel_send done");
+}
+
+static int udsl_atm_send (struct atm_vcc *vcc, struct sk_buff *skb)
+{
+ struct udsl_instance_data *instance = vcc->dev->dev_data;
+
+ dbg ("udsl_atm_send called (skb 0x%p, len %u)", skb, skb->len);
+
+ if (!instance || !instance->usb_dev) {
+ dbg ("NULL data!");
+ return -ENODEV;
+ }
+
+ if (!instance->firmware_loaded)
+ return -EAGAIN;
+
+ if (vcc->qos.aal != ATM_AAL5) {
+ dbg ("unsupported ATM type %d!", vcc->qos.aal);
+ return -EINVAL;
+ }
+
+ if (skb->len > ATM_MAX_AAL5_PDU) {
+ dbg ("packet too long (%d vs %d)!", skb->len, ATM_MAX_AAL5_PDU);
+ return -EINVAL;
+ }
+
+ PACKETDEBUG (skb->data, skb->len);
+
+ udsl_groom_skb (vcc, skb);
+ skb_queue_tail (&instance->sndqueue, skb);
+ tasklet_schedule (&instance->send_tasklet);
+
+ return 0;
+}
+
+
+/**********
+** ATM **
+**********/
+
+#define ATMSAR_DEF_MTU_AAL0 48
+#define ATMSAR_DEF_MTU_AAL1 47
+#define ATMSAR_DEF_MTU_AAL2 0 /* not supported */
+#define ATMSAR_DEF_MTU_AAL34 0 /* not supported */
+#define ATMSAR_DEF_MTU_AAL5 65535 /* max mtu .. */
+
+struct atmsar_vcc_data *atmsar_open (struct atmsar_vcc_data **list, struct atm_vcc
*vcc, uint type,
+ ushort vpi, ushort vci, unchar pti, unchar gfc,
uint flags)
+{
+ struct atmsar_vcc_data *new;
+
+ if (!vcc)
+ return NULL;
+
+ new = kmalloc (sizeof (struct atmsar_vcc_data), GFP_KERNEL);
+
+ if (!new)
+ return NULL;
+
+ memset (new, 0, sizeof (struct atmsar_vcc_data));
+ new->vcc = vcc;
+ new->stats = vcc->stats;
+ new->type = type;
+ new->next = NULL;
+ new->gfc = gfc;
+ new->vp = vpi;
+ new->vc = vci;
+ new->pti = pti;
+
+ switch (type) {
+ case ATM_AAL0:
+ new->mtu = ATMSAR_DEF_MTU_AAL0;
+ break;
+ case ATM_AAL1:
+ new->mtu = ATMSAR_DEF_MTU_AAL1;
+ break;
+ case ATM_AAL2:
+ new->mtu = ATMSAR_DEF_MTU_AAL2;
+ break;
+ case ATM_AAL34:
+ /* not supported */
+ new->mtu = ATMSAR_DEF_MTU_AAL34;
+ break;
+ case ATM_AAL5:
+ new->mtu = ATMSAR_DEF_MTU_AAL5;
+ break;
+ }
+
+ new->atmHeader = ((unsigned long) gfc << ATM_HDR_GFC_SHIFT)
+ | ((unsigned long) vpi << ATM_HDR_VPI_SHIFT)
+ | ((unsigned long) vci << ATM_HDR_VCI_SHIFT)
+ | ((unsigned long) pti << ATM_HDR_PTI_SHIFT);
+ new->flags = flags;
+ new->next = NULL;
+ new->reasBuffer = NULL;
+
+ new->next = *list;
+ *list = new;
+
+ dbg ("Allocated new SARLib vcc 0x%p with vp %d vc %d", new, vpi, vci);
+
+ return new;
+}
+
+void atmsar_close (struct atmsar_vcc_data **list, struct atmsar_vcc_data *vcc)
+{
+ struct atmsar_vcc_data *work;
+
+ if (*list == vcc) {
+ *list = (*list)->next;
+ } else {
+ for (work = *list; work && work->next && (work->next != vcc); work =
work->next);
+
+ /* return if not found */
+ if (work->next != vcc)
+ return;
+
+ work->next = work->next->next;
+ }
+
+ if (vcc->reasBuffer) {
+ dev_kfree_skb (vcc->reasBuffer);
+ }
+
+ dbg ("Allocated SARLib vcc 0x%p with vp %d vc %d", vcc, vcc->vp, vcc->vc);
+
+ kfree (vcc);
+}
+
+static void udsl_atm_dev_close (struct atm_dev *dev)
+{
+ struct udsl_instance_data *instance = dev->dev_data;
+
+ if (!instance) {
+ dbg ("udsl_atm_dev_close: NULL instance!");
+ return;
+ }
+
+ dbg ("udsl_atm_dev_close: queue has %u elements", instance->sndqueue.qlen);
+
+ dbg ("udsl_atm_dev_close: killing tasklet");
+ tasklet_kill (&instance->send_tasklet);
+ dbg ("udsl_atm_dev_close: freeing instance");
+ kfree (instance);
+ dev->dev_data = NULL;
+}
+
+static int udsl_atm_proc_read (struct atm_dev *atm_dev, loff_t *pos, char *page)
+{
+ struct udsl_instance_data *instance = atm_dev->dev_data;
+ int left = *pos;
+
+ if (!instance) {
+ dbg ("NULL instance!");
+ return -ENODEV;
+ }
+
+ if (!left--)
+ return sprintf (page, "%s\n", instance->description);
+
+ if (!left--)
+ return sprintf (page, "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
+ atm_dev->esi[0], atm_dev->esi[1], atm_dev->esi[2],
+ atm_dev->esi[3], atm_dev->esi[4], atm_dev->esi[5]);
+
+ if (!left--)
+ return sprintf (page, "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop
)\n",
+ atomic_read (&atm_dev->stats.aal5.tx),
+ atomic_read (&atm_dev->stats.aal5.tx_err),
+ atomic_read (&atm_dev->stats.aal5.rx),
+ atomic_read (&atm_dev->stats.aal5.rx_err),
+ atomic_read (&atm_dev->stats.aal5.rx_drop));
+
+ if (!left--) {
+ switch (atm_dev->signal) {
+ case ATM_PHY_SIG_FOUND:
+ sprintf (page, "Line up");
+ break;
+ case ATM_PHY_SIG_LOST:
+ sprintf (page, "Line down");
+ break;
+ default:
+ sprintf (page, "Line state unknown");
+ break;
+ }
+
+ if (instance->usb_dev) {
+ if (!instance->firmware_loaded)
+ strcat (page, ", no firmware\n");
+ else
+ strcat (page, ", firmware loaded\n");
+ } else
+ strcat (page, ", disconnected\n");
+
+ return strlen (page);
+ }
+
+ return 0;
+}
+
+#define ATMSAR_SET_PTI 0x2L
+
+static int udsl_atm_open (struct atm_vcc *vcc, short vpi, int vci)
+{
+ struct udsl_instance_data *instance = vcc->dev->dev_data;
+
+ dbg ("udsl_atm_open called");
+
+ if (!instance || !instance->usb_dev) {
+ dbg ("NULL data!");
+ return -ENODEV;
+ }
+
+ /* at the moment only AAL5 support */
+ if (vcc->qos.aal != ATM_AAL5)
+ return -EINVAL;
+
+ MOD_INC_USE_COUNT;
+
+ vcc->dev_data =
+ atmsar_open (&(instance->atmsar_vcc_list), vcc, ATM_AAL5, vpi, vci, 0, 0,
+ ATMSAR_USE_53BYTE_CELL | ATMSAR_SET_PTI);
+ if (!vcc->dev_data) {
+ MOD_DEC_USE_COUNT;
+ return -ENOMEM; /* this is the only reason atmsar_open can fail... */
+ }
+
+ vcc->vpi = vpi;
+ vcc->vci = vci;
+ set_bit (ATM_VF_ADDR, &vcc->flags);
+ set_bit (ATM_VF_PARTIAL, &vcc->flags);
+ set_bit (ATM_VF_READY, &vcc->flags);
+
+ ((struct atmsar_vcc_data *)vcc->dev_data)->mtu = UDSL_MAX_AAL5_MRU;
+
+ if (instance->firmware_loaded)
+ udsl_fire_receivers (instance);
+
+ dbg ("udsl_atm_open successful");
+ return 0;
+}
+
+static void udsl_atm_close (struct atm_vcc *vcc)
+{
+ struct udsl_instance_data *instance = vcc->dev->dev_data;
+
+ dbg ("udsl_atm_close called");
+
+ if (!instance) {
+ dbg ("NULL instance!");
+ return;
+ }
+
+ /* freeing resources */
+ /* cancel all sends on this vcc */
+ udsl_cancel_send (instance, vcc);
+
+ atmsar_close (&(instance->atmsar_vcc_list), vcc->dev_data);
+ vcc->dev_data = NULL;
+ clear_bit (ATM_VF_PARTIAL, &vcc->flags);
+
+ /* freeing address */
+ vcc->vpi = ATM_VPI_UNSPEC;
+ vcc->vci = ATM_VCI_UNSPEC;
+ clear_bit (ATM_VF_ADDR, &vcc->flags);
+
+ MOD_DEC_USE_COUNT;
+
+ dbg ("udsl_atm_close successful");
+ return;
+}
+
+static int udsl_atm_ioctl (struct atm_dev *dev, unsigned int cmd, void *arg)
+{
+ switch (cmd) {
+ case ATM_QUERYLOOP:
+ return put_user (ATM_LM_NONE, (int *) arg) ? -EFAULT : 0;
+ default:
+ return -ENOIOCTLCMD;
+ }
+}
+
+
+/**********
+** USB **
+**********/
+
+static int udsl_usb_ioctl (struct usb_interface *intf, unsigned int code, void
*user_data)
+{
+ struct udsl_instance_data *instance = usb_get_intfdata (intf);
+
+ dbg ("udsl_usb_ioctl entered");
+
+ if (!instance) {
+ dbg ("NULL instance!");
+ return -ENODEV;
+ }
+
+ switch (code) {
+ case UDSL_IOCTL_START:
+ instance->atm_dev->signal = ATM_PHY_SIG_FOUND;
+ down (&instance->serialize); /* vs self */
+ if (!instance->firmware_loaded) {
+ usb_set_interface (instance->usb_dev, 1, 1);
+ instance->firmware_loaded = 1;
+ }
+ up (&instance->serialize);
+ udsl_fire_receivers (instance);
+ return 0;
+ case UDSL_IOCTL_STOP:
+ instance->atm_dev->signal = ATM_PHY_SIG_LOST;
+ return 0;
+ default:
+ return -ENOTTY;
+ }
+}
+
+static int udsl_usb_probe (struct usb_interface *intf, const struct usb_device_id *id)
+{
+ struct usb_device *dev = interface_to_usbdev(intf);
+ int ifnum = intf->altsetting->desc.bInterfaceNumber;
+ struct udsl_instance_data *instance;
+ unsigned char mac_str [13];
+ int i, length;
+ char *buf;
+
+ dbg ("Trying device with Vendor=0x%x, Product=0x%x, ifnum %d",
+ dev->descriptor.idVendor, dev->descriptor.idProduct, ifnum);
+
+ if ((dev->descriptor.bDeviceClass != USB_CLASS_VENDOR_SPEC) ||
+ (dev->descriptor.idVendor != SPEEDTOUCH_VENDORID) ||
+ (dev->descriptor.idProduct != SPEEDTOUCH_PRODUCTID) || (ifnum != 1))
+ return -ENODEV;
+
+ dbg ("Device Accepted");
+
+ /* instance init */
+ if (!(instance = kmalloc (sizeof (struct udsl_instance_data), GFP_KERNEL))) {
+ dbg ("No memory for Instance data!");
+ return -ENOMEM;
+ }
+
+ memset (instance, 0, sizeof (struct udsl_instance_data));
+
+ init_MUTEX (&instance->serialize);
+
+ instance->usb_dev = dev;
+
+ spin_lock_init (&instance->spare_receivers_lock);
+ INIT_LIST_HEAD (&instance->spare_receivers);
+
+ spin_lock_init (&instance->completed_receivers_lock);
+ INIT_LIST_HEAD (&instance->completed_receivers);
+
+ tasklet_init (&instance->receive_tasklet, udsl_process_receive, (unsigned
long) instance);
+
+ skb_queue_head_init (&instance->sndqueue);
+
+ spin_lock_init (&instance->send_lock);
+ INIT_LIST_HEAD (&instance->spare_senders);
+ INIT_LIST_HEAD (&instance->spare_buffers);
+
+ tasklet_init (&instance->send_tasklet, udsl_process_send, (unsigned long)
instance);
+ INIT_LIST_HEAD (&instance->filled_buffers);
+
+ /* receive init */
+ for (i = 0; i < UDSL_NUMBER_RCV_URBS; i++) {
+ struct udsl_receiver *rcv = &(instance->all_receivers[i]);
+
+ if (!(rcv->skb = dev_alloc_skb (UDSL_RCV_BUFFER_SIZE *
ATM_CELL_SIZE))) {
+ dbg ("No memory for skb %d!", i);
+ goto fail;
+ }
+
+ if (!(rcv->urb = usb_alloc_urb (0, GFP_KERNEL))) {
+ dbg ("No memory for receive urb %d!", i);
+ goto fail;
+ }
+
+ rcv->instance = instance;
+
+ list_add (&rcv->list, &instance->spare_receivers);
+
+ dbg ("skb->truesize = %d (asked for %d)", rcv->skb->truesize,
UDSL_RCV_BUFFER_SIZE * ATM_CELL_SIZE);
+ }
+
+ /* send init */
+ for (i = 0; i < UDSL_NUMBER_SND_URBS; i++) {
+ struct udsl_sender *snd = &(instance->all_senders[i]);
+
+ if (!(snd->urb = usb_alloc_urb (0, GFP_KERNEL))) {
+ dbg ("No memory for send urb %d!", i);
+ goto fail;
+ }
+
+ snd->instance = instance;
+
+ list_add (&snd->list, &instance->spare_senders);
+ }
+
+ for (i = 0; i < UDSL_NUMBER_SND_BUFS; i++) {
+ struct udsl_send_buffer *buf = &(instance->all_buffers[i]);
+
+ if (!(buf->base = kmalloc (UDSL_SND_BUFFER_SIZE * ATM_CELL_SIZE,
GFP_KERNEL))) {
+ dbg ("No memory for send buffer %d!", i);
+ goto fail;
+ }
+
+ list_add (&buf->list, &instance->spare_buffers);
+ }
+
+ /* atm init */
+ if (!(instance->atm_dev = atm_dev_register (udsl_driver_name,
&udsl_atm_devops, -1, 0))) {
+ dbg ("failed to register ATM device!");
+ goto fail;
+ }
+
+ instance->atm_dev->ci_range.vpi_bits = ATM_CI_MAX;
+ instance->atm_dev->ci_range.vci_bits = ATM_CI_MAX;
+ instance->atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
+
+ /* tmp init atm device, set to 128kbit */
+ instance->atm_dev->link_rate = 128 * 1000 / 424;
+
+ /* set MAC address, it is stored in the serial number */
+ memset (instance->atm_dev->esi, 0, sizeof (instance->atm_dev->esi));
+ if (usb_string (dev, dev->descriptor.iSerialNumber, mac_str, sizeof (mac_str))
== 12)
+ for (i = 0; i < 6; i++)
+ instance->atm_dev->esi[i] = (hex2int (mac_str[i * 2]) * 16) +
(hex2int (mac_str[i * 2 + 1]));
+
+ /* device description */
+ buf = instance->description;
+ length = sizeof (instance->description);
+
+ if ((i = usb_string (dev, dev->descriptor.iProduct, buf, length)) < 0)
+ goto finish;
+
+ buf += i;
+ length -= i;
+
+ i = snprintf (buf, length, " (");
+ buf += i;
+ length -= i;
+
+ if (length <= 0 || (i = usb_make_path (dev, buf, length)) < 0)
+ goto finish;
+
+ buf += i;
+ length -= i;
+
+ snprintf (buf, length, ")");
+
+finish:
+ /* ready for ATM callbacks */
+ instance->atm_dev->dev_data = instance;
+
+ usb_set_intfdata (intf, instance);
+
+ return 0;
+
+fail:
+ for (i = 0; i < UDSL_NUMBER_SND_BUFS; i++)
+ kfree (instance->all_buffers[i].base);
+
+ for (i = 0; i < UDSL_NUMBER_SND_URBS; i++)
+ usb_free_urb (instance->all_senders[i].urb);
+
+ for (i = 0; i < UDSL_NUMBER_RCV_URBS; i++) {
+ struct udsl_receiver *rcv = &(instance->all_receivers[i]);
+
+ usb_free_urb (rcv->urb);
+
+ if (rcv->skb)
+ kfree_skb (rcv->skb);
+ }
+
+ kfree (instance);
+
+ return -ENOMEM;
+}
+
+static void udsl_usb_disconnect (struct usb_interface *intf)
+{
+ struct udsl_instance_data *instance = usb_get_intfdata (intf);
+ struct list_head *pos;
+ unsigned long flags;
+ unsigned int count = 0;
+ int result, i;
+
+ dbg ("disconnecting");
+
+ usb_set_intfdata (intf, NULL);
+
+ if (!instance) {
+ dbg ("NULL instance!");
+ return;
+ }
+
+ tasklet_disable (&instance->receive_tasklet);
+
+ /* receive finalize */
+ down (&instance->serialize); /* vs udsl_fire_receivers */
+ /* no need to take the spinlock */
+ list_for_each (pos, &instance->spare_receivers)
+ if (++count > UDSL_NUMBER_RCV_URBS)
+ panic (__FILE__ ": memory corruption detected at line %d!\n",
__LINE__);
+ INIT_LIST_HEAD (&instance->spare_receivers);
+ up (&instance->serialize);
+
+ dbg ("udsl_usb_disconnect: flushed %u spare receivers", count);
+
+ count = UDSL_NUMBER_RCV_URBS - count;
+
+ for (i = 0; i < UDSL_NUMBER_RCV_URBS; i++)
+ if ((result = usb_unlink_urb (instance->all_receivers[i].urb)) < 0)
+ dbg ("udsl_usb_disconnect: usb_unlink_urb on receive urb %d
returned %d", i, result);
+
+ /* wait for completion handlers to finish */
+ do {
+ unsigned int completed = 0;
+
+ spin_lock_irqsave (&instance->completed_receivers_lock, flags);
+ list_for_each (pos, &instance->completed_receivers)
+ if (++completed > count)
+ panic (__FILE__ ": memory corruption detected at line
%d!\n", __LINE__);
+ spin_unlock_irqrestore (&instance->completed_receivers_lock, flags);
+
+ dbg ("udsl_usb_disconnect: found %u completed receivers", completed);
+
+ if (completed == count)
+ break;
+
+ yield ();
+ } while (1);
+
+ dbg ("udsl_usb_disconnect: flushing");
+ /* no need to take the spinlock */
+ INIT_LIST_HEAD (&instance->completed_receivers);
+
+ tasklet_enable (&instance->receive_tasklet);
+ tasklet_kill (&instance->receive_tasklet);
+
+ dbg ("udsl_usb_disconnect: freeing receivers");
+ for (i = 0; i < UDSL_NUMBER_RCV_URBS; i++) {
+ struct udsl_receiver *rcv = &(instance->all_receivers[i]);
+
+ usb_free_urb (rcv->urb);
+ kfree_skb (rcv->skb);
+ }
+
+ /* send finalize */
+ tasklet_disable (&instance->send_tasklet);
+
+ for (i = 0; i < UDSL_NUMBER_SND_URBS; i++)
+ if ((result = usb_unlink_urb (instance->all_senders[i].urb)) < 0)
+ dbg ("udsl_usb_disconnect: usb_unlink_urb on send urb %d
returned %d", i, result);
+
+ /* wait for completion handlers to finish */
+ do {
+ count = 0;
+ spin_lock_irqsave (&instance->send_lock, flags);
+ list_for_each (pos, &instance->spare_senders)
+ if (++count > UDSL_NUMBER_SND_URBS)
+ panic (__FILE__ ": memory corruption detected at line
%d!\n", __LINE__);
+ spin_unlock_irqrestore (&instance->send_lock, flags);
+
+ dbg ("udsl_usb_disconnect: found %u spare senders", count);
+
+ if (count == UDSL_NUMBER_SND_URBS)
+ break;
+
+ yield ();
+ } while (1);
+
+ dbg ("udsl_usb_disconnect: flushing");
+ /* no need to take the spinlock */
+ INIT_LIST_HEAD (&instance->spare_senders);
+ INIT_LIST_HEAD (&instance->spare_buffers);
+ instance->current_buffer = NULL;
+
+ tasklet_enable (&instance->send_tasklet);
+
+ dbg ("udsl_usb_disconnect: freeing senders");
+ for (i = 0; i < UDSL_NUMBER_SND_URBS; i++)
+ usb_free_urb (instance->all_senders[i].urb);
+
+ dbg ("udsl_usb_disconnect: freeing buffers");
+ for (i = 0; i < UDSL_NUMBER_SND_BUFS; i++)
+ kfree (instance->all_buffers[i].base);
+
+ instance->usb_dev = NULL;
+
+ /* atm finalize */
+ shutdown_atm_dev (instance->atm_dev); /* frees instance */
+}
+
+
+/***********
+** init **
+***********/
+
+static int __init udsl_usb_init (void)
+{
+ struct sk_buff *skb; /* dummy for sizeof */
+
+ dbg ("udsl_usb_init: driver version " DRIVER_VERSION);
+
+ if (sizeof (struct udsl_control) > sizeof (skb->cb)) {
+ printk (KERN_ERR __FILE__ ": unusable with this kernel!\n");
+ return -EIO;
+ }
+
+ return usb_register (&udsl_usb_driver);
+}
+
+static void __exit udsl_usb_cleanup (void)
+{
+ dbg ("udsl_usb_cleanup");
+
+ usb_deregister (&udsl_usb_driver);
+}
+
+module_init (udsl_usb_init);
+module_exit (udsl_usb_cleanup);
+
+MODULE_AUTHOR (DRIVER_AUTHOR);
+MODULE_DESCRIPTION (DRIVER_DESC);
+MODULE_LICENSE ("GPL");
+
+
+/************
+** debug **
+************/
+
+#ifdef DEBUG_PACKET
+static int udsl_print_packet (const unsigned char *data, int len)
+{
+ unsigned char buffer [256];
+ int i = 0, j = 0;
+
+ for (i = 0; i < len;) {
+ buffer[0] = '\0';
+ sprintf (buffer, "%.3d :", i);
+ for (j = 0; (j < 16) && (i < len); j++, i++) {
+ sprintf (buffer, "%s %2.2x", buffer, data[i]);
+ }
+ dbg ("%s", buffer);
+ }
+ return i;
+}
+#endif
diff -Nru a/drivers/usb/misc/speedtouch.c b/drivers/usb/misc/speedtouch.c
--- a/drivers/usb/misc/speedtouch.c Tue Mar 18 12:15:55 2003
+++ /dev/null Wed Dec 31 16:00:00 1969
@@ -1,1216 +0,0 @@
-/******************************************************************************
- * speedtouch.c -- Alcatel SpeedTouch USB xDSL modem driver.
- *
- * Copyright (C) 2001, Alcatel
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- ******************************************************************************/
-
-/*
- * Written by Johan Verrept ([EMAIL PROTECTED])
- *
- * 1.5A: - Version for inclusion in 2.5 series kernel
- * - Modifications by Richard Purdie ([EMAIL PROTECTED])
- * - made compatible with kernel 2.5.6 onwards by changing
- * udsl_usb_send_data_context->urb to a pointer and adding code
- * to alloc and free it
- * - remove_wait_queue() added to udsl_atm_processqueue_thread()
- *
- * 1.5: - fixed memory leak when atmsar_decode_aal5 returned NULL.
- * (reported by [EMAIL PROTECTED])
- *
- * 1.4: - changed the spin_lock() under interrupt to spin_lock_irqsave()
- * - unlink all active send urbs of a vcc that is being closed.
- *
- * 1.3.1: - added the version number
- *
- * 1.3: - Added multiple send urb support
- * - fixed memory leak and vcc->tx_inuse starvation bug
- * when not enough memory left in vcc.
- *
- * 1.2: - Fixed race condition in udsl_usb_send_data()
- * 1.1: - Turned off packet debugging
- *
- */
-
-#include <asm/semaphore.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/errno.h>
-#include <linux/proc_fs.h>
-#include <linux/slab.h>
-#include <linux/list.h>
-#include <asm/uaccess.h>
-#include <linux/smp_lock.h>
-#include <linux/interrupt.h>
-#include <linux/atm.h>
-#include <linux/atmdev.h>
-#include <linux/crc32.h>
-#include "atmsar.h"
-
-/*
-#define DEBUG 1
-#define DEBUG_PACKET 1
-*/
-
-#include <linux/usb.h>
-
-
-#ifdef DEBUG_PACKET
-static int udsl_print_packet (const unsigned char *data, int len);
-#define PACKETDEBUG(arg...) udsl_print_packet (arg)
-#else
-#define PACKETDEBUG(arg...)
-#endif
-
-#define DRIVER_AUTHOR "Johan Verrept, [EMAIL PROTECTED]"
-#define DRIVER_DESC "Driver for the Alcatel SpeedTouch USB ADSL modem"
-#define DRIVER_VERSION "1.5A"
-
-#define SPEEDTOUCH_VENDORID 0x06b9
-#define SPEEDTOUCH_PRODUCTID 0x4061
-
-#define UDSL_NUMBER_RCV_URBS 1
-#define UDSL_NUMBER_SND_URBS 1
-#define UDSL_NUMBER_SND_BUFS (2*UDSL_NUMBER_SND_URBS)
-#define UDSL_RCV_BUFFER_SIZE (1*64) /* ATM cells */
-#define UDSL_SND_BUFFER_SIZE (1*64) /* ATM cells */
-/* max should be (1500 IP mtu + 2 ppp bytes + 32 * 5 cellheader overhead) for
- * PPPoA and (1500 + 14 + 32*5 cellheader overhead) for PPPoE */
-#define UDSL_MAX_AAL5_MRU 2048
-
-#define UDSL_IOCTL_START 1
-#define UDSL_IOCTL_STOP 2
-
-/* endpoint declarations */
-
-#define UDSL_ENDPOINT_DATA_OUT 0x07
-#define UDSL_ENDPOINT_DATA_IN 0x87
-
-#define hex2int(c) ( (c >= '0')&&(c <= '9') ? (c - '0') : ((c & 0xf)+9) )
-
-/* usb_device_id struct */
-
-static struct usb_device_id udsl_usb_ids [] = {
- { USB_DEVICE (SPEEDTOUCH_VENDORID, SPEEDTOUCH_PRODUCTID) },
- { } /* Terminating entry */
-};
-
-MODULE_DEVICE_TABLE (usb, udsl_usb_ids);
-
-/* context declarations */
-
-struct udsl_receiver {
- struct list_head list;
- struct sk_buff *skb;
- struct urb *urb;
- struct udsl_instance_data *instance;
-};
-
-struct udsl_send_buffer {
- struct list_head list;
- unsigned char *base;
- unsigned char *free_start;
- unsigned int free_cells;
-};
-
-struct udsl_sender {
- struct list_head list;
- struct udsl_send_buffer *buffer;
- struct urb *urb;
- struct udsl_instance_data *instance;
-};
-
-struct udsl_control {
- struct atm_skb_data atm_data;
- unsigned int num_cells;
- unsigned int num_entire;
- unsigned char cell_header [ATM_CELL_HEADER];
- unsigned int pdu_padding;
- unsigned char aal5_trailer [ATM_AAL5_TRAILER];
-};
-
-#define UDSL_SKB(x) ((struct udsl_control *)(x)->cb)
-
-/*
- * UDSL main driver data
- */
-
-struct udsl_instance_data {
- struct semaphore serialize;
-
- /* usb device part */
- struct usb_device *usb_dev;
- char description [64];
- int firmware_loaded;
-
- /* atm device part */
- struct atm_dev *atm_dev;
- struct atmsar_vcc_data *atmsar_vcc_list;
-
- /* receiving */
- struct udsl_receiver all_receivers [UDSL_NUMBER_RCV_URBS];
-
- spinlock_t spare_receivers_lock;
- struct list_head spare_receivers;
-
- spinlock_t completed_receivers_lock;
- struct list_head completed_receivers;
-
- struct tasklet_struct receive_tasklet;
-
- /* sending */
- struct udsl_sender all_senders [UDSL_NUMBER_SND_URBS];
- struct udsl_send_buffer all_buffers [UDSL_NUMBER_SND_BUFS];
-
- struct sk_buff_head sndqueue;
-
- spinlock_t send_lock;
- struct list_head spare_senders;
- struct list_head spare_buffers;
-
- struct tasklet_struct send_tasklet;
- struct sk_buff *current_skb; /* being emptied */
- struct udsl_send_buffer *current_buffer; /* being filled */
- struct list_head filled_buffers;
-};
-
-static const char udsl_driver_name [] = "speedtch";
-
-/*
- * atm driver prototypes and structures
- */
-
-static void udsl_atm_dev_close (struct atm_dev *dev);
-static int udsl_atm_open (struct atm_vcc *vcc, short vpi, int vci);
-static void udsl_atm_close (struct atm_vcc *vcc);
-static int udsl_atm_ioctl (struct atm_dev *dev, unsigned int cmd, void *arg);
-static int udsl_atm_send (struct atm_vcc *vcc, struct sk_buff *skb);
-static int udsl_atm_proc_read (struct atm_dev *atm_dev, loff_t *pos, char *page);
-
-static struct atmdev_ops udsl_atm_devops = {
- .dev_close = udsl_atm_dev_close,
- .open = udsl_atm_open,
- .close = udsl_atm_close,
- .ioctl = udsl_atm_ioctl,
- .send = udsl_atm_send,
- .proc_read = udsl_atm_proc_read,
-};
-
-/*
- * usb driver prototypes and structures
- */
-static int udsl_usb_probe (struct usb_interface *intf,
- const struct usb_device_id *id);
-static void udsl_usb_disconnect (struct usb_interface *intf);
-static int udsl_usb_ioctl (struct usb_interface *intf, unsigned int code, void
*user_data);
-
-static struct usb_driver udsl_usb_driver = {
- .name = udsl_driver_name,
- .probe = udsl_usb_probe,
- .disconnect = udsl_usb_disconnect,
- .ioctl = udsl_usb_ioctl,
- .id_table = udsl_usb_ids,
-};
-
-
-/*************
-** encode **
-*************/
-
-static void udsl_groom_skb (struct atm_vcc *vcc, struct sk_buff *skb) {
- struct udsl_control *ctrl = UDSL_SKB (skb);
- unsigned int i, zero_padding;
- unsigned char zero = 0;
- u32 crc;
-
- ctrl->atm_data.vcc = vcc;
- ctrl->cell_header [0] = vcc->vpi >> 4;
- ctrl->cell_header [1] = (vcc->vpi << 4) | (vcc->vci >> 12);
- ctrl->cell_header [2] = vcc->vci >> 4;
- ctrl->cell_header [3] = vcc->vci << 4;
- ctrl->cell_header [4] = 0xec;
-
- ctrl->num_cells = (skb->len + ATM_AAL5_TRAILER + ATM_CELL_PAYLOAD - 1) /
ATM_CELL_PAYLOAD;
- ctrl->num_entire = skb->len / ATM_CELL_PAYLOAD;
-
- zero_padding = ctrl->num_cells * ATM_CELL_PAYLOAD - skb->len -
ATM_AAL5_TRAILER;
-
- if (ctrl->num_entire + 1 < ctrl->num_cells)
- ctrl->pdu_padding = zero_padding - (ATM_CELL_PAYLOAD -
ATM_AAL5_TRAILER);
- else
- ctrl->pdu_padding = zero_padding;
-
- ctrl->aal5_trailer [0] = 0; /* UU = 0 */
- ctrl->aal5_trailer [1] = 0; /* CPI = 0 */
- ctrl->aal5_trailer [2] = skb->len >> 8;
- ctrl->aal5_trailer [3] = skb->len;
-
- crc = crc32_be (~0, skb->data, skb->len);
- for (i = 0; i < zero_padding; i++)
- crc = crc32_be (crc, &zero, 1);
- crc = crc32_be (crc, ctrl->aal5_trailer, 4);
- crc = ~crc;
-
- ctrl->aal5_trailer [4] = crc >> 24;
- ctrl->aal5_trailer [5] = crc >> 16;
- ctrl->aal5_trailer [6] = crc >> 8;
- ctrl->aal5_trailer [7] = crc;
-}
-
-unsigned int udsl_write_cells (unsigned int howmany, struct sk_buff *skb, unsigned
char **target_p) {
- struct udsl_control *ctrl = UDSL_SKB (skb);
- unsigned char *target = *target_p;
- unsigned int nc, ne, i;
-
- dbg ("udsl_write_cells: howmany=%u, skb->len=%d, num_cells=%u, num_entire=%u,
pdu_padding=%u", howmany, skb->len, ctrl->num_cells, ctrl->num_entire,
ctrl->pdu_padding);
-
- nc = ctrl->num_cells;
- ne = min (howmany, ctrl->num_entire);
-
- for (i = 0; i < ne; i++) {
- memcpy (target, ctrl->cell_header, ATM_CELL_HEADER);
- target += ATM_CELL_HEADER;
- memcpy (target, skb->data, ATM_CELL_PAYLOAD);
- target += ATM_CELL_PAYLOAD;
- __skb_pull (skb, ATM_CELL_PAYLOAD);
- }
-
- ctrl->num_entire -= ne;
-
- if (!(ctrl->num_cells -= ne) || !(howmany -= ne))
- goto out;
-
- memcpy (target, ctrl->cell_header, ATM_CELL_HEADER);
- target += ATM_CELL_HEADER;
- memcpy (target, skb->data, skb->len);
- target += skb->len;
- __skb_pull (skb, skb->len);
- memset (target, 0, ctrl->pdu_padding);
- target += ctrl->pdu_padding;
-
- if (--ctrl->num_cells) {
- if (!--howmany) {
- ctrl->pdu_padding = ATM_CELL_PAYLOAD - ATM_AAL5_TRAILER;
- goto out;
- }
-
- memcpy (target, ctrl->cell_header, ATM_CELL_HEADER);
- target += ATM_CELL_HEADER;
- memset (target, 0, ATM_CELL_PAYLOAD - ATM_AAL5_TRAILER);
- target += ATM_CELL_PAYLOAD - ATM_AAL5_TRAILER;
-
- if (--ctrl->num_cells)
- BUG();
- }
-
- memcpy (target, ctrl->aal5_trailer, ATM_AAL5_TRAILER);
- target += ATM_AAL5_TRAILER;
- /* set pti bit in last cell */
- *(target + 3 - ATM_CELL_SIZE) |= 0x2;
-
-out:
- *target_p = target;
- return nc - ctrl->num_cells;
-}
-
-
-/**************
-** receive **
-**************/
-
-static void udsl_complete_receive (struct urb *urb, struct pt_regs *regs)
-{
- struct udsl_instance_data *instance;
- struct udsl_receiver *rcv;
- unsigned long flags;
-
- if (!urb || !(rcv = urb->context) || !(instance = rcv->instance)) {
- dbg ("udsl_complete_receive: bad urb!");
- return;
- }
-
- dbg ("udsl_complete_receive entered (urb 0x%p, status %d)", urb, urb->status);
-
- /* may not be in_interrupt() */
- spin_lock_irqsave (&instance->completed_receivers_lock, flags);
- list_add_tail (&rcv->list, &instance->completed_receivers);
- tasklet_schedule (&instance->receive_tasklet);
- spin_unlock_irqrestore (&instance->completed_receivers_lock, flags);
-}
-
-static void udsl_process_receive (unsigned long data)
-{
- struct udsl_instance_data *instance = (struct udsl_instance_data *) data;
- struct udsl_receiver *rcv;
- unsigned long flags;
- unsigned char *data_start;
- struct sk_buff *skb;
- struct urb *urb;
- struct atmsar_vcc_data *atmsar_vcc = NULL;
- struct sk_buff *new = NULL, *tmp = NULL;
- int err;
-
- dbg ("udsl_process_receive entered");
-
- spin_lock_irqsave (&instance->completed_receivers_lock, flags);
- while (!list_empty (&instance->completed_receivers)) {
- rcv = list_entry (instance->completed_receivers.next, struct
udsl_receiver, list);
- list_del (&rcv->list);
- spin_unlock_irqrestore (&instance->completed_receivers_lock, flags);
-
- urb = rcv->urb;
- dbg ("udsl_process_receive: got packet %p with length %d and status
%d", urb, urb->actual_length, urb->status);
-
- switch (urb->status) {
- case 0:
- dbg ("udsl_process_receive: processing urb with rcv %p, urb
%p, skb %p", rcv, urb, rcv->skb);
-
- /* update the skb structure */
- skb = rcv->skb;
- skb_trim (skb, 0);
- skb_put (skb, urb->actual_length);
- data_start = skb->data;
-
- dbg ("skb->len = %d", skb->len);
- PACKETDEBUG (skb->data, skb->len);
-
- while ((new =
- atmsar_decode_rawcell (instance->atmsar_vcc_list, skb,
- &atmsar_vcc)) != NULL) {
- dbg ("(after cell processing)skb->len = %d", new->len);
-
- switch (atmsar_vcc->type) {
- case ATMSAR_TYPE_AAL5:
- tmp = new;
- new = atmsar_decode_aal5 (atmsar_vcc, new);
-
- /* we can't send NULL skbs upstream, the ATM
layer would try to close the vcc... */
- if (new) {
- dbg ("(after aal5 decap) skb->len =
%d", new->len);
- if (new->len && atm_charge
(atmsar_vcc->vcc, new->truesize)) {
- PACKETDEBUG (new->data,
new->len);
- atmsar_vcc->vcc->push
(atmsar_vcc->vcc, new);
- } else {
- dbg
- ("dropping incoming packet
: rx_inuse = %d, vcc->sk->rcvbuf = %d, skb->true_size = %d",
- atomic_read
(&atmsar_vcc->vcc->rx_inuse),
-
atmsar_vcc->vcc->sk->rcvbuf, new->truesize);
- dev_kfree_skb (new);
- }
- } else {
- dbg ("atmsar_decode_aal5 returned
NULL!");
- dev_kfree_skb (tmp);
- }
- break;
- default:
- /* not supported. we delete the skb. */
- printk (KERN_INFO
- "SpeedTouch USB: illegal vcc type.
Dropping packet.\n");
- dev_kfree_skb (new);
- break;
- }
- }
-
- /* restore skb */
- skb_push (skb, skb->data - data_start);
-
- usb_fill_bulk_urb (urb,
- instance->usb_dev,
- usb_rcvbulkpipe (instance->usb_dev,
UDSL_ENDPOINT_DATA_IN),
- (unsigned char *) rcv->skb->data,
- UDSL_RCV_BUFFER_SIZE * ATM_CELL_SIZE,
- udsl_complete_receive,
- rcv);
- if (!(err = usb_submit_urb (urb, GFP_ATOMIC)))
- break;
- dbg ("udsl_process_receive: submission failed (%d)", err);
- /* fall through */
- default: /* error or urb unlinked */
- dbg ("udsl_process_receive: adding to spare_receivers");
- spin_lock_irqsave (&instance->spare_receivers_lock, flags);
- list_add (&rcv->list, &instance->spare_receivers);
- spin_unlock_irqrestore (&instance->spare_receivers_lock,
flags);
- break;
- } /* switch */
-
- spin_lock_irqsave (&instance->completed_receivers_lock, flags);
- } /* while */
- spin_unlock_irqrestore (&instance->completed_receivers_lock, flags);
- dbg ("udsl_process_receive successful");
-}
-
-static void udsl_fire_receivers (struct udsl_instance_data *instance)
-{
- struct list_head receivers, *pos, *n;
- unsigned long flags;
-
- INIT_LIST_HEAD (&receivers);
-
- down (&instance->serialize);
-
- spin_lock_irqsave (&instance->spare_receivers_lock, flags);
- list_splice_init (&instance->spare_receivers, &receivers);
- spin_unlock_irqrestore (&instance->spare_receivers_lock, flags);
-
- list_for_each_safe (pos, n, &receivers) {
- struct udsl_receiver *rcv = list_entry (pos, struct udsl_receiver,
list);
-
- dbg ("udsl_fire_receivers: firing urb %p", rcv->urb);
-
- usb_fill_bulk_urb (rcv->urb,
- instance->usb_dev,
- usb_rcvbulkpipe (instance->usb_dev,
UDSL_ENDPOINT_DATA_IN),
- (unsigned char *) rcv->skb->data,
- UDSL_RCV_BUFFER_SIZE * ATM_CELL_SIZE,
- udsl_complete_receive,
- rcv);
-
- if (usb_submit_urb (rcv->urb, GFP_KERNEL) < 0) {
- dbg ("udsl_fire_receivers: submit failed!");
- spin_lock_irqsave (&instance->spare_receivers_lock, flags);
- list_move (pos, &instance->spare_receivers);
- spin_unlock_irqrestore (&instance->spare_receivers_lock,
flags);
- }
- }
-
- up (&instance->serialize);
-}
-
-
-/***********
-** send **
-***********/
-
-static void udsl_complete_send (struct urb *urb, struct pt_regs *regs)
-{
- struct udsl_instance_data *instance;
- struct udsl_sender *snd;
- unsigned long flags;
-
- if (!urb || !(snd = urb->context) || !(instance = snd->instance)) {
- dbg ("udsl_complete_send: bad urb!");
- return;
- }
-
- dbg ("udsl_complete_send entered (urb 0x%p, status %d)", urb, urb->status);
-
- /* may not be in_interrupt() */
- spin_lock_irqsave (&instance->send_lock, flags);
- list_add (&snd->list, &instance->spare_senders);
- list_add (&snd->buffer->list, &instance->spare_buffers);
- tasklet_schedule (&instance->send_tasklet);
- spin_unlock_irqrestore (&instance->send_lock, flags);
-}
-
-static void udsl_process_send (unsigned long data)
-{
- struct udsl_send_buffer *buf;
- int err;
- unsigned long flags;
- struct udsl_instance_data *instance = (struct udsl_instance_data *) data;
- unsigned int num_written;
- struct sk_buff *skb;
- struct udsl_sender *snd;
-
- dbg ("udsl_process_send entered");
-
-made_progress:
- spin_lock_irqsave (&instance->send_lock, flags);
- while (!list_empty (&instance->spare_senders)) {
- if (!list_empty (&instance->filled_buffers)) {
- buf = list_entry (instance->filled_buffers.next, struct
udsl_send_buffer, list);
- list_del (&buf->list);
- dbg ("sending filled buffer (0x%p)", buf);
- } else if ((buf = instance->current_buffer)) {
- instance->current_buffer = NULL;
- dbg ("sending current buffer (0x%p)", buf);
- } else /* all buffers empty */
- break;
-
- snd = list_entry (instance->spare_senders.next, struct udsl_sender,
list);
- list_del (&snd->list);
- spin_unlock_irqrestore (&instance->send_lock, flags);
-
- snd->buffer = buf;
- usb_fill_bulk_urb (snd->urb,
- instance->usb_dev,
- usb_sndbulkpipe (instance->usb_dev,
UDSL_ENDPOINT_DATA_OUT),
- buf->base,
- (UDSL_SND_BUFFER_SIZE - buf->free_cells) *
ATM_CELL_SIZE,
- udsl_complete_send,
- snd);
-
- dbg ("submitting urb 0x%p, contains %d cells", snd->urb,
UDSL_SND_BUFFER_SIZE - buf->free_cells);
-
- if ((err = usb_submit_urb(snd->urb, GFP_ATOMIC)) < 0) {
- dbg ("submission failed (%d)!", err);
- spin_lock_irqsave (&instance->send_lock, flags);
- list_add (&snd->list, &instance->spare_senders);
- spin_unlock_irqrestore (&instance->send_lock, flags);
- list_add (&buf->list, &instance->filled_buffers);
- return;
- }
-
- spin_lock_irqsave (&instance->send_lock, flags);
- } /* while */
- spin_unlock_irqrestore (&instance->send_lock, flags);
-
- if (!instance->current_skb && !(instance->current_skb = skb_dequeue
(&instance->sndqueue))) {
- dbg ("done - no more skbs");
- return;
- }
-
- skb = instance->current_skb;
-
- if (!(buf = instance->current_buffer)) {
- spin_lock_irqsave (&instance->send_lock, flags);
- if (list_empty (&instance->spare_buffers)) {
- instance->current_buffer = NULL;
- spin_unlock_irqrestore (&instance->send_lock, flags);
- dbg ("done - no more buffers");
- return;
- }
- buf = list_entry (instance->spare_buffers.next, struct
udsl_send_buffer, list);
- list_del (&buf->list);
- spin_unlock_irqrestore (&instance->send_lock, flags);
-
- buf->free_start = buf->base;
- buf->free_cells = UDSL_SND_BUFFER_SIZE;
-
- instance->current_buffer = buf;
- }
-
- num_written = udsl_write_cells (buf->free_cells, skb, &buf->free_start);
-
- dbg ("wrote %u cells from skb 0x%p to buffer 0x%p", num_written, skb, buf);
-
- if (!(buf->free_cells -= num_written)) {
- list_add_tail (&buf->list, &instance->filled_buffers);
- instance->current_buffer = NULL;
- dbg ("queued filled buffer");
- }
-
- dbg ("buffer contains %d cells, %d left", UDSL_SND_BUFFER_SIZE -
buf->free_cells, buf->free_cells);
-
- if (!UDSL_SKB (skb)->num_cells) {
- struct atm_vcc *vcc = UDSL_SKB (skb)->atm_data.vcc;
-
- dbg ("discarding empty skb");
- if (vcc->pop)
- vcc->pop (vcc, skb);
- else
- kfree_skb (skb);
- instance->current_skb = NULL;
-
- if (vcc->stats)
- atomic_inc (&vcc->stats->tx);
- }
-
- goto made_progress;
-}
-
-static void udsl_cancel_send (struct udsl_instance_data *instance, struct atm_vcc
*vcc)
-{
- unsigned long flags;
- struct sk_buff *skb, *n;
-
- dbg ("udsl_cancel_send entered");
- spin_lock_irqsave (&instance->sndqueue.lock, flags);
- for (skb = instance->sndqueue.next, n = skb->next; skb != (struct sk_buff
*)&instance->sndqueue; skb = n, n = skb->next)
- if (UDSL_SKB (skb)->atm_data.vcc == vcc) {
- dbg ("popping skb 0x%p", skb);
- __skb_unlink (skb, &instance->sndqueue);
- if (vcc->pop)
- vcc->pop (vcc, skb);
- else
- kfree_skb (skb);
- }
- spin_unlock_irqrestore (&instance->sndqueue.lock, flags);
-
- tasklet_disable (&instance->send_tasklet);
- if ((skb = instance->current_skb) && (UDSL_SKB (skb)->atm_data.vcc == vcc)) {
- dbg ("popping current skb (0x%p)", skb);
- instance->current_skb = NULL;
- if (vcc->pop)
- vcc->pop (vcc, skb);
- else
- kfree_skb (skb);
- }
- tasklet_enable (&instance->send_tasklet);
- dbg ("udsl_cancel_send done");
-}
-
-static int udsl_atm_send (struct atm_vcc *vcc, struct sk_buff *skb)
-{
- struct udsl_instance_data *instance = vcc->dev->dev_data;
-
- dbg ("udsl_atm_send called (skb 0x%p, len %u)", skb, skb->len);
-
- if (!instance || !instance->usb_dev) {
- dbg ("NULL data!");
- return -ENODEV;
- }
-
- if (!instance->firmware_loaded)
- return -EAGAIN;
-
- if (vcc->qos.aal != ATM_AAL5) {
- dbg ("unsupported ATM type %d!", vcc->qos.aal);
- return -EINVAL;
- }
-
- if (skb->len > ATM_MAX_AAL5_PDU) {
- dbg ("packet too long (%d vs %d)!", skb->len, ATM_MAX_AAL5_PDU);
- return -EINVAL;
- }
-
- PACKETDEBUG (skb->data, skb->len);
-
- udsl_groom_skb (vcc, skb);
- skb_queue_tail (&instance->sndqueue, skb);
- tasklet_schedule (&instance->send_tasklet);
-
- return 0;
-}
-
-
-/**********
-** ATM **
-**********/
-
-static void udsl_atm_dev_close (struct atm_dev *dev)
-{
- struct udsl_instance_data *instance = dev->dev_data;
-
- if (!instance) {
- dbg ("udsl_atm_dev_close: NULL instance!");
- return;
- }
-
- dbg ("udsl_atm_dev_close: queue has %u elements", instance->sndqueue.qlen);
-
- dbg ("udsl_atm_dev_close: killing tasklet");
- tasklet_kill (&instance->send_tasklet);
- dbg ("udsl_atm_dev_close: freeing instance");
- kfree (instance);
- dev->dev_data = NULL;
-}
-
-static int udsl_atm_proc_read (struct atm_dev *atm_dev, loff_t *pos, char *page)
-{
- struct udsl_instance_data *instance = atm_dev->dev_data;
- int left = *pos;
-
- if (!instance) {
- dbg ("NULL instance!");
- return -ENODEV;
- }
-
- if (!left--)
- return sprintf (page, "%s\n", instance->description);
-
- if (!left--)
- return sprintf (page, "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- atm_dev->esi[0], atm_dev->esi[1], atm_dev->esi[2],
- atm_dev->esi[3], atm_dev->esi[4], atm_dev->esi[5]);
-
- if (!left--)
- return sprintf (page, "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop
)\n",
- atomic_read (&atm_dev->stats.aal5.tx),
- atomic_read (&atm_dev->stats.aal5.tx_err),
- atomic_read (&atm_dev->stats.aal5.rx),
- atomic_read (&atm_dev->stats.aal5.rx_err),
- atomic_read (&atm_dev->stats.aal5.rx_drop));
-
- if (!left--) {
- switch (atm_dev->signal) {
- case ATM_PHY_SIG_FOUND:
- sprintf (page, "Line up");
- break;
- case ATM_PHY_SIG_LOST:
- sprintf (page, "Line down");
- break;
- default:
- sprintf (page, "Line state unknown");
- break;
- }
-
- if (instance->usb_dev) {
- if (!instance->firmware_loaded)
- strcat (page, ", no firmware\n");
- else
- strcat (page, ", firmware loaded\n");
- } else
- strcat (page, ", disconnected\n");
-
- return strlen (page);
- }
-
- return 0;
-}
-
-static int udsl_atm_open (struct atm_vcc *vcc, short vpi, int vci)
-{
- struct udsl_instance_data *instance = vcc->dev->dev_data;
-
- dbg ("udsl_atm_open called");
-
- if (!instance || !instance->usb_dev) {
- dbg ("NULL data!");
- return -ENODEV;
- }
-
- /* at the moment only AAL5 support */
- if (vcc->qos.aal != ATM_AAL5)
- return -EINVAL;
-
- MOD_INC_USE_COUNT;
-
- vcc->dev_data =
- atmsar_open (&(instance->atmsar_vcc_list), vcc, ATMSAR_TYPE_AAL5, vpi,
vci, 0, 0,
- ATMSAR_USE_53BYTE_CELL | ATMSAR_SET_PTI);
- if (!vcc->dev_data) {
- MOD_DEC_USE_COUNT;
- return -ENOMEM; /* this is the only reason atmsar_open can fail... */
- }
-
- vcc->vpi = vpi;
- vcc->vci = vci;
- set_bit (ATM_VF_ADDR, &vcc->flags);
- set_bit (ATM_VF_PARTIAL, &vcc->flags);
- set_bit (ATM_VF_READY, &vcc->flags);
-
- ((struct atmsar_vcc_data *)vcc->dev_data)->mtu = UDSL_MAX_AAL5_MRU;
-
- if (instance->firmware_loaded)
- udsl_fire_receivers (instance);
-
- dbg ("udsl_atm_open successful");
- return 0;
-}
-
-static void udsl_atm_close (struct atm_vcc *vcc)
-{
- struct udsl_instance_data *instance = vcc->dev->dev_data;
-
- dbg ("udsl_atm_close called");
-
- if (!instance) {
- dbg ("NULL instance!");
- return;
- }
-
- /* freeing resources */
- /* cancel all sends on this vcc */
- udsl_cancel_send (instance, vcc);
-
- atmsar_close (&(instance->atmsar_vcc_list), vcc->dev_data);
- vcc->dev_data = NULL;
- clear_bit (ATM_VF_PARTIAL, &vcc->flags);
-
- /* freeing address */
- vcc->vpi = ATM_VPI_UNSPEC;
- vcc->vci = ATM_VCI_UNSPEC;
- clear_bit (ATM_VF_ADDR, &vcc->flags);
-
- MOD_DEC_USE_COUNT;
-
- dbg ("udsl_atm_close successful");
- return;
-}
-
-static int udsl_atm_ioctl (struct atm_dev *dev, unsigned int cmd, void *arg)
-{
- switch (cmd) {
- case ATM_QUERYLOOP:
- return put_user (ATM_LM_NONE, (int *) arg) ? -EFAULT : 0;
- default:
- return -ENOIOCTLCMD;
- }
-}
-
-
-/**********
-** USB **
-**********/
-
-static int udsl_usb_ioctl (struct usb_interface *intf, unsigned int code, void
*user_data)
-{
- struct udsl_instance_data *instance = usb_get_intfdata (intf);
-
- dbg ("udsl_usb_ioctl entered");
-
- if (!instance) {
- dbg ("NULL instance!");
- return -ENODEV;
- }
-
- switch (code) {
- case UDSL_IOCTL_START:
- instance->atm_dev->signal = ATM_PHY_SIG_FOUND;
- down (&instance->serialize); /* vs self */
- if (!instance->firmware_loaded) {
- usb_set_interface (instance->usb_dev, 1, 1);
- instance->firmware_loaded = 1;
- }
- up (&instance->serialize);
- udsl_fire_receivers (instance);
- return 0;
- case UDSL_IOCTL_STOP:
- instance->atm_dev->signal = ATM_PHY_SIG_LOST;
- return 0;
- default:
- return -ENOTTY;
- }
-}
-
-static int udsl_usb_probe (struct usb_interface *intf, const struct usb_device_id *id)
-{
- struct usb_device *dev = interface_to_usbdev(intf);
- int ifnum = intf->altsetting->desc.bInterfaceNumber;
- struct udsl_instance_data *instance;
- unsigned char mac_str [13];
- int i, length;
- char *buf;
-
- dbg ("Trying device with Vendor=0x%x, Product=0x%x, ifnum %d",
- dev->descriptor.idVendor, dev->descriptor.idProduct, ifnum);
-
- if ((dev->descriptor.bDeviceClass != USB_CLASS_VENDOR_SPEC) ||
- (dev->descriptor.idVendor != SPEEDTOUCH_VENDORID) ||
- (dev->descriptor.idProduct != SPEEDTOUCH_PRODUCTID) || (ifnum != 1))
- return -ENODEV;
-
- dbg ("Device Accepted");
-
- /* instance init */
- if (!(instance = kmalloc (sizeof (struct udsl_instance_data), GFP_KERNEL))) {
- dbg ("No memory for Instance data!");
- return -ENOMEM;
- }
-
- memset (instance, 0, sizeof (struct udsl_instance_data));
-
- init_MUTEX (&instance->serialize);
-
- instance->usb_dev = dev;
-
- spin_lock_init (&instance->spare_receivers_lock);
- INIT_LIST_HEAD (&instance->spare_receivers);
-
- spin_lock_init (&instance->completed_receivers_lock);
- INIT_LIST_HEAD (&instance->completed_receivers);
-
- tasklet_init (&instance->receive_tasklet, udsl_process_receive, (unsigned
long) instance);
-
- skb_queue_head_init (&instance->sndqueue);
-
- spin_lock_init (&instance->send_lock);
- INIT_LIST_HEAD (&instance->spare_senders);
- INIT_LIST_HEAD (&instance->spare_buffers);
-
- tasklet_init (&instance->send_tasklet, udsl_process_send, (unsigned long)
instance);
- INIT_LIST_HEAD (&instance->filled_buffers);
-
- /* receive init */
- for (i = 0; i < UDSL_NUMBER_RCV_URBS; i++) {
- struct udsl_receiver *rcv = &(instance->all_receivers[i]);
-
- if (!(rcv->skb = dev_alloc_skb (UDSL_RCV_BUFFER_SIZE *
ATM_CELL_SIZE))) {
- dbg ("No memory for skb %d!", i);
- goto fail;
- }
-
- if (!(rcv->urb = usb_alloc_urb (0, GFP_KERNEL))) {
- dbg ("No memory for receive urb %d!", i);
- goto fail;
- }
-
- rcv->instance = instance;
-
- list_add (&rcv->list, &instance->spare_receivers);
-
- dbg ("skb->truesize = %d (asked for %d)", rcv->skb->truesize,
UDSL_RCV_BUFFER_SIZE * ATM_CELL_SIZE);
- }
-
- /* send init */
- for (i = 0; i < UDSL_NUMBER_SND_URBS; i++) {
- struct udsl_sender *snd = &(instance->all_senders[i]);
-
- if (!(snd->urb = usb_alloc_urb (0, GFP_KERNEL))) {
- dbg ("No memory for send urb %d!", i);
- goto fail;
- }
-
- snd->instance = instance;
-
- list_add (&snd->list, &instance->spare_senders);
- }
-
- for (i = 0; i < UDSL_NUMBER_SND_BUFS; i++) {
- struct udsl_send_buffer *buf = &(instance->all_buffers[i]);
-
- if (!(buf->base = kmalloc (UDSL_SND_BUFFER_SIZE * ATM_CELL_SIZE,
GFP_KERNEL))) {
- dbg ("No memory for send buffer %d!", i);
- goto fail;
- }
-
- list_add (&buf->list, &instance->spare_buffers);
- }
-
- /* atm init */
- if (!(instance->atm_dev = atm_dev_register (udsl_driver_name,
&udsl_atm_devops, -1, 0))) {
- dbg ("failed to register ATM device!");
- goto fail;
- }
-
- instance->atm_dev->ci_range.vpi_bits = ATM_CI_MAX;
- instance->atm_dev->ci_range.vci_bits = ATM_CI_MAX;
- instance->atm_dev->signal = ATM_PHY_SIG_UNKNOWN;
-
- /* tmp init atm device, set to 128kbit */
- instance->atm_dev->link_rate = 128 * 1000 / 424;
-
- /* set MAC address, it is stored in the serial number */
- memset (instance->atm_dev->esi, 0, sizeof (instance->atm_dev->esi));
- if (usb_string (dev, dev->descriptor.iSerialNumber, mac_str, sizeof (mac_str))
== 12)
- for (i = 0; i < 6; i++)
- instance->atm_dev->esi[i] = (hex2int (mac_str[i * 2]) * 16) +
(hex2int (mac_str[i * 2 + 1]));
-
- /* device description */
- buf = instance->description;
- length = sizeof (instance->description);
-
- if ((i = usb_string (dev, dev->descriptor.iProduct, buf, length)) < 0)
- goto finish;
-
- buf += i;
- length -= i;
-
- i = snprintf (buf, length, " (");
- buf += i;
- length -= i;
-
- if (length <= 0 || (i = usb_make_path (dev, buf, length)) < 0)
- goto finish;
-
- buf += i;
- length -= i;
-
- snprintf (buf, length, ")");
-
-finish:
- /* ready for ATM callbacks */
- instance->atm_dev->dev_data = instance;
-
- usb_set_intfdata (intf, instance);
-
- return 0;
-
-fail:
- for (i = 0; i < UDSL_NUMBER_SND_BUFS; i++)
- kfree (instance->all_buffers[i].base);
-
- for (i = 0; i < UDSL_NUMBER_SND_URBS; i++)
- usb_free_urb (instance->all_senders[i].urb);
-
- for (i = 0; i < UDSL_NUMBER_RCV_URBS; i++) {
- struct udsl_receiver *rcv = &(instance->all_receivers[i]);
-
- usb_free_urb (rcv->urb);
-
- if (rcv->skb)
- kfree_skb (rcv->skb);
- }
-
- kfree (instance);
-
- return -ENOMEM;
-}
-
-static void udsl_usb_disconnect (struct usb_interface *intf)
-{
- struct udsl_instance_data *instance = usb_get_intfdata (intf);
- struct list_head *pos;
- unsigned long flags;
- unsigned int count = 0;
- int result, i;
-
- dbg ("disconnecting");
-
- usb_set_intfdata (intf, NULL);
-
- if (!instance) {
- dbg ("NULL instance!");
- return;
- }
-
- tasklet_disable (&instance->receive_tasklet);
-
- /* receive finalize */
- down (&instance->serialize); /* vs udsl_fire_receivers */
- /* no need to take the spinlock */
- list_for_each (pos, &instance->spare_receivers)
- if (++count > UDSL_NUMBER_RCV_URBS)
- panic (__FILE__ ": memory corruption detected at line %d!\n",
__LINE__);
- INIT_LIST_HEAD (&instance->spare_receivers);
- up (&instance->serialize);
-
- dbg ("udsl_usb_disconnect: flushed %u spare receivers", count);
-
- count = UDSL_NUMBER_RCV_URBS - count;
-
- for (i = 0; i < UDSL_NUMBER_RCV_URBS; i++)
- if ((result = usb_unlink_urb (instance->all_receivers[i].urb)) < 0)
- dbg ("udsl_usb_disconnect: usb_unlink_urb on receive urb %d
returned %d", i, result);
-
- /* wait for completion handlers to finish */
- do {
- unsigned int completed = 0;
-
- spin_lock_irqsave (&instance->completed_receivers_lock, flags);
- list_for_each (pos, &instance->completed_receivers)
- if (++completed > count)
- panic (__FILE__ ": memory corruption detected at line
%d!\n", __LINE__);
- spin_unlock_irqrestore (&instance->completed_receivers_lock, flags);
-
- dbg ("udsl_usb_disconnect: found %u completed receivers", completed);
-
- if (completed == count)
- break;
-
- yield ();
- } while (1);
-
- dbg ("udsl_usb_disconnect: flushing");
- /* no need to take the spinlock */
- INIT_LIST_HEAD (&instance->completed_receivers);
-
- tasklet_enable (&instance->receive_tasklet);
- tasklet_kill (&instance->receive_tasklet);
-
- dbg ("udsl_usb_disconnect: freeing receivers");
- for (i = 0; i < UDSL_NUMBER_RCV_URBS; i++) {
- struct udsl_receiver *rcv = &(instance->all_receivers[i]);
-
- usb_free_urb (rcv->urb);
- kfree_skb (rcv->skb);
- }
-
- /* send finalize */
- tasklet_disable (&instance->send_tasklet);
-
- for (i = 0; i < UDSL_NUMBER_SND_URBS; i++)
- if ((result = usb_unlink_urb (instance->all_senders[i].urb)) < 0)
- dbg ("udsl_usb_disconnect: usb_unlink_urb on send urb %d
returned %d", i, result);
-
- /* wait for completion handlers to finish */
- do {
- count = 0;
- spin_lock_irqsave (&instance->send_lock, flags);
- list_for_each (pos, &instance->spare_senders)
- if (++count > UDSL_NUMBER_SND_URBS)
- panic (__FILE__ ": memory corruption detected at line
%d!\n", __LINE__);
- spin_unlock_irqrestore (&instance->send_lock, flags);
-
- dbg ("udsl_usb_disconnect: found %u spare senders", count);
-
- if (count == UDSL_NUMBER_SND_URBS)
- break;
-
- yield ();
- } while (1);
-
- dbg ("udsl_usb_disconnect: flushing");
- /* no need to take the spinlock */
- INIT_LIST_HEAD (&instance->spare_senders);
- INIT_LIST_HEAD (&instance->spare_buffers);
- instance->current_buffer = NULL;
-
- tasklet_enable (&instance->send_tasklet);
-
- dbg ("udsl_usb_disconnect: freeing senders");
- for (i = 0; i < UDSL_NUMBER_SND_URBS; i++)
- usb_free_urb (instance->all_senders[i].urb);
-
- dbg ("udsl_usb_disconnect: freeing buffers");
- for (i = 0; i < UDSL_NUMBER_SND_BUFS; i++)
- kfree (instance->all_buffers[i].base);
-
- instance->usb_dev = NULL;
-
- /* atm finalize */
- shutdown_atm_dev (instance->atm_dev); /* frees instance */
-}
-
-
-/***********
-** init **
-***********/
-
-static int __init udsl_usb_init (void)
-{
- struct sk_buff *skb; /* dummy for sizeof */
-
- dbg ("udsl_usb_init: driver version " DRIVER_VERSION);
-
- if (sizeof (struct udsl_control) > sizeof (skb->cb)) {
- printk (KERN_ERR __FILE__ ": unusable with this kernel!\n");
- return -EIO;
- }
-
- return usb_register (&udsl_usb_driver);
-}
-
-static void __exit udsl_usb_cleanup (void)
-{
- dbg ("udsl_usb_cleanup");
-
- usb_deregister (&udsl_usb_driver);
-}
-
-module_init (udsl_usb_init);
-module_exit (udsl_usb_cleanup);
-
-MODULE_AUTHOR (DRIVER_AUTHOR);
-MODULE_DESCRIPTION (DRIVER_DESC);
-MODULE_LICENSE ("GPL");
-
-
-/************
-** debug **
-************/
-
-#ifdef DEBUG_PACKET
-static int udsl_print_packet (const unsigned char *data, int len)
-{
- unsigned char buffer [256];
- int i = 0, j = 0;
-
- for (i = 0; i < len;) {
- buffer[0] = '\0';
- sprintf (buffer, "%.3d :", i);
- for (j = 0; (j < 16) && (i < len); j++, i++) {
- sprintf (buffer, "%s %2.2x", buffer, data[i]);
- }
- dbg ("%s", buffer);
- }
- return i;
-}
-#endif
-------------------------------------------------------
This SF.net email is sponsored by: Does your code think in ink?
You could win a Tablet PC. Get a free Tablet PC hat just for playing.
What are you waiting for?
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr5043en
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
