Re: [PATCH 2.6] touchkitusb: module_param to swap axes

From: Daniel Ritz
Date: Fri Nov 26 2004 - 15:29:42 EST


On Thursday 25 November 2004 06:10, Dmitry Torokhov wrote:
> On Wednesday 24 November 2004 04:28 pm, Daniel Ritz wrote:
> > add a module parameter to swap the axes. many displays need this...
> >
> > --- 1.2/drivers/usb/input/touchkitusb.c 2004-09-18 10:07:25 +02:00
> > +++ edited/drivers/usb/input/touchkitusb.c 2004-11-24 18:57:59 +01:00
> > @@ -59,6 +59,10 @@
> > #define DRIVER_AUTHOR "Daniel Ritz <daniel.ritz@xxxxxx>"
> > #define DRIVER_DESC "eGalax TouchKit USB HID Touchscreen Driver"
> >
> > +static int swap_xy;
> > +module_param(swap_xy, bool, 0);
>
> It looks it can easily be exported to userspace to allow switching "on-fly"
> since it is checked for every packet. I think 0600 will do.
>

agreed. and when 0600 is ok, i guess 0644 is ok too.

Signed-off-by: Daniel Ritz <daniel.ritz@xxxxxx>

--- 1.2/drivers/usb/input/touchkitusb.c 2004-09-18 10:07:25 +02:00
+++ edited/drivers/usb/input/touchkitusb.c 2004-11-24 18:57:59 +01:00
@@ -59,6 +59,10 @@
#define DRIVER_AUTHOR "Daniel Ritz <daniel.ritz@xxxxxx>"
#define DRIVER_DESC "eGalax TouchKit USB HID Touchscreen Driver"

+static int swap_xy;
+module_param(swap_xy, bool, 0644);
+MODULE_PARM_DESC(swap_xy, "If set X and Y axes are swapped.");
+
struct touchkit_usb {
unsigned char *data;
dma_addr_t data_dma;
@@ -80,6 +84,7 @@
{
struct touchkit_usb *touchkit = urb->context;
int retval;
+ int x, y;

switch (urb->status) {
case 0:
@@ -103,13 +108,19 @@
goto exit;
}

+ if (swap_xy) {
+ y = TOUCHKIT_GET_X(touchkit->data);
+ x = TOUCHKIT_GET_Y(touchkit->data);
+ } else {
+ x = TOUCHKIT_GET_X(touchkit->data);
+ y = TOUCHKIT_GET_Y(touchkit->data);
+ }
+
input_regs(&touchkit->input, regs);
input_report_key(&touchkit->input, BTN_TOUCH,
TOUCHKIT_GET_TOUCHED(touchkit->data));
- input_report_abs(&touchkit->input, ABS_X,
- TOUCHKIT_GET_X(touchkit->data));
- input_report_abs(&touchkit->input, ABS_Y,
- TOUCHKIT_GET_Y(touchkit->data));
+ input_report_abs(&touchkit->input, ABS_X, x);
+ input_report_abs(&touchkit->input, ABS_Y, y);
input_sync(&touchkit->input);

exit:

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/