Commit 0df8a3db authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-4.11-rc1-2' of... 

Merge tag 'usb-serial-4.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-next

Johan writes:

USB-serial updates for v4.11-rc1 part 2

Here's one more device id for the new upd78f0730 driver and three
clean-up patches that are mostly moving some code around.

All have been in linux-next with no reported issues.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 53b7f7b5 beabdc3c

drivers/usb/serial/io_edgeport.c

+215 −2
Original line number Diff line number Diff line
@@ -57,6 +57,88 @@ 


#define OPEN_TIMEOUT		(5*HZ)		/* 5 seconds */



static const struct usb_device_id edgeport_2port_id_table[] = {

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_421) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_21) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2_DIN) },

	{ }

};



static const struct usb_device_id edgeport_4port_id_table[] = {

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_RAPIDPORT_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4T) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_MT4X56USB) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8_DUAL_CPU) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4_DIN) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_22I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_COMPATIBLE) },

	{ }

};



static const struct usb_device_id edgeport_8port_id_table[] = {

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_16_DUAL_CPU) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8R) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8RR) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_8) },

	{ }

};



static const struct usb_device_id Epic_port_id_table[] = {

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0202) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0203) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0310) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0311) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0312) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A758) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A794) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A225) },

	{ }

};



/* Devices that this driver supports */

static const struct usb_device_id id_table_combined[] = {

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_RAPIDPORT_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_4T) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_MT4X56USB) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_2) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_4I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_2I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_421) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_21) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_8_DUAL_CPU) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_8) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_2_DIN) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_4_DIN) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_16_DUAL_CPU) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_22I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_COMPATIBLE) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_8I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8R) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8RR) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_8) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0202) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0203) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0310) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0311) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0312) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A758) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A794) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A225) },

	{ } /* Terminating entry */

};



MODULE_DEVICE_TABLE(usb, id_table_combined);





/* receive port state */

enum RXSTATE {

	EXPECT_HDR1 = 0,    /* Expect header byte 1 */
@@ -217,8 +299,6 @@ static void edge_release(struct usb_serial *serial); 
static int edge_port_probe(struct usb_serial_port *port);

static int edge_port_remove(struct usb_serial_port *port);



#include "io_tables.h"	/* all of the devices that this driver supports */



/* function prototypes for all of our local functions */



static void  process_rcvd_data(struct edgeport_serial *edge_serial,
@@ -3032,6 +3112,139 @@ static int edge_port_remove(struct usb_serial_port *port) 
	return 0;

}



static struct usb_serial_driver edgeport_2port_device = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "edgeport_2",

	},

	.description		= "Edgeport 2 port adapter",

	.id_table		= edgeport_2port_id_table,

	.num_ports		= 2,

	.open			= edge_open,

	.close			= edge_close,

	.throttle		= edge_throttle,

	.unthrottle		= edge_unthrottle,

	.attach			= edge_startup,

	.disconnect		= edge_disconnect,

	.release		= edge_release,

	.port_probe		= edge_port_probe,

	.port_remove		= edge_port_remove,

	.ioctl			= edge_ioctl,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,

	.break_ctl		= edge_break,

	.read_int_callback	= edge_interrupt_callback,

	.read_bulk_callback	= edge_bulk_in_callback,

	.write_bulk_callback	= edge_bulk_out_data_callback,

};



static struct usb_serial_driver edgeport_4port_device = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "edgeport_4",

	},

	.description		= "Edgeport 4 port adapter",

	.id_table		= edgeport_4port_id_table,

	.num_ports		= 4,

	.open			= edge_open,

	.close			= edge_close,

	.throttle		= edge_throttle,

	.unthrottle		= edge_unthrottle,

	.attach			= edge_startup,

	.disconnect		= edge_disconnect,

	.release		= edge_release,

	.port_probe		= edge_port_probe,

	.port_remove		= edge_port_remove,

	.ioctl			= edge_ioctl,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,

	.break_ctl		= edge_break,

	.read_int_callback	= edge_interrupt_callback,

	.read_bulk_callback	= edge_bulk_in_callback,

	.write_bulk_callback	= edge_bulk_out_data_callback,

};



