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

Commit 47c78e89 authored by Henrik Rydberg's avatar Henrik Rydberg
Browse files

input: mt: Break out slots handling 



In preparation for common code to handle a larger set of MT slots
devices, move the slots handling over to a separate file.

Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
parent c8ddb271

drivers/hid/hid-3m-pct.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/slab.h>

#include <linux/usb.h>

#include <linux/input/mt.h>



MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>");

MODULE_DESCRIPTION("3M PCT multitouch panels");

drivers/input/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# Each configuration option enables a list of files.



obj-$(CONFIG_INPUT)		+= input-core.o

input-core-objs := input.o input-compat.o ff-core.o

input-core-objs := input.o input-compat.o ff-core.o input-mt.o



obj-$(CONFIG_INPUT_FF_MEMLESS)	+= ff-memless.o

obj-$(CONFIG_INPUT_POLLDEV)	+= input-polldev.o

drivers/input/input-mt.c

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * Input Multitouch Library

 *

 * Copyright (c) 2008-2010 Henrik Rydberg

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 */



#include <linux/input/mt.h>

#include <linux/slab.h>



/**

 * input_mt_create_slots() - create MT input slots

 * @dev: input device supporting MT events and finger tracking

 * @num_slots: number of slots used by the device

 *

 * This function allocates all necessary memory for MT slot handling in the

 * input device, and adds ABS_MT_SLOT to the device capabilities. All slots

 * are initially marked as unused by setting ABS_MT_TRACKING_ID to -1.

 */

int input_mt_create_slots(struct input_dev *dev, unsigned int num_slots)

{

	int i;



	if (!num_slots)

		return 0;



	dev->mt = kcalloc(num_slots, sizeof(struct input_mt_slot), GFP_KERNEL);

	if (!dev->mt)

		return -ENOMEM;



	dev->mtsize = num_slots;

	input_set_abs_params(dev, ABS_MT_SLOT, 0, num_slots - 1, 0, 0);



	/* Mark slots as 'unused' */

	for (i = 0; i < num_slots; i++)

		input_mt_set_value(&dev->mt[i], ABS_MT_TRACKING_ID, -1);



	return 0;

}

EXPORT_SYMBOL(input_mt_create_slots);



/**

 * input_mt_destroy_slots() - frees the MT slots of the input device

 * @dev: input device with allocated MT slots

 *

 * This function is only needed in error path as the input core will

 * automatically free the MT slots when the device is destroyed.

 */

void input_mt_destroy_slots(struct input_dev *dev)

{

	kfree(dev->mt);

	dev->mt = NULL;

	dev->mtsize = 0;

}

EXPORT_SYMBOL(input_mt_destroy_slots);

drivers/input/input.c

+1 −47
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include <linux/init.h>

#include <linux/types.h>

#include <linux/input.h>

#include <linux/input/mt.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/random.h>
@@ -1690,52 +1690,6 @@ void input_free_device(struct input_dev *dev) 
}

EXPORT_SYMBOL(input_free_device);



/**

 * input_mt_create_slots() - create MT input slots

 * @dev: input device supporting MT events and finger tracking

 * @num_slots: number of slots used by the device

 *

 * This function allocates all necessary memory for MT slot handling in the

 * input device, and adds ABS_MT_SLOT to the device capabilities. All slots

 * are initially marked as unused by setting ABS_MT_TRACKING_ID to -1.

 */

int input_mt_create_slots(struct input_dev *dev, unsigned int num_slots)

{

	int i;



	if (!num_slots)

		return 0;



	dev->mt = kcalloc(num_slots, sizeof(struct input_mt_slot), GFP_KERNEL);

	if (!dev->mt)

		return -ENOMEM;



	dev->mtsize = num_slots;

	input_set_abs_params(dev, ABS_MT_SLOT, 0, num_slots - 1, 0, 0);



	/* Mark slots as 'unused' */

	for (i = 0; i < num_slots; i++)

		dev->mt[i].abs[ABS_MT_TRACKING_ID - ABS_MT_FIRST] = -1;



	return 0;

}

EXPORT_SYMBOL(input_mt_create_slots);



/**

 * input_mt_destroy_slots() - frees the MT slots of the input device

 * @dev: input device with allocated MT slots

 *

 * This function is only needed in error path as the input core will

 * automatically free the MT slots when the device is destroyed.

 */

void input_mt_destroy_slots(struct input_dev *dev)

{

	kfree(dev->mt);

	dev->mt = NULL;

	dev->mtsize = 0;

}

EXPORT_SYMBOL(input_mt_destroy_slots);



/**

 * input_set_capability - mark device as capable of a certain event

 * @dev: device that is capable of emitting or accepting event

drivers/input/misc/uinput.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/fs.h>

#include <linux/miscdevice.h>

#include <linux/uinput.h>

#include <linux/input/mt.h>

#include "../input-compat.h"



static int uinput_dev_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)