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

Commit 8da23fc1 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: wacom - get rid of input event wrappers 



Input event interface is pretty stable so let's get rig of wrappers
for input_event() and fiends and call them directly. This will simplify
and speed up code a bit.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 73a97f4f

drivers/input/tablet/wacom.h

+5 −23
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ MODULE_LICENSE(DRIVER_LICENSE); 


struct wacom {

	dma_addr_t data_dma;

	struct input_dev *dev;

	struct usb_device *usbdev;

	struct usb_interface *intf;

	struct urb *irq;
@@ -123,27 +122,10 @@ struct wacom_combo { 


extern const struct usb_device_id wacom_ids[];



extern int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo);

extern void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data);

extern void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data);

extern void wacom_report_key(void *wcombo, unsigned int key_type, int key_data);

extern void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value);

extern void wacom_input_sync(void *wcombo);

extern void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i4s(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac);

extern __u16 wacom_le16_to_cpu(unsigned char *data);

extern __u16 wacom_be16_to_cpu(unsigned char *data);

int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo);

void wacom_setup_input_capabilities(struct input_dev *input_dev,

				    struct wacom_wac *wacom_wac);

__u16 wacom_le16_to_cpu(unsigned char *data);

__u16 wacom_be16_to_cpu(unsigned char *data);



#endif

drivers/input/tablet/wacom_sys.c

+11 −163
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int usb_set_report(struct usb_interface *intf, unsigned char type, 


static struct input_dev * get_input_dev(struct wacom_combo *wcombo)

{

	return wcombo->wacom->dev;

	return wcombo->wacom->wacom_wac.input;

}



static void wacom_sys_irq(struct urb *urb)
@@ -110,26 +110,6 @@ static void wacom_sys_irq(struct urb *urb) 
		     __func__, retval);

}



void wacom_report_key(void *wcombo, unsigned int key_type, int key_data)

{

	input_report_key(get_input_dev((struct wacom_combo *)wcombo), key_type, key_data);

}



void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data)

{

	input_report_abs(get_input_dev((struct wacom_combo *)wcombo), abs_type, abs_data);

}



void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data)

{

	input_report_rel(get_input_dev((struct wacom_combo *)wcombo), rel_type, rel_data);

}



void wacom_input_event(void *wcombo, unsigned int type, unsigned int code, int value)

{

	input_event(get_input_dev((struct wacom_combo *)wcombo), type, code, value);

}



__u16 wacom_be16_to_cpu(unsigned char *data)

{

	__u16 value;
@@ -144,11 +124,6 @@ __u16 wacom_le16_to_cpu(unsigned char *data) 
	return value;

}



void wacom_input_sync(void *wcombo)

{

	input_sync(get_input_dev((struct wacom_combo *)wcombo));

}



static int wacom_open(struct input_dev *dev)

{

	struct wacom *wacom = input_get_drvdata(dev);
@@ -186,123 +161,6 @@ static void wacom_close(struct input_dev *dev) 
	mutex_unlock(&wacom->lock);

}



void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_1) |

		BIT_MASK(BTN_5);

	input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);

}



void input_dev_g4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->evbit[0] |= BIT_MASK(EV_MSC);

	input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) |

		BIT_MASK(BTN_4);

}



void input_dev_g(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->evbit[0] |= BIT_MASK(EV_REL);

	input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);

	input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) |

		BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE);

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |

		BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_STYLUS) |

		BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_STYLUS2);

	input_set_abs_params(input_dev, ABS_DISTANCE,

			     0, wacom_wac->features.distance_max, 0, 0);

}



void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) |

		BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);

	input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);

	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);

}



void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_4) |

		BIT_MASK(BTN_5) | BIT_MASK(BTN_6) | BIT_MASK(BTN_7);

	input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);

}



void input_dev_i4s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_FINGER);

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_0) | BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_4) | BIT_MASK(BTN_5) | BIT_MASK(BTN_6);

	input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);

}



void input_dev_i4(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_7) | BIT_MASK(BTN_8);

}



void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_MISC)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);

}



void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL);

	input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);

	input_dev->relbit[0] |= BIT_MASK(REL_WHEEL);

	input_dev->keybit[BIT_WORD(BTN_MOUSE)] |= BIT_MASK(BTN_LEFT) |

		BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_MIDDLE) |

		BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER) |

		BIT_MASK(BTN_TOOL_PEN) | BIT_MASK(BTN_STYLUS) |

		BIT_MASK(BTN_TOOL_MOUSE) | BIT_MASK(BTN_TOOL_BRUSH) |

		BIT_MASK(BTN_TOOL_PENCIL) | BIT_MASK(BTN_TOOL_AIRBRUSH) |

		BIT_MASK(BTN_TOOL_LENS) | BIT_MASK(BTN_STYLUS2);

	input_set_abs_params(input_dev, ABS_DISTANCE,

			     0, wacom_wac->features.distance_max, 0, 0);

	input_set_abs_params(input_dev, ABS_WHEEL, 0, 1023, 0, 0);

	input_set_abs_params(input_dev, ABS_TILT_X, 0, 127, 0, 0);

	input_set_abs_params(input_dev, ABS_TILT_Y, 0, 127, 0, 0);

	input_set_abs_params(input_dev, ABS_RZ, -900, 899, 0, 0);

	input_set_abs_params(input_dev, ABS_THROTTLE, -1023, 1023, 0, 0);

}



