diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/usb/serial/usb-serial.h | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/usb/serial/usb-serial.h')
| -rw-r--r-- | drivers/usb/serial/usb-serial.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h index 6211a6309..8991f4be9 100644 --- a/drivers/usb/serial/usb-serial.h +++ b/drivers/usb/serial/usb-serial.h @@ -39,10 +39,8 @@ struct usb_serial_port { unsigned char number; char active; /* someone has this device open */ - struct usb_endpoint_descriptor * interrupt_in_endpoint; - __u8 interrupt_in_interval; unsigned char * interrupt_in_buffer; - struct urb * control_urb; + struct urb * interrupt_in_urb; unsigned char * bulk_in_buffer; struct urb * read_urb; @@ -50,7 +48,10 @@ struct usb_serial_port { unsigned char * bulk_out_buffer; int bulk_out_size; struct urb * write_urb; - void * private; /* data private to the specific driver */ + + wait_queue_head_t write_wait; + + void * private; /* data private to the specific port */ }; struct usb_serial { @@ -65,11 +66,6 @@ struct usb_serial { char num_bulk_out; /* number of bulk out endpoints we have */ struct usb_serial_port port[MAX_NUM_PORTS]; - /* FIXME! These should move to the private area of the keyspan driver */ - int tx_room; - int tx_throttled; - wait_queue_head_t write_wait; - void * private; /* data private to the specific driver */ }; @@ -99,7 +95,8 @@ struct usb_serial_device_type { /* function call to make before accepting driver */ int (*startup) (struct usb_serial *serial); /* return 0 to continue initialization, anything else to abort */ - + void (*shutdown) (struct usb_serial *serial); + /* serial function calls */ int (*open) (struct usb_serial_port *port, struct file * filp); void (*close) (struct usb_serial_port *port, struct file * filp); @@ -111,7 +108,8 @@ struct usb_serial_device_type { int (*chars_in_buffer) (struct usb_serial_port *port); void (*throttle) (struct usb_serial_port *port); void (*unthrottle) (struct usb_serial_port *port); - + + void (*read_int_callback)(struct urb *urb); void (*read_bulk_callback)(struct urb *urb); void (*write_bulk_callback)(struct urb *urb); }; @@ -124,6 +122,7 @@ extern struct usb_serial_device_type whiteheat_device; extern struct usb_serial_device_type ftdi_sio_device; extern struct usb_serial_device_type keyspan_pda_fake_device; extern struct usb_serial_device_type keyspan_pda_device; +extern struct usb_serial_device_type zyxel_omninet_device; /* determine if we should include the EzUSB loader functions */ |