projects / packages / atmelwlandriver.git / blame
| Commit | Line | Data |
|---|---|---|
| 2b37ad0b PS |
1 | diff -uNr atmelwlandriver/src/usb.orig/reset_device.c atmelwlandriver/src/usb/reset_device.c |
| 2 | --- atmelwlandriver/src/usb.orig/reset_device.c 2004-06-05 06:11:18.000000000 +0200 | |
| 3 | +++ atmelwlandriver/src/usb/reset_device.c 2004-07-18 23:50:44.597568680 +0200 | |
| 4 | @@ -21,6 +21,7 @@ | |
| 5 | #include "vnetusba.h" | |
| 6 | #include "hub.h" | |
| 7 | #include "hcd.h" | |
| 8 | +#include <linux/delay.h> | |
| 9 | #include "linux/device.h" | |
| 10 | ||
| 11 | static DECLARE_MUTEX(usb_address0_sem); | |
| 12 | @@ -551,7 +552,7 @@ | |
| 13 | delay_time < HUB_RESET_TIMEOUT; | |
| 14 | delay_time += delay) { | |
| 15 | /* wait to give the device a chance to reset */ | |
| 16 | - wait_ms(delay); | |
| 17 | + mdelay(delay); | |
| 18 | ||
| 19 | /* read and decode port status */ | |
| 20 | ret = __hub_port_status(hub, port, &portstatus, &portchange); | |
| 21 | @@ -1057,7 +1058,7 @@ | |
| 22 | if (retval >= 0) | |
| 23 | break; | |
| 24 | printk(KERN_INFO "TON PINOUME EDW1\n"); | |
| 25 | - wait_ms(200); | |
| 26 | + mdelay(200); | |
| 27 | } | |
| 28 | if (retval < 0) { | |
| 29 | printk(KERN_INFO "TON PINOUME EDW2\n"); | |
| 30 | @@ -1080,14 +1081,14 @@ | |
| 31 | * FIXME assumes device->descriptor cacheline is dma-coherent | |
| 32 | * and so does usb_get_device_descriptor | |
| 33 | */ | |
| 34 | - wait_ms(10); | |
| 35 | + mdelay(10); | |
| 36 | printk(KERN_INFO "TON PINOUME EDW4\n"); | |
| 37 | retval = usb_get_descriptor(dev, USB_DT_DEVICE, 0, | |
| 38 | &dev->descriptor, 8); | |
| 39 | printk(KERN_INFO "TON PINOUME EDW5\n"); | |
| 40 | if (retval >= 8) | |
| 41 | break; | |
| 42 | - wait_ms(100); | |
| 43 | + mdelay(100); | |
| 44 | } | |
| 45 | if (retval != 8) { | |
| 46 | dev_err(&dev->dev, "device descriptor read/%s, error %d\n", | |
| 47 | @@ -1213,7 +1214,7 @@ | |
| 48 | } | |
| 49 | ||
| 50 | /* Let the SET_ADDRESS settle */ | |
| 51 | - wait_ms(10); | |
| 52 | + mdelay(10); | |
| 53 | ||
| 54 | up(&usb_address0_sem); | |
| 55 | ||
| 56 | diff -uNr atmelwlandriver/src/usb.orig/vnet.c atmelwlandriver/src/usb/vnet.c | |
| 57 | --- atmelwlandriver/src/usb.orig/vnet.c 2004-06-05 06:11:18.000000000 +0200 | |
| 58 | +++ atmelwlandriver/src/usb/vnet.c 2004-07-18 23:50:29.620845488 +0200 | |
| 59 | @@ -20,6 +20,7 @@ | |
| 60 | ||
| 61 | **************************************************************************************/ | |
| 62 | #include "vnetusba.h" | |
| 63 | +#include <linux/delay.h> | |
| 64 | #include <linux/wireless.h> | |
| 65 | #include "command.h" | |
| 66 | #include "rx.h" | |
| 67 | @@ -622,7 +623,7 @@ | |
| 68 | ||
| 69 | if (pTxList->status & UNDER_SUBMIT) { | |
| 70 | dbgcond(DBG_TX, "tx packet %p dropped\n", pTxList); | |
| 71 | - wait_ms(10); | |
| 72 | + mdelay(10); | |
| 73 | pTxList->status &= ~UNDER_SUBMIT; /* jal: shall we inform USB somehow ??? */ | |
| 74 | } | |
| 75 | ||
| 76 | diff -uNr atmelwlandriver/src/usb.orig/vnetusba.c atmelwlandriver/src/usb/vnetusba.c | |
| 77 | --- atmelwlandriver/src/usb.orig/vnetusba.c 2004-07-18 23:27:40.000000000 +0200 | |
| 78 | +++ atmelwlandriver/src/usb/vnetusba.c 2004-07-18 23:49:34.409238928 +0200 | |
| 79 | @@ -1320,9 +1320,6 @@ | |
| 80 | ||
| 81 | static void __exit usb_vnet_exit(void) | |
| 82 | { | |
| 83 | -#if (LINUX_VERSION_CODE < 0x020500) | |
| 84 | - wait_ms(250); //wait for call_usermodehelper to finish. | |
| 85 | -#endif | |
| 86 | //printk("AtmelWlanDriver Is deregistered!\n"); | |
| 87 | usb_deregister(&vnet_driver); | |
| 88 | } |