static struct usb_serial_driver edgeport_8port_device = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "edgeport_8",

	},

	.description		= "Edgeport 8 port adapter",

	.id_table		= edgeport_8port_id_table,

	.num_ports		= 8,

	.open			= edge_open,

	.close			= edge_close,

	.throttle		= edge_throttle,

	.unthrottle		= edge_unthrottle,

	.attach			= edge_startup,

	.disconnect		= edge_disconnect,

	.release		= edge_release,

	.port_probe		= edge_port_probe,

	.port_remove		= edge_port_remove,

	.ioctl			= edge_ioctl,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,

	.break_ctl		= edge_break,

	.read_int_callback	= edge_interrupt_callback,

	.read_bulk_callback	= edge_bulk_in_callback,

	.write_bulk_callback	= edge_bulk_out_data_callback,

};



static struct usb_serial_driver epic_device = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "epic",

	},

	.description		= "EPiC device",

	.id_table		= Epic_port_id_table,

	.num_ports		= 1,

	.open			= edge_open,

	.close			= edge_close,

	.throttle		= edge_throttle,

	.unthrottle		= edge_unthrottle,

	.attach			= edge_startup,

	.disconnect		= edge_disconnect,

	.release		= edge_release,

	.port_probe		= edge_port_probe,

	.port_remove		= edge_port_remove,

	.ioctl			= edge_ioctl,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,

	.break_ctl		= edge_break,

	.read_int_callback	= edge_interrupt_callback,

	.read_bulk_callback	= edge_bulk_in_callback,

	.write_bulk_callback	= edge_bulk_out_data_callback,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&edgeport_2port_device, &edgeport_4port_device,

	&edgeport_8port_device, &epic_device, NULL

};



module_usb_serial_driver(serial_drivers, id_table_combined);



MODULE_AUTHOR(DRIVER_AUTHOR);

drivers/usb/serial/io_tables.h

deleted100644 → 0
+0 −232
Original line number Diff line number Diff line 
/*

 * IO Edgeport Driver tables

 *

 *	Copyright (C) 2001

 *	    Greg Kroah-Hartman (greg@kroah.com)

 *

 *	This program is free software; you can redistribute it and/or modify

 *	it under the terms of the GNU General Public License as published by

 *	the Free Software Foundation; either version 2 of the License, or

 *	(at your option) any later version.

 *

 */



#ifndef IO_TABLES_H

#define IO_TABLES_H



static const struct usb_device_id edgeport_2port_id_table[] = {

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_421) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_21) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2_DIN) },

	{ }

};



static const struct usb_device_id edgeport_4port_id_table[] = {

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_RAPIDPORT_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4T) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_MT4X56USB) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8_DUAL_CPU) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4_DIN) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_22I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_COMPATIBLE) },

	{ }

};



static const struct usb_device_id edgeport_8port_id_table[] = {

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_16_DUAL_CPU) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8R) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8RR) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_8) },

	{ }

};



static const struct usb_device_id Epic_port_id_table[] = {

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0202) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0203) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0310) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0311) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0312) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A758) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A794) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A225) },

	{ }

};



/* Devices that this driver supports */

static const struct usb_device_id id_table_combined[] = {

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_RAPIDPORT_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_4T) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_MT4X56USB) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_2) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_4I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_2I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_421) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_21) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_8_DUAL_CPU) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_8) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_2_DIN) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_4_DIN) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_16_DUAL_CPU) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_22I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_4) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_COMPATIBLE) },

	{ USB_DEVICE(USB_VENDOR_ID_ION,	ION_DEVICE_ID_EDGEPORT_8I) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8R) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8RR) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_412_8) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0202) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0203) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0310) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0311) },

	{ USB_DEVICE(USB_VENDOR_ID_NCR, NCR_DEVICE_ID_EPIC_0312) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A758) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A794) },

	{ USB_DEVICE(USB_VENDOR_ID_AXIOHM, AXIOHM_DEVICE_ID_EPIC_A225) },

	{ } /* Terminating entry */

};



MODULE_DEVICE_TABLE(usb, id_table_combined);



static struct usb_serial_driver edgeport_2port_device = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "edgeport_2",

	},

	.description		= "Edgeport 2 port adapter",

	.id_table		= edgeport_2port_id_table,

	.num_ports		= 2,

	.open			= edge_open,

	.close			= edge_close,

	.throttle		= edge_throttle,

	.unthrottle		= edge_unthrottle,

	.attach			= edge_startup,

	.disconnect		= edge_disconnect,

	.release		= edge_release,

	.port_probe		= edge_port_probe,

	.port_remove		= edge_port_remove,

	.ioctl			= edge_ioctl,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,

	.break_ctl		= edge_break,

	.read_int_callback	= edge_interrupt_callback,

	.read_bulk_callback	= edge_bulk_in_callback,

	.write_bulk_callback	= edge_bulk_out_data_callback,

};



