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

Commit 7e4e8e68 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Misc: phantom, add compat ioctl 



Openhaptics uses pointers in _IOC() macros, implement compat for them. Also
add _IOC alternatives which are not 32/64 bit dependent (structures
passed through aren't yet) -- libphantom will use them.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent eb0f1c44

drivers/misc/phantom.c

+20 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 *  or alternatively, you might use OpenHaptics provided by Sensable.

 */



#include <linux/compat.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/device.h>
@@ -91,11 +92,8 @@ static long phantom_ioctl(struct file *file, unsigned int cmd, 
	unsigned long flags;

	unsigned int i;



	if (_IOC_TYPE(cmd) != PH_IOC_MAGIC ||

			_IOC_NR(cmd) > PH_IOC_MAXNR)

		return -ENOTTY;



	switch (cmd) {

	case PHN_SETREG:

	case PHN_SET_REG:

		if (copy_from_user(&r, argp, sizeof(r)))

			return -EFAULT;
@@ -126,6 +124,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd, 
			phantom_status(dev, dev->status & ~PHB_RUNNING);

		spin_unlock_irqrestore(&dev->regs_lock, flags);

		break;

	case PHN_SETREGS:

	case PHN_SET_REGS:

		if (copy_from_user(&rs, argp, sizeof(rs)))

			return -EFAULT;
@@ -143,6 +142,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd, 
		}

		spin_unlock_irqrestore(&dev->regs_lock, flags);

		break;

	case PHN_GETREG:

	case PHN_GET_REG:

		if (copy_from_user(&r, argp, sizeof(r)))

			return -EFAULT;
@@ -155,6 +155,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd, 
		if (copy_to_user(argp, &r, sizeof(r)))

			return -EFAULT;

		break;

	case PHN_GETREGS:

	case PHN_GET_REGS: {

		u32 m;
@@ -191,6 +192,20 @@ static long phantom_ioctl(struct file *file, unsigned int cmd, 
	return 0;

}



#ifdef CONFIG_COMPAT

static long phantom_compat_ioctl(struct file *filp, unsigned int cmd,

		unsigned long arg)

{

	if (_IOC_NR(cmd) <= 3 && _IOC_SIZE(cmd) == sizeof(compat_uptr_t)) {

		cmd &= ~(_IOC_SIZEMASK << _IOC_SIZESHIFT);

		cmd |= sizeof(void *) << _IOC_SIZESHIFT;

	}

	return phantom_ioctl(filp, cmd, (unsigned long)compat_ptr(arg));

}

#else

#define phantom_compat_ioctl NULL

#endif



static int phantom_open(struct inode *inode, struct file *file)

{

	struct phantom_device *dev = container_of(inode->i_cdev,
@@ -253,6 +268,7 @@ static struct file_operations phantom_file_ops = { 
	.open = phantom_open,

	.release = phantom_release,

	.unlocked_ioctl = phantom_ioctl,

	.compat_ioctl = phantom_compat_ioctl,

	.poll = phantom_poll,

};

include/linux/phantom.h

+4 −1
Original line number Diff line number Diff line
@@ -34,7 +34,10 @@ struct phm_regs { 
 * use improved registers update (no more phantom switchoffs when using

 * libphantom) */

#define PHN_NOT_OH		_IO  (PH_IOC_MAGIC, 4)

#define PH_IOC_MAXNR		4

#define PHN_GETREG		_IOWR(PH_IOC_MAGIC, 5, struct phm_reg)

#define PHN_SETREG		_IOW(PH_IOC_MAGIC, 6, struct phm_reg)

#define PHN_GETREGS		_IOWR(PH_IOC_MAGIC, 7, struct phm_regs)

#define PHN_SETREGS		_IOW(PH_IOC_MAGIC, 8, struct phm_regs)



#define PHN_CONTROL		0x6     /* control byte in iaddr space */

#define PHN_CTL_AMP		0x1     /*   switch after torques change */