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

Commit c9bcd582 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] INPUT: Create symlinks for backwards compatibility 



This creates symlinks in /sys/class/input/ to the nested class devices
to help userspace cope with the nesting.

Unfortunatly udev still needs to be updated as it can't handle symlinks
properly here :(

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ea9f240b

drivers/input/evdev.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -661,6 +661,7 @@ static struct file_operations evdev_fops = { 
static struct input_handle *evdev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)

static struct input_handle *evdev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)

{

{

	struct evdev *evdev;

	struct evdev *evdev;

	struct class_device *cdev;

	int minor;

	int minor;





	for (minor = 0; minor < EVDEV_MINORS && evdev_table[minor]; minor++);

	for (minor = 0; minor < EVDEV_MINORS && evdev_table[minor]; minor++);
@@ -686,9 +687,13 @@ static struct input_handle *evdev_connect(struct input_handler *handler, struct 




	evdev_table[minor] = evdev;

	evdev_table[minor] = evdev;





	class_device_create(&input_class, &dev->cdev,

	cdev = class_device_create(&input_class, &dev->cdev,

			MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),

			MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor),

			dev->cdev.dev, "event%d", minor);

			dev->cdev.dev, evdev->name);



	/* temporary symlink to keep userspace happy */

	sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,

			  evdev->name);





	return &evdev->handle;

	return &evdev->handle;

}

}
@@ -698,6 +703,7 @@ static void evdev_disconnect(struct input_handle *handle) 
	struct evdev *evdev = handle->private;

	struct evdev *evdev = handle->private;

	struct evdev_list *list;

	struct evdev_list *list;





	sysfs_remove_link(&input_class.subsys.kset.kobj, evdev->name);

	class_device_destroy(&input_class,

	class_device_destroy(&input_class,

			MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));

			MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + evdev->minor));

	evdev->exist = 0;

	evdev->exist = 0;

drivers/input/joydev.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -448,6 +448,7 @@ static struct file_operations joydev_fops = { 
static struct input_handle *joydev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)

static struct input_handle *joydev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)

{

{

	struct joydev *joydev;

	struct joydev *joydev;

	struct class_device *cdev;

	int i, j, t, minor;

	int i, j, t, minor;





	for (minor = 0; minor < JOYDEV_MINORS && joydev_table[minor]; minor++);

	for (minor = 0; minor < JOYDEV_MINORS && joydev_table[minor]; minor++);
@@ -513,9 +514,13 @@ static struct input_handle *joydev_connect(struct input_handler *handler, struct 




	joydev_table[minor] = joydev;

	joydev_table[minor] = joydev;





	class_device_create(&input_class, &dev->cdev,

	cdev = class_device_create(&input_class, &dev->cdev,

			MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),

			MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + minor),

			dev->cdev.dev, "js%d", minor);

			dev->cdev.dev, joydev->name);



	/* temporary symlink to keep userspace happy */

	sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,

			  joydev->name);





	return &joydev->handle;

	return &joydev->handle;

}

}
@@ -525,6 +530,7 @@ static void joydev_disconnect(struct input_handle *handle) 
	struct joydev *joydev = handle->private;

	struct joydev *joydev = handle->private;

	struct joydev_list *list;

	struct joydev_list *list;





	sysfs_remove_link(&input_class.subsys.kset.kobj, joydev->name);

	class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));

	class_device_destroy(&input_class, MKDEV(INPUT_MAJOR, JOYDEV_MINOR_BASE + joydev->minor));

	joydev->exist = 0;

	joydev->exist = 0;

drivers/input/mousedev.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -620,6 +620,7 @@ static struct file_operations mousedev_fops = { 
static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)

static struct input_handle *mousedev_connect(struct input_handler *handler, struct input_dev *dev, struct input_device_id *id)

{

{

	struct mousedev *mousedev;

	struct mousedev *mousedev;

	struct class_device *cdev;

	int minor = 0;

	int minor = 0;





	for (minor = 0; minor < MOUSEDEV_MINORS && mousedev_table[minor]; minor++);

	for (minor = 0; minor < MOUSEDEV_MINORS && mousedev_table[minor]; minor++);
@@ -648,9 +649,13 @@ static struct input_handle *mousedev_connect(struct input_handler *handler, stru 




	mousedev_table[minor] = mousedev;

	mousedev_table[minor] = mousedev;





	class_device_create(&input_class, &dev->cdev,

	cdev = class_device_create(&input_class, &dev->cdev,

			MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),

			MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + minor),

			dev->cdev.dev, "mouse%d", minor);

			dev->cdev.dev, mousedev->name);



	/* temporary symlink to keep userspace happy */

	sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,

			  mousedev->name);





	return &mousedev->handle;

	return &mousedev->handle;

}

}
@@ -660,6 +665,7 @@ static void mousedev_disconnect(struct input_handle *handle) 
	struct mousedev *mousedev = handle->private;

	struct mousedev *mousedev = handle->private;

	struct mousedev_list *list;

	struct mousedev_list *list;





	sysfs_remove_link(&input_class.subsys.kset.kobj, mousedev->name);

	class_device_destroy(&input_class,

	class_device_destroy(&input_class,

			MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));

			MKDEV(INPUT_MAJOR, MOUSEDEV_MINOR_BASE + mousedev->minor));

	mousedev->exist = 0;

	mousedev->exist = 0;

drivers/input/tsdev.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -368,6 +368,7 @@ static struct input_handle *tsdev_connect(struct input_handler *handler, 
					  struct input_device_id *id)

					  struct input_device_id *id)

{

{

	struct tsdev *tsdev;

	struct tsdev *tsdev;

	struct class_device *cdev;

	int minor, delta;

	int minor, delta;





	for (minor = 0; minor < TSDEV_MINORS/2 && tsdev_table[minor];

	for (minor = 0; minor < TSDEV_MINORS/2 && tsdev_table[minor];
@@ -409,9 +410,13 @@ static struct input_handle *tsdev_connect(struct input_handler *handler, 




	tsdev_table[minor] = tsdev;

	tsdev_table[minor] = tsdev;





	class_device_create(&input_class, &dev->cdev,

	cdev = class_device_create(&input_class, &dev->cdev,

			MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),

			MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + minor),

			dev->cdev.dev, "ts%d", minor);

			dev->cdev.dev, tsdev->name);



	/* temporary symlink to keep userspace happy */

	sysfs_create_link(&input_class.subsys.kset.kobj, &cdev->kobj,

			  tsdev->name);





	return &tsdev->handle;

	return &tsdev->handle;

}

}
@@ -421,6 +426,7 @@ static void tsdev_disconnect(struct input_handle *handle) 
	struct tsdev *tsdev = handle->private;

	struct tsdev *tsdev = handle->private;

	struct tsdev_list *list;

	struct tsdev_list *list;





	sysfs_remove_link(&input_class.subsys.kset.kobj, tsdev->name);

	class_device_destroy(&input_class,

	class_device_destroy(&input_class,

			MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));

			MKDEV(INPUT_MAJOR, TSDEV_MINOR_BASE + tsdev->minor));

	tsdev->exist = 0;

	tsdev->exist = 0;