Hi,
Here's a patch against 2.5.1-pre2 that merges together some of the USB
keyspan_pda driver device structures.
thanks,
greg k-h
diff -Nru a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
--- a/drivers/usb/serial/keyspan_pda.c Tue Nov 27 21:59:38 2001
+++ b/drivers/usb/serial/keyspan_pda.c Tue Nov 27 21:59:38 2001
@@ -172,10 +172,6 @@
#ifdef XIRCOM
static __devinitdata struct usb_device_id id_table_fake_xircom [] = {
{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
- { }
-};
-
-static __devinitdata struct usb_device_id id_table_fake_entregra [] = {
{ USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
{ }
};
@@ -843,9 +839,6 @@
static struct usb_serial_device_type keyspan_pda_fake_device = {
name: "Keyspan PDA - (prerenumeration)",
id_table: id_table_fake,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -856,24 +849,8 @@
#ifdef XIRCOM
static struct usb_serial_device_type xircom_pgs_fake_device = {
- name: "Xircom PGS - (prerenumeration)",
+ name: "Xircom / Entregra PGS - (prerenumeration)",
id_table: id_table_fake_xircom,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
- num_interrupt_in: NUM_DONT_CARE,
- num_bulk_in: NUM_DONT_CARE,
- num_bulk_out: NUM_DONT_CARE,
- num_ports: 1,
- startup: keyspan_pda_fake_startup,
-};
-
-static struct usb_serial_device_type entregra_pgs_fake_device = {
- name: "Entregra PGS - (prerenumeration)",
- id_table: id_table_fake_entregra,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -885,9 +862,6 @@
static struct usb_serial_device_type keyspan_pda_device = {
name: "Keyspan PDA",
id_table: id_table_std,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 0,
num_bulk_out: 1,
@@ -917,7 +891,6 @@
#endif
#ifdef XIRCOM
usb_serial_register (&xircom_pgs_fake_device);
- usb_serial_register (&entregra_pgs_fake_device);
#endif
info(DRIVER_DESC " " DRIVER_VERSION);
return 0;
@@ -931,7 +904,6 @@
usb_serial_deregister (&keyspan_pda_fake_device);
#endif
#ifdef XIRCOM
- usb_serial_deregister (&entregra_pgs_fake_device);
usb_serial_deregister (&xircom_pgs_fake_device);
#endif
}
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel