Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2e31483 authored by Alexandre Peixoto Ferreira's avatar Alexandre Peixoto Ferreira Committed by Greg Kroah-Hartman
Browse files

USB: usbtmc: Set rigol_quirk if device is listed 



These patches implement a modification of the USBTMC
protocol to allow operation with Rigol equipment. It an idVendor and
idProduct is found on the usbtmc_id_quirk array, the rigol_quirk is set for
this device.

Signed-off-by: default avatarAlexandre Peixoto Ferreira <alexandref75@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88d9b2b3

drivers/usb/class/usbtmc.c

+14 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,20 @@ static int usbtmc_probe(struct usb_interface *intf, 
	mutex_init(&data->io_mutex);

	data->zombie = 0;



	/* Determine if it is a Rigol or not */

	data->rigol_quirk = 0;

	dev_dbg(&intf->dev, "Trying to find if device Vendor 0x%04X Product 0x%04X has the RIGOL quirk\n",

		data->usb_dev->descriptor.idVendor,

		data->usb_dev->descriptor.idProduct);

	for(n = 0; usbtmc_id_quirk[n].idVendor > 0; n++) {

		if ((usbtmc_id_quirk[n].idVendor == data->usb_dev->descriptor.idVendor) &&

		    (usbtmc_id_quirk[n].idProduct == data->usb_dev->descriptor.idProduct)) {

			dev_dbg(&intf->dev, "Setting this device as having the RIGOL quirk\n");

			data->rigol_quirk = 1;

			break;

		}

	}



	/* Initialize USBTMC bTag and other fields */

	data->bTag	= 1;

	data->TermCharEnabled = 0;