Commit b3431093 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: refactor endpoint classification 



Refactor endpoint classification and replace the build-time
endpoint-array sanity checks with runtime checks in preparation for
handling endpoints from a sibling interface.

Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 53366a9f

drivers/usb/serial/usb-serial.c

+31 −20
Original line number Diff line number Diff line
@@ -711,37 +711,48 @@ static const struct tty_port_operations serial_port_ops = { 
	.shutdown		= serial_port_shutdown,

};



static void find_endpoints(struct usb_serial *serial,

					struct usb_serial_endpoints *epds)

static void store_endpoint(struct usb_serial *serial,

					struct usb_serial_endpoints *epds,

					struct usb_endpoint_descriptor *epd)

{

	struct device *dev = &serial->interface->dev;

	struct usb_host_interface *iface_desc;

	struct usb_endpoint_descriptor *epd;

	unsigned int i;



	BUILD_BUG_ON(ARRAY_SIZE(epds->bulk_in) < USB_MAXENDPOINTS / 2);

	BUILD_BUG_ON(ARRAY_SIZE(epds->bulk_out) < USB_MAXENDPOINTS / 2);

	BUILD_BUG_ON(ARRAY_SIZE(epds->interrupt_in) < USB_MAXENDPOINTS / 2);

	BUILD_BUG_ON(ARRAY_SIZE(epds->interrupt_out) < USB_MAXENDPOINTS / 2);



	iface_desc = serial->interface->cur_altsetting;

	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {

		epd = &iface_desc->endpoint[i].desc;

	u8 addr = epd->bEndpointAddress;



	if (usb_endpoint_is_bulk_in(epd)) {

			dev_dbg(dev, "found bulk in on endpoint %u\n", i);

		if (epds->num_bulk_in == ARRAY_SIZE(epds->bulk_in))

			return;

		dev_dbg(dev, "found bulk in endpoint %02x\n", addr);

		epds->bulk_in[epds->num_bulk_in++] = epd;

	} else if (usb_endpoint_is_bulk_out(epd)) {

			dev_dbg(dev, "found bulk out on endpoint %u\n", i);

		if (epds->num_bulk_out == ARRAY_SIZE(epds->bulk_out))

			return;

		dev_dbg(dev, "found bulk out endpoint %02x\n", addr);

		epds->bulk_out[epds->num_bulk_out++] = epd;

	} else if (usb_endpoint_is_int_in(epd)) {

			dev_dbg(dev, "found interrupt in on endpoint %u\n", i);

		if (epds->num_interrupt_in == ARRAY_SIZE(epds->interrupt_in))

			return;

		dev_dbg(dev, "found interrupt in endpoint %02x\n", addr);

		epds->interrupt_in[epds->num_interrupt_in++] = epd;

	} else if (usb_endpoint_is_int_out(epd)) {

			dev_dbg(dev, "found interrupt out on endpoint %u\n", i);

		if (epds->num_interrupt_out == ARRAY_SIZE(epds->interrupt_out))

			return;

		dev_dbg(dev, "found interrupt out endpoint %02x\n", addr);

		epds->interrupt_out[epds->num_interrupt_out++] = epd;

	}

}



static void find_endpoints(struct usb_serial *serial,

					struct usb_serial_endpoints *epds)

{

	struct usb_host_interface *iface_desc;

	struct usb_endpoint_descriptor *epd;

	unsigned int i;



	iface_desc = serial->interface->cur_altsetting;

	for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {

		epd = &iface_desc->endpoint[i].desc;

		store_endpoint(serial, epds, epd);

	}

}



static int setup_port_bulk_in(struct usb_serial_port *port,