* Fwd: [PATCH] Fix broken ifdefs in usbtouchscreen
@ 2007-06-11 16:41 Daniel Ritz
2007-06-11 16:53 ` Dmitry Torokhov
2007-06-11 16:55 ` Fwd: " Robert P. J. Day
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Ritz @ 2007-06-11 16:41 UTC (permalink / raw)
To: Dmitry Torokhov, Greg Kroah-Hartman; +Cc: linux-kernel, Ondrej Zary
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
dmitry was a bad boy...:)
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
-------- Original Message --------
Subject: [PATCH] Fix broken ifdefs in usbtouchscreen
Date: Mon, 11 Jun 2007 17:09:50 +0200
From: Ondrej Zary <linux@rainbow-software.org>
To: daniel.ritz@gmx.ch
CC: linux-kernel@vger.kernel.org
Hello,
this patch fixes ifdefs in usbtouchscreen that got broken by Kconfig changes,
resulting in non-working module with empty device table.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
--
Ondrej Zary
[-- Attachment #2: usbtouchscreen-ifdef.patch --]
[-- Type: text/x-diff, Size: 5262 bytes --]
--- linux-2.6.22-rc4-orig/drivers/input/touchscreen/usbtouchscreen.c 2007-06-05 02:57:25.000000000 +0200
+++ linux-2.6.22-rc4/drivers/input/touchscreen/usbtouchscreen.c 2007-06-11 14:07:40.000000000 +0200
@@ -91,7 +91,7 @@
};
-#if defined(CONFIG_USB_TOUCHSCREEN_EGALAX) || defined(CONFIG_USB_TOUCHSCREEN_ETURBO)
+#if defined(CONFIG_TOUCHSCREEN_USB_EGALAX) || defined(CONFIG_TOUCHSCREEN_USB_ETURBO)
#define MULTI_PACKET
#endif
@@ -113,7 +113,7 @@
};
static struct usb_device_id usbtouch_devices[] = {
-#ifdef CONFIG_USB_TOUCHSCREEN_EGALAX
+#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
{USB_DEVICE(0x3823, 0x0001), .driver_info = DEVTYPE_EGALAX},
{USB_DEVICE(0x3823, 0x0002), .driver_info = DEVTYPE_EGALAX},
{USB_DEVICE(0x0123, 0x0001), .driver_info = DEVTYPE_EGALAX},
@@ -123,30 +123,30 @@
{USB_DEVICE(0x1234, 0x0002), .driver_info = DEVTYPE_EGALAX},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_PANJIT
+#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
{USB_DEVICE(0x134c, 0x0001), .driver_info = DEVTYPE_PANJIT},
{USB_DEVICE(0x134c, 0x0002), .driver_info = DEVTYPE_PANJIT},
{USB_DEVICE(0x134c, 0x0003), .driver_info = DEVTYPE_PANJIT},
{USB_DEVICE(0x134c, 0x0004), .driver_info = DEVTYPE_PANJIT},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_3M
+#ifdef CONFIG_TOUCHSCREEN_USB_3M
{USB_DEVICE(0x0596, 0x0001), .driver_info = DEVTYPE_3M},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_ITM
+#ifdef CONFIG_TOUCHSCREEN_USB_ITM
{USB_DEVICE(0x0403, 0xf9e9), .driver_info = DEVTYPE_ITM},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_ETURBO
+#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
{USB_DEVICE(0x1234, 0x5678), .driver_info = DEVTYPE_ETURBO},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_GUNZE
+#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
{USB_DEVICE(0x0637, 0x0001), .driver_info = DEVTYPE_GUNZE},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10
+#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
{USB_DEVICE(0x0afa, 0x03e8), .driver_info = DEVTYPE_DMC_TSC10},
#endif
@@ -158,7 +158,7 @@
* eGalax part
*/
-#ifdef CONFIG_USB_TOUCHSCREEN_EGALAX
+#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
#define EGALAX_PKT_TYPE_MASK 0xFE
#define EGALAX_PKT_TYPE_REPT 0x80
@@ -197,7 +197,7 @@
/*****************************************************************************
* PanJit Part
*/
-#ifdef CONFIG_USB_TOUCHSCREEN_PANJIT
+#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
static int panjit_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
{
dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1];
@@ -212,7 +212,7 @@
/*****************************************************************************
* 3M/Microtouch Part
*/
-#ifdef CONFIG_USB_TOUCHSCREEN_3M
+#ifdef CONFIG_TOUCHSCREEN_USB_3M
#define MTOUCHUSB_ASYNC_REPORT 1
#define MTOUCHUSB_RESET 7
@@ -262,7 +262,7 @@
/*****************************************************************************
* ITM Part
*/
-#ifdef CONFIG_USB_TOUCHSCREEN_ITM
+#ifdef CONFIG_TOUCHSCREEN_USB_ITM
static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
{
int touch;
@@ -296,7 +296,7 @@
/*****************************************************************************
* eTurboTouch part
*/
-#ifdef CONFIG_USB_TOUCHSCREEN_ETURBO
+#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
static int eturbo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
{
unsigned int shift;
@@ -327,7 +327,7 @@
/*****************************************************************************
* Gunze part
*/
-#ifdef CONFIG_USB_TOUCHSCREEN_GUNZE
+#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
{
if (!(pkt[0] & 0x80) || ((pkt[1] | pkt[2] | pkt[3]) & 0x80))
@@ -348,7 +348,7 @@
* http://www.dmccoltd.com/files/controler/tsc10usb_pi_e.pdf
* http://www.dmccoltd.com/files/controler/tsc25_usb_e.pdf
*/
-#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10
+#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
/* supported data rates. currently using 130 */
#define TSC10_RATE_POINT 0x50
@@ -419,7 +419,7 @@
* the different device descriptors
*/
static struct usbtouch_device_info usbtouch_dev_info[] = {
-#ifdef CONFIG_USB_TOUCHSCREEN_EGALAX
+#ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
[DEVTYPE_EGALAX] = {
.min_xc = 0x0,
.max_xc = 0x07ff,
@@ -433,7 +433,7 @@
},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_PANJIT
+#ifdef CONFIG_TOUCHSCREEN_USB_PANJIT
[DEVTYPE_PANJIT] = {
.min_xc = 0x0,
.max_xc = 0x0fff,
@@ -444,7 +444,7 @@
},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_3M
+#ifdef CONFIG_TOUCHSCREEN_USB_3M
[DEVTYPE_3M] = {
.min_xc = 0x0,
.max_xc = 0x4000,
@@ -456,7 +456,7 @@
},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_ITM
+#ifdef CONFIG_TOUCHSCREEN_USB_ITM
[DEVTYPE_ITM] = {
.min_xc = 0x0,
.max_xc = 0x0fff,
@@ -468,7 +468,7 @@
},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_ETURBO
+#ifdef CONFIG_TOUCHSCREEN_USB_ETURBO
[DEVTYPE_ETURBO] = {
.min_xc = 0x0,
.max_xc = 0x07ff,
@@ -482,7 +482,7 @@
},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_GUNZE
+#ifdef CONFIG_TOUCHSCREEN_USB_GUNZE
[DEVTYPE_GUNZE] = {
.min_xc = 0x0,
.max_xc = 0x0fff,
@@ -493,7 +493,7 @@
},
#endif
-#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10
+#ifdef CONFIG_TOUCHSCREEN_USB_DMC_TSC10
[DEVTYPE_DMC_TSC10] = {
.min_xc = 0x0,
.max_xc = 0x03ff,
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Fix broken ifdefs in usbtouchscreen
2007-06-11 16:41 Fwd: [PATCH] Fix broken ifdefs in usbtouchscreen Daniel Ritz
@ 2007-06-11 16:53 ` Dmitry Torokhov
2007-06-11 16:55 ` Fwd: " Robert P. J. Day
1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2007-06-11 16:53 UTC (permalink / raw)
To: Daniel Ritz; +Cc: Greg Kroah-Hartman, linux-kernel, Ondrej Zary
On 6/11/07, Daniel Ritz <daniel.ritz@gmx.ch> wrote:
> dmitry was a bad boy...:)
>
> Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Yep, that was me. I already had a patch lined up but I will take this
one as it has been tested, thanks!
--
Dmitry
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Fwd: [PATCH] Fix broken ifdefs in usbtouchscreen
2007-06-11 16:41 Fwd: [PATCH] Fix broken ifdefs in usbtouchscreen Daniel Ritz
2007-06-11 16:53 ` Dmitry Torokhov
@ 2007-06-11 16:55 ` Robert P. J. Day
1 sibling, 0 replies; 3+ messages in thread
From: Robert P. J. Day @ 2007-06-11 16:55 UTC (permalink / raw)
To: Daniel Ritz
Cc: Dmitry Torokhov, Greg Kroah-Hartman, linux-kernel, Ondrej Zary
On Mon, 11 Jun 2007, Daniel Ritz wrote:
> dmitry was a bad boy...:)
>
> Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
i emailed dmitry a week ago pointing out the config variable problems
so i suspect he may have already fixed that.
rday
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
http://fsdev.net/wiki/index.php?title=Main_Page
========================================================================
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-06-11 16:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-11 16:41 Fwd: [PATCH] Fix broken ifdefs in usbtouchscreen Daniel Ritz
2007-06-11 16:53 ` Dmitry Torokhov
2007-06-11 16:55 ` Fwd: " Robert P. J. Day
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.