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

Commit 39470bf2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: unusual_devs.h entry for nokia 6233
  USB: Fix for typo in ohci-ep93xx.c
  USB: disable USB_MULTITHREAD_PROBE
  USB: add vendor/device id for Option GT Max 3.6 cards
  USB: unusual_devs.h for 0x046b:ff40
  USB: make usbhid ignore Imation Disc Stakka
  USB: rndis_host: fix crash while probing a Nokia S60 mobile
  USB: asix: Detect internal PHY and enable/use accordingly
  usbtouchscreen: make ITM screens report BTN_TOUCH as zero when not touched
parents 2596627c 39559b4f

drivers/usb/core/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -72,22 +72,6 @@ config USB_SUSPEND 


	  If you are unsure about this, say N here.



config USB_MULTITHREAD_PROBE

	bool "USB Multi-threaded probe (EXPERIMENTAL)"

	depends on USB && EXPERIMENTAL

	default n

	help

	  Say Y here if you want the USB core to spawn a new thread for

	  every USB device that is probed.  This can cause a small speedup

	  in boot times on systems with a lot of different USB devices.



	  This option should be safe to enable, but if any odd probing

	  problems are found, please disable it, or dynamically turn it

	  off in the /sys/module/usbcore/parameters/multithread_probe

	  file



	  When in doubt, say N.



config USB_OTG

	bool

	depends on USB && EXPERIMENTAL

drivers/usb/core/hub.c

+1 −8
Original line number Diff line number Diff line
@@ -88,14 +88,7 @@ static DECLARE_WAIT_QUEUE_HEAD(khubd_wait); 
static struct task_struct *khubd_task;



/* multithreaded probe logic */

static int multithread_probe =

#ifdef CONFIG_USB_MULTITHREAD_PROBE

	1;

#else

	0;

#endif

module_param(multithread_probe, bool, S_IRUGO);

MODULE_PARM_DESC(multithread_probe, "Run each USB device probe in a new thread");

static int multithread_probe = 0;



/* cycle leds on hubs that aren't blinking for attention */

static int blinkenlights = 0;

drivers/usb/host/ohci-ep93xx.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int ohci_hcd_ep93xx_drv_remove(struct platform_device *pdev) 
static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_t state)

{

	struct usb_hcd *hcd = platform_get_drvdata(pdev);

	struct ochi_hcd *ohci = hcd_to_ohci(hcd);

	struct ohci_hcd *ohci = hcd_to_ohci(hcd);



	if (time_before(jiffies, ohci->next_statechange))

		msleep(5);

drivers/usb/input/hid-core.c

+4 −0
Original line number Diff line number Diff line
@@ -796,6 +796,9 @@ void usbhid_init_reports(struct hid_device *hid) 
#define USB_VENDOR_ID_LOGITECH		0x046d

#define USB_DEVICE_ID_LOGITECH_USB_RECEIVER	0xc101



#define USB_VENDOR_ID_IMATION		0x0718

#define USB_DEVICE_ID_DISC_STAKKA	0xd000



/*

 * Alphabetically sorted blacklist by quirk type.

 */
@@ -883,6 +886,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },

drivers/usb/input/usbtouchscreen.c

+59 −39
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct usbtouch_device_info { 


	void (*process_pkt) (struct usbtouch_usb *usbtouch, unsigned char *pkt, int len);

	int  (*get_pkt_len) (unsigned char *pkt, int len);

	int  (*read_data)   (unsigned char *pkt, int *x, int *y, int *touch, int *press);

	int  (*read_data)   (struct usbtouch_usb *usbtouch, unsigned char *pkt);

	int  (*init)        (struct usbtouch_usb *usbtouch);

};
@@ -85,6 +85,9 @@ struct usbtouch_usb { 
	struct usbtouch_device_info *type;

	char name[128];

	char phys[64];



	int x, y;

	int touch, press;

};
@@ -161,14 +164,14 @@ static struct usb_device_id usbtouch_devices[] = { 
#define EGALAX_PKT_TYPE_REPT		0x80

#define EGALAX_PKT_TYPE_DIAG		0x0A



static int egalax_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)

static int egalax_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

	if ((pkt[0] & EGALAX_PKT_TYPE_MASK) != EGALAX_PKT_TYPE_REPT)

		return 0;



	*x = ((pkt[3] & 0x0F) << 7) | (pkt[4] & 0x7F);

	*y = ((pkt[1] & 0x0F) << 7) | (pkt[2] & 0x7F);

	*touch = pkt[0] & 0x01;

	dev->x = ((pkt[3] & 0x0F) << 7) | (pkt[4] & 0x7F);

	dev->y = ((pkt[1] & 0x0F) << 7) | (pkt[2] & 0x7F);

	dev->touch = pkt[0] & 0x01;



	return 1;

}
@@ -195,11 +198,11 @@ static int egalax_get_pkt_len(unsigned char *buf, int len) 
 * PanJit Part

 */

#ifdef CONFIG_USB_TOUCHSCREEN_PANJIT

static int panjit_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)

static int panjit_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

	*x = ((pkt[2] & 0x0F) << 8) | pkt[1];

	*y = ((pkt[4] & 0x0F) << 8) | pkt[3];

	*touch = pkt[0] & 0x01;

	dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1];

	dev->y = ((pkt[4] & 0x0F) << 8) | pkt[3];

	dev->touch = pkt[0] & 0x01;



	return 1;

}
@@ -215,11 +218,11 @@ static int panjit_read_data(unsigned char *pkt, int *x, int *y, int *touch, int 
#define MTOUCHUSB_RESET                 7

#define MTOUCHUSB_REQ_CTRLLR_ID         10



static int mtouch_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)

