summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjal2 <jal2>2003-07-26 17:06:26 +0000
committerjal2 <jal2>2003-07-26 17:06:26 +0000
commit11158ad99546be01e6af7a62fc6a489047899634 (patch)
treee595da4a0e5a3a922f504845d32f5c13ee3f709c
parent3308a10d3c977fc52c45fd51dc30532997c7b533 (diff)
- 0.11beta4
- added init. of bss_list_timer (patch provided by Pavel Roskin) - added id_table for usbdfu for DFU class (patch provided by Pavel Roskin)
-rw-r--r--Makefile4
-rw-r--r--at76c503.c6
-rw-r--r--usbdfu.c10
3 files changed, 15 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4419a94..24252f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-#$Id: Makefile,v 1.10 2003/07/20 09:47:10 jal2 Exp $
+#$Id: Makefile,v 1.11 2003/07/26 17:06:26 jal2 Exp $
-VERSION = 0.11beta3
+VERSION = 0.11beta4
CC=gcc
diff --git a/at76c503.c b/at76c503.c
index 3b9a0c8..ac8ef8e 100644
--- a/at76c503.c
+++ b/at76c503.c
@@ -1,5 +1,5 @@
/* -*- linux-c -*- */
-/* $Id: at76c503.c,v 1.33 2003/07/15 19:57:05 jal2 Exp $
+/* $Id: at76c503.c,v 1.34 2003/07/26 17:06:26 jal2 Exp $
*
* USB at76c503/at76c505 driver
*
@@ -4469,6 +4469,8 @@ struct at76c503 *at76c503_new_device(struct usb_device *udev, int board_type,
dev->curr_bss = dev->new_bss = NULL;
INIT_LIST_HEAD(&dev->bss_list);
dev->bss_list_spinlock = SPIN_LOCK_UNLOCKED;
+
+ init_timer(&dev->bss_list_timer);
dev->bss_list_timer.data = (unsigned long)dev;
dev->bss_list_timer.function = bss_list_timeout;
/* we let this timer run the whole time this driver instance lives */
@@ -4515,7 +4517,7 @@ struct at76c503 *at76c503_new_device(struct usb_device *udev, int board_type,
else
dev->rx_data_fcs_len = 4;
- info("$Id: at76c503.c,v 1.33 2003/07/15 19:57:05 jal2 Exp $ compiled %s %s", __DATE__, __TIME__);
+ info("$Id: at76c503.c,v 1.34 2003/07/26 17:06:26 jal2 Exp $ compiled %s %s", __DATE__, __TIME__);
info("firmware version %d.%d.%d #%d (fcs_len %d)",
dev->fw_version.major, dev->fw_version.minor,
dev->fw_version.patch, dev->fw_version.build,
diff --git a/usbdfu.c b/usbdfu.c
index c815c4c..4bf9a93 100644
--- a/usbdfu.c
+++ b/usbdfu.c
@@ -128,6 +128,14 @@ static void * usbdfu_probe(struct usb_device *dev,
unsigned int ifnum, const struct usb_device_id *id);
static void usbdfu_disconnect(struct usb_device *dev, void *ptr);
+static struct usb_device_id dev_table[] = {
+ { .match_flags = (USB_DEVICE_ID_MATCH_INT_CLASS | USB_DEVICE_ID_MATCH_INT_SUBCLASS),
+ .bInterfaceClass = DFU_USB_CLASS, .bInterfaceSubClass = DFU_USB_SUBCLASS},
+ { }
+};
+
+MODULE_DEVICE_TABLE (usb, dev_table);
+
/* usb specific object needed to register this driver with the usb subsystem */
static struct usb_driver usbdfu_driver = {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20)
@@ -136,7 +144,7 @@ static struct usb_driver usbdfu_driver = {
name: "usbdfu",
probe: usbdfu_probe,
disconnect: usbdfu_disconnect,
- id_table: NULL,
+ id_table: dev_table,
};
/**