Commit 9ffb83bc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

[SBUSFB]: implement ->compat_ioctl 



This patch adds a new function, sbusfb_compat_ioctl() to
drivers/video/sbuslib.c and uses it as compat_ioctl in all sbus fb
drivers

This remove the last per-arch compat ioctl bits in
arch/sparc64/kernel/ioctl32.c so it would be nice if people could test
if this actually copiles and works and if yes apply it :)

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 535f8d65

arch/sparc64/kernel/ioctl32.c

+0 −92
Original line number Diff line number Diff line
@@ -12,86 +12,10 @@ 
#define INCLUDES

#include "compat_ioctl.c"

#include <linux/syscalls.h>

#include <asm/fbio.h>



/* Use this to get at 32-bit user passed pointers. 

 * See sys_sparc32.c for description about it.

 */

#define A(__x) compat_ptr(__x)



#define CODE

#include "compat_ioctl.c"



struct  fbcmap32 {

	int             index;          /* first element (0 origin) */

	int             count;

	u32		red;

	u32		green;

	u32		blue;

};



#define FBIOPUTCMAP32	_IOW('F', 3, struct fbcmap32)

#define FBIOGETCMAP32	_IOW('F', 4, struct fbcmap32)



static int fbiogetputcmap(unsigned int fd, unsigned int cmd, unsigned long arg)

{

	struct fbcmap32 __user *argp = (void __user *)arg;

	struct fbcmap __user *p = compat_alloc_user_space(sizeof(*p));

	u32 addr;

	int ret;

	

	ret = copy_in_user(p, argp, 2 * sizeof(int));

	ret |= get_user(addr, &argp->red);

	ret |= put_user(compat_ptr(addr), &p->red);

	ret |= get_user(addr, &argp->green);

	ret |= put_user(compat_ptr(addr), &p->green);

	ret |= get_user(addr, &argp->blue);

	ret |= put_user(compat_ptr(addr), &p->blue);

	if (ret)

		return -EFAULT;

	return sys_ioctl(fd, (cmd == FBIOPUTCMAP32) ? FBIOPUTCMAP_SPARC : FBIOGETCMAP_SPARC, (unsigned long)p);

}



struct fbcursor32 {

	short set;		/* what to set, choose from the list above */

	short enable;		/* cursor on/off */

	struct fbcurpos pos;	/* cursor position */

	struct fbcurpos hot;	/* cursor hot spot */

	struct fbcmap32 cmap;	/* color map info */

	struct fbcurpos size;	/* cursor bit map size */

	u32	image;		/* cursor image bits */

	u32	mask;		/* cursor mask bits */

};

	

#define FBIOSCURSOR32	_IOW('F', 24, struct fbcursor32)

#define FBIOGCURSOR32	_IOW('F', 25, struct fbcursor32)



static int fbiogscursor(unsigned int fd, unsigned int cmd, unsigned long arg)

{

	struct fbcursor __user *p = compat_alloc_user_space(sizeof(*p));

	struct fbcursor32 __user *argp =  (void __user *)arg;

	compat_uptr_t addr;

	int ret;

	

	ret = copy_in_user(p, argp,

			      2 * sizeof (short) + 2 * sizeof(struct fbcurpos));

	ret |= copy_in_user(&p->size, &argp->size, sizeof(struct fbcurpos));

	ret |= copy_in_user(&p->cmap, &argp->cmap, 2 * sizeof(int));

	ret |= get_user(addr, &argp->cmap.red);

	ret |= put_user(compat_ptr(addr), &p->cmap.red);

	ret |= get_user(addr, &argp->cmap.green);

	ret |= put_user(compat_ptr(addr), &p->cmap.green);

	ret |= get_user(addr, &argp->cmap.blue);

	ret |= put_user(compat_ptr(addr), &p->cmap.blue);

	ret |= get_user(addr, &argp->mask);

	ret |= put_user(compat_ptr(addr), &p->mask);

	ret |= get_user(addr, &argp->image);

	ret |= put_user(compat_ptr(addr), &p->image);

	if (ret)

		return -EFAULT;

	return sys_ioctl (fd, FBIOSCURSOR, (unsigned long)p);

}



#define COMPATIBLE_IOCTL(cmd)		HANDLE_IOCTL((cmd),sys_ioctl)

#define HANDLE_IOCTL(cmd,handler)	{ (cmd), (ioctl_trans_handler_t)(handler), NULL },

#define IOCTL_TABLE_START \
@@ -103,22 +27,6 @@ IOCTL_TABLE_START 
#include <linux/compat_ioctl.h>

#define DECLARES

#include "compat_ioctl.c"

COMPATIBLE_IOCTL(FBIOGTYPE)

COMPATIBLE_IOCTL(FBIOSATTR)

COMPATIBLE_IOCTL(FBIOGATTR)

COMPATIBLE_IOCTL(FBIOSVIDEO)

COMPATIBLE_IOCTL(FBIOGVIDEO)

COMPATIBLE_IOCTL(FBIOGCURSOR32)  /* This is not implemented yet. Later it should be converted... */

COMPATIBLE_IOCTL(FBIOSCURPOS)

COMPATIBLE_IOCTL(FBIOGCURPOS)

COMPATIBLE_IOCTL(FBIOGCURMAX)

/* Little k */

/* Little v, the video4linux ioctls */

/* And these ioctls need translation */

/* Note SIOCRTMSG is no longer, so this is safe and * the user would have seen just an -EINVAL anyways. */

HANDLE_IOCTL(FBIOPUTCMAP32, fbiogetputcmap)

HANDLE_IOCTL(FBIOGETCMAP32, fbiogetputcmap)

HANDLE_IOCTL(FBIOSCURSOR32, fbiogscursor)

#if 0

HANDLE_IOCTL(RTC32_IRQP_READ, do_rtc_ioctl)

HANDLE_IOCTL(RTC32_IRQP_SET, do_rtc_ioctl)

drivers/video/bw2.c

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ static struct fb_ops bw2_ops = { 
	.fb_imageblit		= cfb_imageblit,

	.fb_mmap		= bw2_mmap,

	.fb_ioctl		= bw2_ioctl,

#ifdef CONFIG_COMPAT

	.fb_compat_ioctl	= sbusfb_compat_ioctl,

#endif

};



/* OBio addresses for the bwtwo registers */

drivers/video/cg14.c

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ static struct fb_ops cg14_ops = { 
	.fb_imageblit		= cfb_imageblit,

	.fb_mmap		= cg14_mmap,

	.fb_ioctl		= cg14_ioctl,

#ifdef CONFIG_COMPAT

	.fb_compat_ioctl	= sbusfb_compat_ioctl,

#endif

};



#define CG14_MCR_INTENABLE_SHIFT	7

drivers/video/cg3.c

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ static struct fb_ops cg3_ops = { 
	.fb_imageblit		= cfb_imageblit,

	.fb_mmap		= cg3_mmap,

	.fb_ioctl		= cg3_ioctl,

#ifdef CONFIG_COMPAT

	.fb_compat_ioctl	= sbusfb_compat_ioctl,

#endif

};

drivers/video/cg6.c

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ static struct fb_ops cg6_ops = { 
	.fb_sync		= cg6_sync,

	.fb_mmap		= cg6_mmap,

	.fb_ioctl		= cg6_ioctl,

#ifdef CONFIG_COMPAT

	.fb_compat_ioctl	= sbusfb_compat_ioctl,

#endif

};



/* Offset of interesting structures in the OBIO space */

CRA Git | Maintained and supported by SUSTech CRA and CCSE