static int mtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

	*x = (pkt[8] << 8) | pkt[7];

	*y = (pkt[10] << 8) | pkt[9];

	*touch = (pkt[2] & 0x40) ? 1 : 0;

	dev->x = (pkt[8] << 8) | pkt[7];

	dev->y = (pkt[10] << 8) | pkt[9];

	dev->touch = (pkt[2] & 0x40) ? 1 : 0;



	return 1;

}
@@ -260,14 +263,32 @@ static int mtouch_init(struct usbtouch_usb *usbtouch) 
 * ITM Part

 */

#ifdef CONFIG_USB_TOUCHSCREEN_ITM

static int itm_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)

static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

	*x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F);

	*y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);

	*press = ((pkt[2] & 0x01) << 7) | (pkt[5] & 0x7F);

	*touch = ~pkt[7] & 0x20;

	int touch;

	/*

	 * ITM devices report invalid x/y data if not touched.

	 * if the screen was touched before but is not touched any more

	 * report touch as 0 with the last valid x/y data once. then stop

	 * reporting data until touched again.

	 */

	dev->press = ((pkt[2] & 0x01) << 7) | (pkt[5] & 0x7F);



	touch = ~pkt[7] & 0x20;

	if (!touch) {

		if (dev->touch) {

			dev->touch = 0;

			return 1;

		}



	return *touch;

		return 0;

	}



	dev->x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F);

	dev->y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);

	dev->touch = touch;



	return 1;

}

#endif
@@ -276,7 +297,7 @@ static int itm_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *pr 
 * eTurboTouch part

 */

#ifdef CONFIG_USB_TOUCHSCREEN_ETURBO

static int eturbo_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)

static int eturbo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

	unsigned int shift;
@@ -285,9 +306,9 @@ static int eturbo_read_data(unsigned char *pkt, int *x, int *y, int *touch, int 
		return 0;



	shift = (6 - (pkt[0] & 0x03));

	*x = ((pkt[3] << 7) | pkt[4]) >> shift;

	*y = ((pkt[1] << 7) | pkt[2]) >> shift;

	*touch = (pkt[0] & 0x10) ? 1 : 0;

	dev->x = ((pkt[3] << 7) | pkt[4]) >> shift;

	dev->y = ((pkt[1] << 7) | pkt[2]) >> shift;

	dev->touch = (pkt[0] & 0x10) ? 1 : 0;



	return 1;

}
@@ -307,14 +328,14 @@ static int eturbo_get_pkt_len(unsigned char *buf, int len) 
 * Gunze part

 */

#ifdef CONFIG_USB_TOUCHSCREEN_GUNZE

static int gunze_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)

static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

	if (!(pkt[0] & 0x80) || ((pkt[1] | pkt[2] | pkt[3]) & 0x80))

		return 0;



	*x = ((pkt[0] & 0x1F) << 7) | (pkt[2] & 0x7F);

	*y = ((pkt[1] & 0x1F) << 7) | (pkt[3] & 0x7F);

	*touch = pkt[0] & 0x20;

	dev->x = ((pkt[0] & 0x1F) << 7) | (pkt[2] & 0x7F);

	dev->y = ((pkt[1] & 0x1F) << 7) | (pkt[3] & 0x7F);

	dev->touch = pkt[0] & 0x20;



	return 1;

}
@@ -383,11 +404,11 @@ static int dmc_tsc10_init(struct usbtouch_usb *usbtouch) 
}





static int dmc_tsc10_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)

static int dmc_tsc10_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

	*x = ((pkt[2] & 0x03) << 8) | pkt[1];

	*y = ((pkt[4] & 0x03) << 8) | pkt[3];

	*touch = pkt[0] & 0x01;

	dev->x = ((pkt[2] & 0x03) << 8) | pkt[1];

	dev->y = ((pkt[4] & 0x03) << 8) | pkt[3];

	dev->touch = pkt[0] & 0x01;



	return 1;

}
@@ -492,23 +513,22 @@ static struct usbtouch_device_info usbtouch_dev_info[] = { 
static void usbtouch_process_pkt(struct usbtouch_usb *usbtouch,

                                 unsigned char *pkt, int len)

{

	int x, y, touch, press;

	struct usbtouch_device_info *type = usbtouch->type;



	if (!type->read_data(pkt, &x, &y, &touch, &press))

	if (!type->read_data(usbtouch, pkt))

			return;



	input_report_key(usbtouch->input, BTN_TOUCH, touch);

	input_report_key(usbtouch->input, BTN_TOUCH, usbtouch->touch);



	if (swap_xy) {

		input_report_abs(usbtouch->input, ABS_X, y);

		input_report_abs(usbtouch->input, ABS_Y, x);

		input_report_abs(usbtouch->input, ABS_X, usbtouch->y);

		input_report_abs(usbtouch->input, ABS_Y, usbtouch->x);

	} else {

		input_report_abs(usbtouch->input, ABS_X, x);

		input_report_abs(usbtouch->input, ABS_Y, y);

		input_report_abs(usbtouch->input, ABS_X, usbtouch->x);

		input_report_abs(usbtouch->input, ABS_Y, usbtouch->y);

	}

	if (type->max_press)

		input_report_abs(usbtouch->input, ABS_PRESSURE, press);

		input_report_abs(usbtouch->input, ABS_PRESSURE, usbtouch->press);

	input_sync(usbtouch->input);

}