void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_PEN) |

		BIT_MASK(BTN_STYLUS) | BIT_MASK(BTN_STYLUS2);

}



void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_RUBBER);

}



void input_dev_tpc(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	struct wacom_features *features = &wacom_wac->features;



	if (features->device_type == BTN_TOOL_DOUBLETAP ||

	    features->device_type == BTN_TOOL_TRIPLETAP) {

		input_set_abs_params(input_dev, ABS_RX, 0, features->x_phy, 0, 0);

		input_set_abs_params(input_dev, ABS_RY, 0, features->y_phy, 0, 0);

		__set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);

	}

}



void input_dev_tpc2fg(struct input_dev *input_dev, struct wacom_wac *wacom_wac)

{

	if (wacom_wac->features.device_type == BTN_TOOL_TRIPLETAP) {

		input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOOL_TRIPLETAP);

		input_dev->evbit[0] |= BIT_MASK(EV_MSC);

		input_dev->mscbit[0] |= BIT_MASK(MSC_SERIAL);

	}

}



static int wacom_parse_hid(struct usb_interface *intf, struct hid_descriptor *hid_desc,

			   struct wacom_features *features)

{
@@ -645,20 +503,12 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i 
	}



	wacom->usbdev = dev;

	wacom->dev = input_dev;

	wacom->intf = intf;

	mutex_init(&wacom->lock);

	usb_make_path(dev, wacom->phys, sizeof(wacom->phys));

	strlcat(wacom->phys, "/input0", sizeof(wacom->phys));



	usb_to_input_id(dev, &input_dev->id);



	input_dev->dev.parent = &intf->dev;



	input_set_drvdata(input_dev, wacom);



	input_dev->open = wacom_open;

	input_dev->close = wacom_close;

	wacom_wac->input = input_dev;



	endpoint = &intf->cur_altsetting->endpoint[0].desc;
@@ -682,16 +532,14 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i 
	}



	input_dev->name = wacom_wac->name;

	input_dev->name = wacom_wac->name;

	input_dev->dev.parent = &intf->dev;

	input_dev->open = wacom_open;

	input_dev->close = wacom_close;

	usb_to_input_id(dev, &input_dev->id);

	input_set_drvdata(input_dev, wacom);



	input_dev->evbit[0] |= BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);

	input_dev->keybit[BIT_WORD(BTN_DIGI)] |= BIT_MASK(BTN_TOUCH);



	input_set_abs_params(input_dev, ABS_X, 0, features->x_max, 4, 0);

	input_set_abs_params(input_dev, ABS_Y, 0, features->y_max, 4, 0);

	input_set_abs_params(input_dev, ABS_PRESSURE, 0, features->pressure_max, 0, 0);

	input_dev->absbit[BIT_WORD(ABS_MISC)] |= BIT_MASK(ABS_MISC);



	wacom_init_input_dev(input_dev, wacom_wac);

	wacom_setup_input_capabilities(input_dev, wacom_wac);



	usb_fill_int_urb(wacom->irq, dev,

			 usb_rcvintpipe(dev, endpoint->bEndpointAddress),
@@ -700,7 +548,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i 
	wacom->irq->transfer_dma = wacom->data_dma;

	wacom->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;



	error = input_register_device(wacom->dev);

	error = input_register_device(input_dev);

	if (error)

		goto fail4;
@@ -725,7 +573,7 @@ static void wacom_disconnect(struct usb_interface *intf) 
	usb_set_intfdata(intf, NULL);



	usb_kill_urb(wacom->irq);

	input_unregister_device(wacom->dev);

	input_unregister_device(wacom->wacom_wac.input);

	usb_free_urb(wacom->irq);

	usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,

			wacom->wacom_wac.data, wacom->data_dma);

drivers/input/tablet/wacom_wac.c

+330 −219

File changed.

Preview size limit exceeded, changes collapsed.

drivers/input/tablet/wacom_wac.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ struct wacom_wac { 
	__u32 serial[2];

	struct wacom_features features;

	struct wacom_shared *shared;

	struct input_dev *input;

};



#endif