Re: [RPC] OLPC tablet input driver.

[Komal Shah]

--- "Zephaniah E. Hull" <warp@xxxxxxxxxxx> wrote:

> 
> 
> That said, here the patch is for comments.
> (And possibly for the OLPC kernel tree for others with samples to
> play
> with.)
> 
> 
> Signed-off-by: Zephaniah E. Hull <warp@xxxxxxxxxxx>
> 
> diff --git a/drivers/input/mouse/Makefile
> b/drivers/input/mouse/Makefile
> index 21a1de6..6218e5a 100644
> --- a/drivers/input/mouse/Makefile
> +++ b/drivers/input/mouse/Makefile
> @@ -14,4 +14,4 @@ obj-$(CONFIG_MOUSE_SERIAL)	+= sermouse.o
>  obj-$(CONFIG_MOUSE_HIL)		+= hil_ptr.o
>  obj-$(CONFIG_MOUSE_VSXXXAA)	+= vsxxxaa.o
>  
> -psmouse-objs  := psmouse-base.o alps.o logips2pp.o synaptics.o
> lifebook.o trackpoint.o
> +psmouse-objs  := psmouse-base.o alps.o logips2pp.o synaptics.o
> lifebook.o trackpoint.o olpc.o

Where is KConfigurable entry ?

> diff --git a/drivers/input/mouse/olpc.c b/drivers/input/mouse/olpc.c
> new file mode 100644
> index 0000000..245f29e
> --- /dev/null
> +++ b/drivers/input/mouse/olpc.c
> @@ -0,0 +1,327 @@


> +/*
> + * OLPC touchpad PS/2 mouse driver
> + *
> +int olpc_init(struct psmouse *psmouse)
> +{
> +	struct olpc_data *priv;
> +	struct input_dev *dev = psmouse->dev;
> +	struct input_dev *dev2;
> +
> +	psmouse->private = priv = kzalloc(sizeof(struct olpc_data),
> GFP_KERNEL);

I think you should assign priv to private only if !NULL.

> +	dev2 = input_allocate_device();
> +	if (!priv || !dev2)
> +		goto init_fail;
> +
> +	priv->dev2 = dev2;
> +
> +	if (!(priv->i = olpc_get_model(psmouse)))
> +		goto init_fail;
> +
> +	if (olpc_absolute_mode(psmouse)) {
> +		printk(KERN_ERR "olpc.c: Failed to enable absolute mode\n");
> +		goto init_fail;
> +	}
> +
> +	dev->evbit[LONG(EV_KEY)] |= BIT(EV_KEY);
> +	dev->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
> +	dev->keybit[LONG(BTN_TOOL_PEN)] |= BIT(BTN_TOOL_PEN);
> +	dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT);
> +
> +	dev->evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
> +	input_set_abs_params(dev, ABS_X, 0, 1023, 0, 0);
> +	input_set_abs_params(dev, ABS_Y, 0, 1023, 0, 0);
> +
> +	snprintf(priv->phys, sizeof(priv->phys), "%s/input1",
> psmouse->ps2dev.serio->phys);
> +	dev2->phys = priv->phys;
> +	dev2->name = "OLPC OLPC GlideSensor";
> +	dev2->id.bustype = BUS_I8042;
> +	dev2->id.vendor  = 0x0002;
> +	dev2->id.product = PSMOUSE_OLPC;
> +	dev2->id.version = 0x0000;
> +
> +	dev2->evbit[LONG(EV_KEY)] |= BIT(EV_KEY);
> +	dev2->evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
> +	input_set_abs_params(dev2, ABS_X, 0, 2047, 0, 0);
> +	input_set_abs_params(dev2, ABS_Y, 0, 1023, 0, 0);
> +	input_set_abs_params(dev2, ABS_PRESSURE, 0, 63, 0, 0);
> +	dev2->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
> +	dev2->keybit[LONG(BTN_TOOL_FINGER)] |= BIT(BTN_TOOL_FINGER);
> +	dev2->keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT);
> +
> +	input_register_device(priv->dev2);

Please check the return value of input_register_device and its friends.

> +
> +
> +	psmouse->protocol_handler = olpc_process_byte;
> +	psmouse->poll = olpc_poll;
> +	psmouse->disconnect = olpc_disconnect;
> +	psmouse->reconnect = olpc_reconnect;
> +	psmouse->pktsize = 9;
> +
> +	/* We are having trouble resyncing OLPC touchpads so disable it for
> now */
> +	psmouse->resync_time = 0;
> +
> +	return 0;
> +
> +init_fail:
> +	input_free_device(dev2);
> +	kfree(priv);
> +	return -1;
> +}
> +


---Komal Shah
http://komalshah.blogspot.com/

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 
-
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/