static struct usb_serial_driver edgeport_4port_device = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "edgeport_4",

	},

	.description		= "Edgeport 4 port adapter",

	.id_table		= edgeport_4port_id_table,

	.num_ports		= 4,

	.open			= edge_open,

	.close			= edge_close,

	.throttle		= edge_throttle,

	.unthrottle		= edge_unthrottle,

	.attach			= edge_startup,

	.disconnect		= edge_disconnect,

	.release		= edge_release,

	.port_probe		= edge_port_probe,

	.port_remove		= edge_port_remove,

	.ioctl			= edge_ioctl,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,

	.break_ctl		= edge_break,

	.read_int_callback	= edge_interrupt_callback,

	.read_bulk_callback	= edge_bulk_in_callback,

	.write_bulk_callback	= edge_bulk_out_data_callback,

};



static struct usb_serial_driver edgeport_8port_device = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "edgeport_8",

	},

	.description		= "Edgeport 8 port adapter",

	.id_table		= edgeport_8port_id_table,

	.num_ports		= 8,

	.open			= edge_open,

	.close			= edge_close,

	.throttle		= edge_throttle,

	.unthrottle		= edge_unthrottle,

	.attach			= edge_startup,

	.disconnect		= edge_disconnect,

	.release		= edge_release,

	.port_probe		= edge_port_probe,

	.port_remove		= edge_port_remove,

	.ioctl			= edge_ioctl,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,

	.break_ctl		= edge_break,

	.read_int_callback	= edge_interrupt_callback,

	.read_bulk_callback	= edge_bulk_in_callback,

	.write_bulk_callback	= edge_bulk_out_data_callback,

};



static struct usb_serial_driver epic_device = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "epic",

	},

	.description		= "EPiC device",

	.id_table		= Epic_port_id_table,

	.num_ports		= 1,

	.open			= edge_open,

	.close			= edge_close,

	.throttle		= edge_throttle,

	.unthrottle		= edge_unthrottle,

	.attach			= edge_startup,

	.disconnect		= edge_disconnect,

	.release		= edge_release,

	.port_probe		= edge_port_probe,

	.port_remove		= edge_port_remove,

	.ioctl			= edge_ioctl,

	.set_termios		= edge_set_termios,

	.tiocmget		= edge_tiocmget,

	.tiocmset		= edge_tiocmset,

	.tiocmiwait		= usb_serial_generic_tiocmiwait,

	.get_icount		= usb_serial_generic_get_icount,

	.write			= edge_write,

	.write_room		= edge_write_room,

	.chars_in_buffer	= edge_chars_in_buffer,

	.break_ctl		= edge_break,

	.read_int_callback	= edge_interrupt_callback,

	.read_bulk_callback	= edge_bulk_in_callback,

	.write_bulk_callback	= edge_bulk_out_data_callback,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&edgeport_2port_device, &edgeport_4port_device,

	&edgeport_8port_device, &epic_device, NULL

};



#endif

drivers/usb/serial/keyspan.c

+589 −3

File changed.

Preview size limit exceeded, changes collapsed.

drivers/usb/serial/keyspan.h

deleted100644 → 0
+0 −629

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/usb/serial/upd78f0730.c

+4 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 * - stop bits: 1 or 2

 * - parity: even, odd or none

 * - flow control: none

 * - baud rates: 0, 2400, 4800, 9600, 19200, 38400, 57600, 115200

 * - baud rates: 0, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 153600

 * - signals: DTR, RTS and BREAK

 */
@@ -32,8 +32,9 @@ 
#define DRIVER_AUTHOR "Maksim Salau <maksim.salau@gmail.com>"



static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x045B, 0x0212) }, /* YRPBRL78G13, YRPBRL78G14 */

	{ USB_DEVICE(0x0409, 0x0063) }, /* V850ESJX3-STICK */

	{ USB_DEVICE(0x045B, 0x0212) }, /* YRPBRL78G13, YRPBRL78G14 */

	{ USB_DEVICE(0x064B, 0x7825) }, /* Analog Devices EVAL-ADXL362Z-DB */

	{}

};
@@ -288,7 +289,7 @@ static speed_t upd78f0730_get_baud_rate(struct tty_struct *tty) 
{

	const speed_t baud_rate = tty_get_baud_rate(tty);

	const speed_t supported[] = {

		0, 2400, 4800, 9600, 19200, 38400, 57600, 115200

		0, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 153600

	};

	int i;

CRA Git | Maintained and supported by SUSTech CRA and CCSE