Attachment 1296 Details for Bug 8648 – slusb patch

slusb patch

slmodem-2.9.10-st7554-new-2.6.14.patch (text/plain), 1.50 KB, created by Artem Delendik on 2005-12-14 21:59:01 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Artem Delendik

Created: 2005-12-14 21:59:01 MSK

Size: 1.50 KB

patch

obsolete

>diff -Nur kernel-source-slmodem-2.9.10.orig/drivers/st7554.c kernel-source-slmodem-2.9.10/drivers/st7554.c
>--- kernel-source-slmodem-2.9.10.orig/drivers/st7554.c	2004-06-23 23:20:34 +0300
>+++ kernel-source-slmodem-2.9.10/drivers/st7554.c	2005-12-14 18:12:17 +0200
>@@ -59,6 +59,13 @@
> 
> #include <modem_defs.h>
> 
>+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
>+#define class_simple_device_add(class, dev, addr, name, i)
>+#define class_simple_device_remove(dev)
>+#define class_simple_create(module, name) (struct class_simple *)(name)
>+#define class_simple_destroy(class)
>+#endif
>+
> #define MAX_MODEMS 16
> 
> #define USB_INFO(fmt...) printk(KERN_INFO fmt)
>@@ -270,6 +277,10 @@
> 
> #define BYTES_IN_FRAMES(s,n) ((((s)->srate*(n))/1000)<<(MFMT_BYTESSHIFT((s)->format)))
> 
>+#ifndef URB_ASYNC_UNLINK
>+#define URB_ASYNC_UNLINK 0
>+#endif
>+
> #define FILL_URB(state,ch,u) { \
> 	(u)->dev = (state)->usbdev;  \
> 	(u)->pipe = (ch)->pipe; \
>@@ -277,7 +288,7 @@
> 	(u)->number_of_packets = DESCFRAMES;  \
>         (u)->interval = (ch)->interval; \
>         (u)->status   = 0;              \
>-	(u)->transfer_flags |= URB_ISO_ASAP;   }
>+	(u)->transfer_flags |= URB_ISO_ASAP|URB_ASYNC_UNLINK;   }
> 
> #define FILL_DESC_OUT(state,ch,u,count) { int i; \
> 	unsigned shft = MFMT_BYTESSHIFT((state)->format); \
>@@ -1109,8 +1120,8 @@
> 	SET_REG(s, ST7554_GPIO_INV, 0);
> 
> 	/* clear usb ep */
>-	CLEAR_ENDPOINT(s, s->mi.pipe);
>-	CLEAR_ENDPOINT(s, s->mo.pipe);
>+	usb_clear_halt(s->usbdev, s->mi.pipe);
>+	usb_clear_halt(s->usbdev, s->mo.pipe);
> 
> 	return 0;
> }

Actions: View

Attachments on bug 8648: 1296 | 1297