Menu
▾
▴
[Linuxconsole-commit]CVS: ruby/linux/drivers/usb/input aiptek.c,1.1,1.2 usbkbd.c,1.1,1.2 usbmouse.c,1.1,1.2 wacom.c,1.1,1.2 usbpath.h,1.1,NONE
|
From: Vojtech P. <vo...@us...> - 2002-07-11 12:36:43
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input
In directory usw-pr-cvs1:/tmp/cvs-serv6612
Modified Files:
aiptek.c usbkbd.c usbmouse.c wacom.c
Removed Files:
usbpath.h
Log Message:
Sync to 2.5 changes.
Index: aiptek.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/aiptek.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aiptek.c 18 Jun 2002 18:51:55 -0000 1.1
+++ aiptek.c 11 Jul 2002 12:36:39 -0000 1.2
@@ -296,9 +296,8 @@
input_register_device(&aiptek->dev);
- printk(KERN_INFO "input%d: %s on usb%d:%d.%d\n",
- aiptek->dev.number, aiptek->features->name, dev->bus->busnum,
- dev->devnum, ifnum);
+ printk(KERN_INFO "input: %s on usb%d:%d.%d\n",
+ aiptek->features->name, dev->bus->busnum, dev->devnum, ifnum);
return aiptek;
}
Index: usbkbd.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/usbkbd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usbkbd.c 16 Apr 2002 17:41:51 -0000 1.1
+++ usbkbd.c 11 Jul 2002 12:36:39 -0000 1.2
@@ -69,7 +69,7 @@
struct usb_device *usbdev;
unsigned char new[8];
unsigned char old[8];
- struct urb irq, led;
+ struct urb *irq, *led;
struct usb_ctrlrequest cr;
unsigned char leds, newleds;
char name[128];
@@ -118,15 +118,15 @@
(!!test_bit(LED_SCROLLL, dev->led) << 2) | (!!test_bit(LED_CAPSL, dev->led) << 1) |
(!!test_bit(LED_NUML, dev->led));
- if (kbd->led.status == -EINPROGRESS)
+ if (kbd->led->status == -EINPROGRESS)
return 0;
if (kbd->leds == kbd->newleds)
return 0;
kbd->leds = kbd->newleds;
- kbd->led.dev = kbd->usbdev;
- if (usb_submit_urb(&kbd->led))
+ kbd->led->dev = kbd->usbdev;
+ if (usb_submit_urb(kbd->led, GFP_ATOMIC))
err("usb_submit_urb(leds) failed");
return 0;
@@ -143,8 +143,8 @@
return;
kbd->leds = kbd->newleds;
- kbd->led.dev = kbd->usbdev;
- if (usb_submit_urb(&kbd->led))
+ kbd->led->dev = kbd->usbdev;
+ if (usb_submit_urb(kbd->led, GFP_ATOMIC))
err("usb_submit_urb(leds) failed");
}
@@ -155,8 +155,8 @@
if (kbd->open++)
return 0;
- kbd->irq.dev = kbd->usbdev;
- if (usb_submit_urb(&kbd->irq))
+ kbd->irq->dev = kbd->usbdev;
+ if (usb_submit_urb(kbd->irq, GFP_KERNEL))
return -EIO;
return 0;
@@ -167,7 +167,7 @@
struct usb_kbd *kbd = dev->private;
if (!--kbd->open)
- usb_unlink_urb(&kbd->irq);
+ usb_unlink_urb(kbd->irq);
}
static void *usb_kbd_probe(struct usb_device *dev, unsigned int ifnum,
@@ -196,6 +196,18 @@
if (!(kbd = kmalloc(sizeof(struct usb_kbd), GFP_KERNEL))) return NULL;
memset(kbd, 0, sizeof(struct usb_kbd));
+ kbd->irq = usb_alloc_urb(0, GFP_KERNEL);
+ if (!kbd->irq) {
+ kfree(kbd);
+ return NULL;
+ }
+ kbd->led = usb_alloc_urb(0, GFP_KERNEL);
+ if (!kbd->led) {
+ usb_free_urb(kbd->irq);
+ kfree(kbd);
+ return NULL;
+ }
+
kbd->usbdev = dev;
kbd->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
@@ -210,7 +222,7 @@
kbd->dev.open = usb_kbd_open;
kbd->dev.close = usb_kbd_close;
- FILL_INT_URB(&kbd->irq, dev, pipe, kbd->new, maxp > 8 ? 8 : maxp,
+ FILL_INT_URB(kbd->irq, dev, pipe, kbd->new, maxp > 8 ? 8 : maxp,
usb_kbd_irq, kbd, endpoint->bInterval);
kbd->cr.bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE;
@@ -247,7 +259,7 @@
kfree(buf);
- FILL_CONTROL_URB(&kbd->led, dev, usb_sndctrlpipe(dev, 0),
+ FILL_CONTROL_URB(kbd->led, dev, usb_sndctrlpipe(dev, 0),
(void*) &kbd->cr, &kbd->leds, 1, usb_kbd_led, kbd);
input_register_device(&kbd->dev);
@@ -260,8 +272,10 @@
static void usb_kbd_disconnect(struct usb_device *dev, void *ptr)
{
struct usb_kbd *kbd = ptr;
- usb_unlink_urb(&kbd->irq);
+ usb_unlink_urb(kbd->irq);
input_unregister_device(&kbd->dev);
+ usb_free_urb(kbd->irq);
+ usb_free_urb(kbd->led);
kfree(kbd);
}
Index: usbmouse.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/usbmouse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usbmouse.c 16 Apr 2002 17:41:51 -0000 1.1
+++ usbmouse.c 11 Jul 2002 12:36:39 -0000 1.2
@@ -51,7 +51,7 @@
char phys[64];
struct usb_device *usbdev;
struct input_dev dev;
- struct urb irq;
+ struct urb *irq;
int open;
};
@@ -81,8 +81,8 @@
if (mouse->open++)
return 0;
- mouse->irq.dev = mouse->usbdev;
- if (usb_submit_urb(&mouse->irq))
+ mouse->irq->dev = mouse->usbdev;
+ if (usb_submit_urb(mouse->irq, GFP_KERNEL))
return -EIO;
return 0;
@@ -93,7 +93,7 @@
struct usb_mouse *mouse = dev->private;
if (!--mouse->open)
- usb_unlink_urb(&mouse->irq);
+ usb_unlink_urb(mouse->irq);
}
static void *usb_mouse_probe(struct usb_device *dev, unsigned int ifnum,
@@ -122,6 +122,12 @@
if (!(mouse = kmalloc(sizeof(struct usb_mouse), GFP_KERNEL))) return NULL;
memset(mouse, 0, sizeof(struct usb_mouse));
+ mouse->irq = usb_alloc_urb(0, GFP_KERNEL);
+ if (!mouse->irq) {
+ kfree(mouse);
+ return NULL;
+ }
+
mouse->usbdev = dev;
mouse->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
@@ -162,7 +168,7 @@
kfree(buf);
- FILL_INT_URB(&mouse->irq, dev, pipe, mouse->data, maxp > 8 ? 8 : maxp,
+ FILL_INT_URB(mouse->irq, dev, pipe, mouse->data, maxp > 8 ? 8 : maxp,
usb_mouse_irq, mouse, endpoint->bInterval);
input_register_device(&mouse->dev);
@@ -175,8 +181,9 @@
static void usb_mouse_disconnect(struct usb_device *dev, void *ptr)
{
struct usb_mouse *mouse = ptr;
- usb_unlink_urb(&mouse->irq);
+ usb_unlink_urb(mouse->irq);
input_unregister_device(&mouse->dev);
+ usb_free_urb(mouse->irq);
kfree(mouse);
}
Index: wacom.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/wacom.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wacom.c 16 Apr 2002 17:41:51 -0000 1.1
+++ wacom.c 11 Jul 2002 12:36:39 -0000 1.2
@@ -99,7 +99,7 @@
signed char data[10];
struct input_dev dev;
struct usb_device *usbdev;
- struct urb irq;
+ struct urb *irq;
struct wacom_features *features;
int tool[2];
int open;
@@ -335,8 +335,8 @@
if (wacom->open++)
return 0;
- wacom->irq.dev = wacom->usbdev;
- if (usb_submit_urb(&wacom->irq))
+ wacom->irq->dev = wacom->usbdev;
+ if (usb_submit_urb(wacom->irq, GFP_KERNEL))
return -EIO;
return 0;
@@ -347,7 +347,7 @@
struct wacom *wacom = dev->private;
if (!--wacom->open)
- usb_unlink_urb(&wacom->irq);
+ usb_unlink_urb(wacom->irq);
}
static void *wacom_probe(struct usb_device *dev, unsigned int ifnum, const struct usb_device_id *id)
@@ -359,6 +359,12 @@
if (!(wacom = kmalloc(sizeof(struct wacom), GFP_KERNEL))) return NULL;
memset(wacom, 0, sizeof(struct wacom));
+ wacom->irq = usb_alloc_urb(0, GFP_KERNEL);
+ if (!wacom->irq) {
+ kfree(wacom);
+ return NULL;
+ }
+
wacom->features = wacom_features + id->driver_info;
wacom->dev.evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_MSC) | wacom->features->evbit;
@@ -402,7 +408,7 @@
endpoint = dev->config[0].interface[ifnum].altsetting[0].endpoint + 0;
- FILL_INT_URB(&wacom->irq, dev, usb_rcvintpipe(dev, endpoint->bEndpointAddress),
+ FILL_INT_URB(wacom->irq, dev, usb_rcvintpipe(dev, endpoint->bEndpointAddress),
wacom->data, wacom->features->pktlen, wacom->features->irq, wacom, endpoint->bInterval);
input_register_device(&wacom->dev);
@@ -415,8 +421,9 @@
static void wacom_disconnect(struct usb_device *dev, void *ptr)
{
struct wacom *wacom = ptr;
- usb_unlink_urb(&wacom->irq);
+ usb_unlink_urb(wacom->irq);
input_unregister_device(&wacom->dev);
+ usb_free_urb(wacom->irq);
kfree(wacom);
}
--- usbpath.h DELETED ---
|
