* [PATCH] Merge support for Keyspan UPR-112 USB serial adapter from 2.4 to 2.6
@ 2004-05-13 0:00 Tony Lindgren
2004-05-13 22:49 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Tony Lindgren @ 2004-05-13 0:00 UTC (permalink / raw)
To: linux-kernel; +Cc: greg
[-- Attachment #1: Type: text/plain, Size: 113 bytes --]
Hi,
Following patch merges the support for Keyspan UPR-112 USB serial adapter
from 2.4 to 2.6.
Regards,
Tony
[-- Attachment #2: patch-2.6.6-usb-keyspan-upr-112 --]
[-- Type: text/plain, Size: 1621 bytes --]
This patch merges the support for Keyspan UPR-112 USB serial adapter
from 2.4 to 2.6.
This patch contains updates to the following files:
b/drivers/usb/serial/keyspan.h
diff -Nru a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
--- a/drivers/usb/serial/keyspan.h Wed May 12 15:42:18 2004
+++ b/drivers/usb/serial/keyspan.h Wed May 12 15:42:18 2004
@@ -326,6 +326,22 @@
.baudclk = KEYSPAN_USA19_BAUDCLK,
};
+static const struct keyspan_device_details mpr_device_details = {
+ .product_id = keyspan_mpr_product_id,
+ .msg_format = msg_usa28,
+ .num_ports = 1,
+ .indat_endp_flip = 1,
+ .outdat_endp_flip = 1,
+ .indat_endpoints = {0x81},
+ .outdat_endpoints = {0x01},
+ .inack_endpoints = {0x83},
+ .outcont_endpoints = {0x03},
+ .instat_endpoint = 0x84,
+ .glocont_endpoint = -1,
+ .calculate_baud_rate = keyspan_usa28_calc_baud,
+ .baudclk = KEYSPAN_USA19_BAUDCLK,
+};
+
static const struct keyspan_device_details usa19qw_device_details = {
.product_id = keyspan_usa19qw_product_id,
.msg_format = msg_usa26,
@@ -460,6 +476,7 @@
&usa18x_device_details,
&usa19_device_details,
&usa19qi_device_details,
+ &mpr_device_details,
&usa19qw_device_details,
&usa19w_device_details,
&usa19hs_device_details,
@@ -535,7 +552,7 @@
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19qw_product_id) },
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19w_product_id) },
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19hs_product_id) },
- { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_mpr_pre_product_id) },
+ { USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_mpr_product_id) },
{ } /* Terminating entry */
};
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Merge support for Keyspan UPR-112 USB serial adapter from 2.4 to 2.6
2004-05-13 0:00 [PATCH] Merge support for Keyspan UPR-112 USB serial adapter from 2.4 to 2.6 Tony Lindgren
@ 2004-05-13 22:49 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2004-05-13 22:49 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-kernel
On Wed, May 12, 2004 at 05:00:11PM -0700, Tony Lindgren wrote:
> Hi,
>
> Following patch merges the support for Keyspan UPR-112 USB serial adapter
> from 2.4 to 2.6.
Applied, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-05-13 23:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-05-13 0:00 [PATCH] Merge support for Keyspan UPR-112 USB serial adapter from 2.4 to 2.6 Tony Lindgren
2004-05-13 22:49 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox